diff --git a/.tx/config b/.tx/config
index dad162975468224ace40855a39e48bbc33c174ed..d84475277b0ebf6cd47b9b55d5b1320dfa70e55f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -33,6 +33,7 @@ trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
+trans.id = apps/i2ptunnel/locale-proxy/messages_id.po
 trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
@@ -81,11 +82,15 @@ source_lang = en
 trans.ar = apps/routerconsole/locale-news/messages_ar.po
 trans.de = apps/routerconsole/locale-news/messages_de.po
 trans.es = apps/routerconsole/locale-news/messages_es.po
+trans.fi = apps/routerconsole/locale-news/messages_fi.po
 trans.fr = apps/routerconsole/locale-news/messages_fr.po
 trans.he = apps/routerconsole/locale-news/messages_he.po
+trans.id = apps/routerconsole/locale-news/messages_id.po
 trans.it = apps/routerconsole/locale-news/messages_it.po
 trans.ja = apps/routerconsole/locale-news/messages_ja.po
 trans.ko = apps/routerconsole/locale-news/messages_ko.po
+;; currently fails check
+;;trans.mg = apps/routerconsole/locale-news/messages_mg.po
 trans.nb = apps/routerconsole/locale-news/messages_nb.po
 trans.nl = apps/routerconsole/locale-news/messages_nl.po
 trans.pl = apps/routerconsole/locale-news/messages_pl.po
@@ -94,6 +99,7 @@ trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
 trans.ro = apps/routerconsole/locale-news/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
 trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sq = apps/routerconsole/locale-news/messages_sq.po
 trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
 trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale-news/messages_uk.po
@@ -114,6 +120,7 @@ trans.fr = apps/routerconsole/locale-countries/messages_fr.po
 trans.hu = apps/routerconsole/locale-countries/messages_hu.po
 trans.it = apps/routerconsole/locale-countries/messages_it.po
 trans.ja = apps/routerconsole/locale-countries/messages_ja.po
+trans.mg = apps/routerconsole/locale-countries/messages_mg.po
 trans.nb = apps/routerconsole/locale-countries/messages_nb.po
 trans.nl = apps/routerconsole/locale-countries/messages_nl.po
 trans.pl = apps/routerconsole/locale-countries/messages_pl.po
@@ -208,17 +215,22 @@ trans.cs = apps/susimail/locale/messages_cs.po
 trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
 trans.hu = apps/susimail/locale/messages_hu.po
+trans.id = apps/susimail/locale/messages_id.po
 trans.it = apps/susimail/locale/messages_it.po
 trans.ja = apps/susimail/locale/messages_ja.po
+;; currently fails check
+;;trans.mg = apps/susimail/locale/messages_mg.po
 trans.nl = apps/susimail/locale/messages_nl.po
-trans.ru_RU = apps/susimail/locale/messages_ru.po
-trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.pl = apps/susimail/locale/messages_pl.po
 trans.pt = apps/susimail/locale/messages_pt.po
 trans.pt_BR = apps/susimail/locale/messages_pt_BR.po
 trans.ro = apps/susimail/locale/messages_ro.po
+trans.ru_RU = apps/susimail/locale/messages_ru.po
+trans.sq = apps/susimail/locale/messages_sq.po
+trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
@@ -230,16 +242,21 @@ trans.cs = debian/po/cs.po
 trans.de = debian/po/de.po
 trans.el = debian/po/el.po
 trans.es = debian/po/es.po
+trans.fi = debian/po/fi.po
 trans.fr = debian/po/fr.po
+trans.id = debian/po/id.po
 trans.it = debian/po/it.po
 trans.hu = debian/po/hu.po
 trans.ja = debian/po/ja.po
 trans.ko = debian/po/ko.po
+trans.nl = debian/po/nl.po
 trans.pl = debian/po/pl.po
 trans.pt = debian/po/pt.po
+trans.pt_BR = debian/po/pt_BR.po
 trans.ro = debian/po/ro.po
 trans.ru_RU = debian/po/ru.po
 trans.sk = debian/po/sk.po
+trans.sq = debian/po/sq.po
 trans.sv_SE = debian/po/sv.po
 trans.uk_UA = debian/po/uk.po
 trans.tr_TR = debian/po/tr.po
@@ -248,12 +265,18 @@ trans.zh_CN = debian/po/zh.po
 [I2P.i2prouter-script]
 source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
+;; currently fails check
+;;trans.ca = installer/resources/locale/po/messages_ca.po
 trans.de = installer/resources/locale/po/messages_de.po
 trans.es = installer/resources/locale/po/messages_es.po
 trans.fr = installer/resources/locale/po/messages_fr.po
+trans.id = installer/resources/locale/po/messages_id.po
 trans.it = installer/resources/locale/po/messages_it.po
 trans.pl = installer/resources/locale/po/messages_pl.po
 trans.ja = installer/resources/locale/po/messages_ja.po
+;; currently fails check
+;;trans.ko = installer/resources/locale/po/messages_ko.po
+trans.nl = installer/resources/locale/po/messages_nl.po
 trans.pl = installer/resources/locale/po/messages_pl.po
 trans.pt = installer/resources/locale/po/messages_pt.po
 trans.pt_BR = installer/resources/locale/po/messages_pt_BR.po
@@ -262,6 +285,8 @@ trans.ru_RU = installer/resources/locale/po/messages_ru.po
 trans.sk = installer/resources/locale/po/messages_sk.po
 trans.sv_SE = installer/resources/locale/po/messages_sv.po
 trans.tr_TR = installer/resources/locale/po/messages_tr.po
+;; currently fails check
+;;trans.uk_UA = installer/resources/locale/po/messages_uk.po
 trans.zh_CN = installer/resources/locale/po/messages_zh.po
 
 [I2P.getopt]
@@ -273,15 +298,23 @@ trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
 trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
 trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
 trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
+trans.id = core/java/src/gnu/getopt/MessagesBundle_id.properties
 trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
 trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
+trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
 trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
 trans.nb = core/java/src/gnu/getopt/MessagesBundle_nb.properties
 trans.pl = core/java/src/gnu/getopt/MessagesBundle_pl.properties
-trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt = core/java/src/gnu/getopt/MessagesBundle_pt.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
 trans.ro = core/java/src/gnu/getopt/MessagesBundle_ro.properties
 trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
 trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
+;; currently corrupt, non-UTF-8
+;;trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
+trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
 trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
 
 [I2P.streaming]
@@ -290,8 +323,11 @@ source_lang = en
 trans.de = apps/ministreaming/locale/messages_de.po
 trans.es = apps/ministreaming/locale/messages_es.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
+trans.id = apps/ministreaming/locale/messages_id.po
 trans.it = apps/ministreaming/locale/messages_it.po
 trans.nb = apps/ministreaming/locale/messages_nb.po
+trans.pl = apps/ministreaming/locale/messages_pl.po
+trans.ro = apps/ministreaming/locale/messages_ro.po
 trans.ru_RU = apps/ministreaming/locale/messages_ru.po
 trans.uk_UA = apps/ministreaming/locale/messages_uk.po
 trans.zh_CN = apps/ministreaming/locale/messages_zh.po
diff --git a/LICENSE.txt b/LICENSE.txt
index 9afbed5b7236698f1617b58faf7da6a78f99e81d..54e66d37b4c6f9825fb2dc1c12f323f92f8d0194 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -248,7 +248,7 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.41:
+   Tomcat 6.0.43:
    Copyright 1999-2014 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/package.html b/apps/addressbook/java/src/net/i2p/addressbook/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..cd449065782d81ffe57a6ac6d6defaa5428ee75f
--- /dev/null
+++ b/apps/addressbook/java/src/net/i2p/addressbook/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+The addressbook application, which fetches hosts.txt files from subscription URLS via
+HTTP and adds new hosts to the local database.
+While implemented as a webapp, this application contains no user interface.
+May also be packaged as a jar, as is done for Android.
+The webapp named 'addressbook' in the console is actually SusiDNS.
+</p>
+</body>
+</html>
diff --git a/apps/apparmor/home.i2p.i2prouter b/apps/apparmor/home.i2p.i2prouter
new file mode 100644
index 0000000000000000000000000000000000000000..561709d7f1f1c99b010fa13790f54ea97767b832
--- /dev/null
+++ b/apps/apparmor/home.i2p.i2prouter
@@ -0,0 +1,108 @@
+# Last Modified: Mon, 16 Feb 2015
+# vim:syntax=apparmor et ts=8 sw=4
+
+#include <tunables/global>
+
+$INSTALL_PATH/{i2prouter,runplain.sh} flags=(complain) {
+  #include <abstractions/base>
+  #include <abstractions/fonts>
+  #include <abstractions/nameservice>
+  #include <abstractions/ssl_certs>
+
+  capability sys_ptrace,
+  network inet stream,
+  network inet6 stream,
+
+  $INSTALL_PATH/                                          r,
+  $INSTALL_PATH/{i2psvc,wrapper}                          rmix,
+  owner $INSTALL_PATH/**                                  rwklm,
+
+  # Needed for Java
+  @{PROC}                                                 r,
+  @{PROC}/[0-9]*/net/if_inet6                             r,
+  @{PROC}/[0-9]*/net/ipv6_route                           r,
+  @{PROC}/[0-9]*/status                                   r,
+  @{PROC}/[0-9]*/stat                                     r,
+  @{PROC}/[0-9]*/cmdline                                  r,
+  @{PROC}/1/comm                                          r,
+  @{PROC}/uptime                                          r,
+  @{PROC}/sys/kernel/pid_max                              r,
+  /sys/devices/system/cpu/                                r,
+  /sys/devices/system/cpu/**                              r,
+  /dev/random                                             r,
+  /dev/urandom                                            r,
+
+
+  /etc/ssl/certs/java/**                                  r,
+  /etc/timezone                                           r,
+  /usr/share/javazi/**                                    r,
+
+  # Debian
+  /etc/java-{6,7,8}-openjdk/**                            r,
+  /usr/lib/jvm/default-java/jre/bin/java                  rix,
+
+  # Debian, Ubuntu, openSUSE
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/java      rix,
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/keytool   rix,
+
+  # Raspbian
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/java                rix,
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/keytool             rix,
+
+
+  # Fonts are needed for I2P's graphs
+  /etc/fonts/**                                           r,
+  /usr/share/fontconfig/                                  r,
+  /usr/share/fontconfig/**                                r,
+  /usr/share/fonts/                                       r,
+  /usr/share/fonts/**                                     r,
+  /usr/share/fonts/truetype/                              r,
+  /usr/share/fonts/truetype/**                            r,
+  /usr/share/java/java-atk-wrapper.jar                    r,
+  /var/cache/fontconfig/                                  r,
+  /var/cache/fontconfig/**                                r,
+
+  # Used by some plugins
+  /usr/share/java/eclipse-ecj-*.jar                       r,
+
+  /{,var/}tmp/                                            rwm,
+  owner /{,var/}tmp/**                                    rwklm,
+
+  /{,usr/}bin/{,b,d}ash                                   rix,
+  /{,usr/}bin/cat                                         rix,
+  /{,usr/}bin/cut                                         rix,
+  /{,usr/}bin/dirname                                     rix,
+  /{,usr/}bin/expr                                        rix,
+  /{,usr/}bin/{,g,m}awk                                   rix,
+  /{,usr/}bin/grep                                        rix,
+  /{,usr/}bin/id                                          rix,
+  /{,usr/}bin/ldd                                         rix,
+  /{,usr/}bin/ls                                          rix,
+  /{,usr/}bin/mkdir                                       rix,
+  /{,usr/}bin/nohup                                       rix,
+  /{,usr/}bin/ps                                          rix,
+  /{,usr/}bin/rm                                          rix,
+  /{,usr/}bin/sed                                         rix,
+  /{,usr/}bin/sleep                                       rix,
+  /{,usr/}bin/tail                                        rix,
+  /{,usr/}bin/tr                                          rix,
+  /{,usr/}bin/uname                                       rix,
+  /{,usr/}bin/which                                       rix,
+
+  @{HOME}/.java/fonts/**                                  r,
+  owner  @{HOME}/.i2p/                                    rw,
+  owner  @{HOME}/.i2p/**                                  rwk,
+
+  # Prevent spamming the logs
+  deny owner @{HOME}/.java/                               wk,
+  deny @{HOME}/.fontconfig/                               wk,
+  deny @{HOME}/.java/fonts/**                             w,
+  deny /dev/tty                                           rw,
+  deny /dev/pts/[0-9]*                                    rw,
+  deny @{PROC}/[0-9]*/fd/                                 r,
+  deny /usr/local/share/fonts/                            r,
+  deny /var/cache/fontconfig/                             wk,
+  # Used by some versions of the Tanuki wrapper but never used by I2P
+  deny /usr/share/java/hamcrest*.jar                      r,
+  deny /usr/share/java/junit*.jar                         r,
+}
diff --git a/apps/desktopgui/locale/messages_pl.po b/apps/desktopgui/locale/messages_pl.po
index dbc2c92bf9831f396b53cb06832946c1ede20c2b..f47b0aeac5492523ffbedb4ef368a48b786029d7 100644
--- a/apps/desktopgui/locale/messages_pl.po
+++ b/apps/desktopgui/locale/messages_pl.po
@@ -3,20 +3,22 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <b790979@klzlk.com>, 2011.
+# Translators:
+# PolishAnon <b790979@klzlk.com>, 2011
+# polacco <polacco@i2pmail.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-05-25 18:36+0000\n"
-"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2015-02-17 20:54+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +34,7 @@ msgstr "Uruchamianie"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Uruchom Przeglądarke I2P"
+msgstr "Uruchom przeglądarkę I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -46,12 +48,10 @@ msgstr "Zrestartuj I2P"
 msgid "Stop I2P"
 msgstr "Zatrzymaj I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Konfiguracja ikony zasobnika"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Czy ikona zasobnika powinna być aktywna?"
-
-
diff --git a/apps/desktopgui/locale/messages_uk.po b/apps/desktopgui/locale/messages_uk.po
index e3ad0d9f67c78876bb9730aba1f1050d74d3c926..c45356c201861cefbac53156198df3f8832977fb 100644
--- a/apps/desktopgui/locale/messages_uk.po
+++ b/apps/desktopgui/locale/messages_uk.po
@@ -6,13 +6,14 @@
 # Translators:
 # Denis Blank <gribua@gmail.com>, 2011
 # LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2014-06-22 10:20+0000\n"
-"Last-Translator: LinuxChata\n"
+"PO-Revision-Date: 2014-12-17 17:00+0000\n"
+"Last-Translator: madjong <madjong@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgstr "Зупинити I2P"
 
 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
-msgstr "Настройка трей-іконки"
+msgstr "Налаштування трей-іконки"
 
 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index a7467a1e3f4f969a28a026995cb9cc3263c5a1fb..0efbfd494a406ee0f05338b420251467ecdc3e56 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -74,7 +74,6 @@ public class I2PSnarkUtil {
     private static final int EEPGET_CONNECT_TIMEOUT_SHORT = 5*1000;
     public static final int DEFAULT_STARTUP_DELAY = 3;
     public static final boolean DEFAULT_USE_OPENTRACKERS = true;
-    public static final int DEFAULT_MAX_UP_BW = 8;  //KBps
     public static final int MAX_CONNECTIONS = 16; // per torrent
     public static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
     public static final boolean DEFAULT_USE_DHT = true;
@@ -97,7 +96,7 @@ public class I2PSnarkUtil {
         setI2CPConfig("127.0.0.1", 7654, null);
         _banlist = new ConcurrentHashSet<Hash>();
         _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
-        _maxUpBW = DEFAULT_MAX_UP_BW;
+        _maxUpBW = SnarkManager.DEFAULT_MAX_UP_BW;
         _maxConnections = MAX_CONNECTIONS;
         _startupDelay = DEFAULT_STARTUP_DELAY;
         _shouldUseOT = DEFAULT_USE_OPENTRACKERS;
@@ -106,8 +105,8 @@ public class I2PSnarkUtil {
         // This is used for both announce replies and .torrent file downloads,
         // so it must be available even if not connected to I2CP.
         // so much for multiple instances
-        _tmpDir = new SecureDirectory(ctx.getTempDir(), baseName);
-        FileUtil.rmdir(_tmpDir, false);
+        _tmpDir = new SecureDirectory(ctx.getTempDir(), baseName + '-' + ctx.random().nextInt());
+        //FileUtil.rmdir(_tmpDir, false);
         _tmpDir.mkdirs();
     }
     
diff --git a/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java b/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java
index 58a73b668f82d6c8fe025fc91314dece3dd3b1b3..d046a7a0c7e2a9202e8609d2b67c7a30c0506eea 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java
@@ -29,6 +29,9 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
     private int _consec;
     private int _consecNotRunning;
     private boolean _isIdle;
+    private String _lastIn = "3";
+    private String _lastOut = "3";
+    private final Object _lock = new Object();
 
     private static final long CHECK_TIME = 63*1000;
     private static final int MAX_CONSEC_IDLE = 4;
@@ -46,16 +49,19 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
     }
 
     public void timeReached() {
+        synchronized (_lock) {
+            locked_timeReached();
+        }
+    }
+
+    private void locked_timeReached() {
         if (_util.connected()) {
             boolean torrentRunning = false;
-            boolean hasPeers = false;
+            int peerCount = 0;
             for (PeerCoordinator pc : _pcs) {
                 if (!pc.halted()) {
                     torrentRunning = true;
-                    if (pc.getPeers() > 0) {
-                        hasPeers = true;
-                        break;
-                    }
+                    peerCount += pc.getPeers();
                 }
             }
 
@@ -73,19 +79,22 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
                 }
             }
 
-            if (hasPeers) {
-                if (_isIdle)
-                    restoreTunnels();
+            if (peerCount > 0) {
+                restoreTunnels(peerCount);
             } else {
                 if (!_isIdle) {
                     if (_consec++ >= MAX_CONSEC_IDLE)
                         reduceTunnels();
+                    else
+                        restoreTunnels(1);  // pretend we have one peer for now
                 }
             }
         } else {
             _isIdle = false;
             _consec = 0;
             _consecNotRunning = 0;
+            _lastIn = "3";
+            _lastOut = "3";
         }
         schedule(CHECK_TIME);
     }
@@ -101,12 +110,13 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
     }
     
     /**
-     *  Restore tunnel count
+     *  Restore or adjust tunnel count based on current peer count
+     *  @param peerCount greater than zero
      */
-    private void restoreTunnels() {
-        _isIdle = false;
-        if (_log.shouldLog(Log.INFO))
+    private void restoreTunnels(int peerCount) {
+        if (_isIdle && _log.shouldLog(Log.INFO))
             _log.info("Restoring tunnels on activity");
+        _isIdle = false;
         Map<String, String> opts = _util.getI2CPOptions();
         String i = opts.get("inbound.quantity");
         if (i == null)
@@ -120,7 +130,30 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
         String ob= opts.get("outbound.backupQuantity");
         if (ob == null)
             ob = "0";
-        setTunnels(i, o, ib, ob);
+        // we don't need more tunnels than we have peers, reduce if so
+        // reduce to max(peerCount / 2, 2)
+        int in, out;
+        try {
+            in = Integer.parseInt(i);
+        } catch (NumberFormatException nfe) {
+            in = 3;
+        }
+        try {
+            out = Integer.parseInt(o);
+        } catch (NumberFormatException nfe) {
+            out = 3;
+        }
+        int target = Math.max(peerCount / 2, 2);
+        if (target < in && in > 2) {
+            in = target;
+            i = Integer.toString(in);
+        }
+        if (target < out && out > 2) {
+            out = target;
+            o = Integer.toString(out);
+        }
+        if (!(_lastIn.equals(i) && _lastOut.equals(o)))
+            setTunnels(i, o, ib, ob);
     }
     
     /**
@@ -132,12 +165,16 @@ class IdleChecker extends SimpleTimer2.TimedEvent {
         if (mgr != null) {
             I2PSession sess = mgr.getSession();
             if (sess != null) {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("New tunnel settings " + i + " / " + o + " / " + ib + " / " + ob);
                 Properties newProps = new Properties();
                 newProps.setProperty("inbound.quantity", i);
                 newProps.setProperty("outbound.quantity", o);
                 newProps.setProperty("inbound.backupQuantity", ib);
                 newProps.setProperty("outbound.backupQuantity", ob);
                 sess.updateOptions(newProps);
+                _lastIn = i;
+                _lastOut = o;
             }
         }
     }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
index 5fca72eb3b21c3fe16bdbc069f826d25610aa291..543753331b8aa755338228d17715b999f2484956 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
@@ -92,7 +92,7 @@ public class MetaInfo
     this.announce_list = announce_list;
     this.comment = null;
     this.created_by = null;
-    this.creation_date = 0;
+    this.creation_date = I2PAppContext.getGlobalContext().clock().now();
 
     // TODO if we add a parameter for other keys
     //if (other != null) {
@@ -444,7 +444,7 @@ public class MetaInfo
 
   /**
    * The creation date (ms) or zero.
-   * Not available for locally-created torrents.
+   * As of 0.9.19, available for locally-created torrents.
    * @since 0.9.7
    */
   public long getCreationDate() {
@@ -595,6 +595,14 @@ public class MetaInfo
             m.put("announce", announce);
         if (announce_list != null)
             m.put("announce-list", announce_list);
+        // misc. optional  top-level stuff
+        if (comment != null)
+            m.put("comment", comment);
+        if (created_by != null)
+            m.put("created by", created_by);
+        if (creation_date != 0)
+            m.put("creation date", creation_date / 1000);
+
         Map<String, BEValue> info = createInfoMap();
         m.put("info", info);
         // don't save this locally, we should only do this once
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
index b7759f901ab88cb173f6a6c5b121993d35ecfff1..430f6c7ae6e6fcaf89b03ae211f30327cc446b0f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@@ -75,6 +75,8 @@ class PeerCheckerTask implements Runnable
         List<Peer> removed = new ArrayList<Peer>();
         int uploadLimit = coordinator.allowedUploaders();
         boolean overBWLimit = coordinator.overUpBWLimit();
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("peers: " + peerList.size() + " limit: " + uploadLimit + " overBW? " + overBWLimit);
         DHT dht = _util.getDHT();
         for (Peer peer : peerList) {
 
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index 382ca481746c6b77497db5ef01065a1109748d81..e6014becd07e9b614b6f128b2eac99b50ff39b29 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -25,14 +25,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
@@ -52,7 +52,7 @@ import org.klomp.snark.dht.DHT;
  */
 class PeerCoordinator implements PeerListener
 {
-  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerCoordinator.class);
+  private final Log _log;
 
   /**
    * External use by PeerMonitorTask only.
@@ -98,7 +98,7 @@ class PeerCoordinator implements PeerListener
    * This is a Queue, not a Set, because PeerCheckerTask keeps things in order for choking/unchoking.
    * External use by PeerMonitorTask only.
    */
-  final Queue<Peer> peers;
+  final Deque<Peer> peers;
 
   /**
    * Peers we heard about via PEX
@@ -144,6 +144,7 @@ class PeerCoordinator implements PeerListener
   {
     _util = util;
     _random = util.getContext().random();
+    _log = util.getContext().logManager().getLog(PeerCoordinator.class);
     this.id = id;
     this.infohash = infohash;
     this.metainfo = metainfo;
@@ -154,7 +155,7 @@ class PeerCoordinator implements PeerListener
     wantedPieces = new ArrayList<Piece>();
     setWantedPieces();
     partialPieces = new ArrayList<PartialPiece>(getMaxConnections() + 1);
-    peers = new LinkedBlockingQueue<Peer>();
+    peers = new LinkedBlockingDeque<Peer>();
     magnetState = new MagnetState(infohash, metainfo);
     pexPeers = new ConcurrentHashSet<PeerID>();
 
@@ -522,7 +523,10 @@ class PeerCoordinator implements PeerListener
             // Can't add to beginning since we converted from a List to a Queue
             // We can do this in Java 6 with a Deque
             //peers.add(0, peer);
-            peers.add(peer);
+            if (_util.getContext().random().nextInt(4) == 0)
+                peers.push(peer);
+            else
+                peers.add(peer);
             peerCount = peers.size();
             unchokePeer();
 
@@ -1461,8 +1465,8 @@ class PeerCoordinator implements PeerListener
   public int allowedUploaders()
   {
     if (listener != null && listener.overUploadLimit(uploaders)) {
-        // if (_log.shouldLog(Log.DEBUG))
-        //   _log.debug("Over limit, uploaders was: " + uploaders);
+           if (_log.shouldLog(Log.DEBUG))
+             _log.debug("Over limit, uploaders was: " + uploaders);
         return uploaders - 1;
     } else if (uploaders < MAX_UPLOADERS)
         return uploaders + 1;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index b8111a98e626624c172b3b05f1b99a0e61404478..d5d5be1f80aeae2d3a90ebe6b6e625ad805fa053 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -1288,7 +1288,8 @@ public class Snark
         totalUploaders += c.uploaders;
     }
     int limit = _util.getMaxUploaders();
-    // debug("Total uploaders: " + totalUploaders + " Limit: " + limit, Snark.DEBUG);
+    if (_log.shouldLog(Log.DEBUG))
+        _log.debug("Total uploaders: " + totalUploaders + " Limit: " + limit);
     return totalUploaders > limit;
   }
 
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index bdda3deb7a4f41aaf686bbcb562f715cadf161d3..6f46cd9de196f283320b508b3b635f6e161f921b 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -118,8 +118,8 @@ public class SnarkManager implements CompleteListener {
     public static final String PROP_PRIVATETRACKERS = "i2psnark.privatetrackers";
     private static final String PROP_USE_DHT = "i2psnark.enableDHT";
 
-    public static final int MIN_UP_BW = 2;
-    public static final int DEFAULT_MAX_UP_BW = 10;
+    public static final int MIN_UP_BW = 10;
+    public static final int DEFAULT_MAX_UP_BW = 25;
     public static final int DEFAULT_STARTUP_DELAY = 3; 
     public static final int DEFAULT_REFRESH_DELAY_SECS = 60;
     private static final int DEFAULT_PAGE_SIZE = 50;
@@ -164,7 +164,7 @@ public class SnarkManager implements CompleteListener {
     public static final Set<String> DEFAULT_TRACKER_ANNOUNCES;
 
     /** host names for config form */
-    public static final Set<String> KNOWN_OPENTRACKERS = new HashSet(Arrays.asList(new String[] {
+    public static final Set<String> KNOWN_OPENTRACKERS = new HashSet<String>(Arrays.asList(new String[] {
         "tracker.welterde.i2p", "cfmqlafjfmgkzbt4r3jsfyhgsr5abgxryl6fnz3d3y5a365di5aa.b32.i2p",
         "opentracker.dg2.i2p", "w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p",
         "tracker.thebland.i2p", "s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p",
@@ -175,7 +175,7 @@ public class SnarkManager implements CompleteListener {
     }));
 
     static {
-        Set<String> ann = new HashSet();
+        Set<String> ann = new HashSet<String>(8);
         for (int i = 1; i < DEFAULT_TRACKERS.length; i += 2) {
             if (DEFAULT_TRACKERS[i-1].equals("TheBland") && !SigType.ECDSA_SHA256_P256.isAvailable())
                 continue;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
index 9eab1497b413376eb412ab6da17027ea5f21cc74..ab1116722b6c7319712d7c2514cf4c673c4bde79 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -36,7 +36,9 @@ import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
 
+import net.i2p.crypto.SigType;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.util.ConvertToHash;
 import net.i2p.util.I2PAppThread;
@@ -88,6 +90,8 @@ public class TrackerClient implements Runnable {
   private static final int DHT_ANNOUNCE_PEERS = 4;
   public static final int PORT = 6881;
   private static final int MAX_TRACKERS = 12;
+  // tracker.welterde.i2p
+  private static final Hash DSA_ONLY_TRACKER = ConvertToHash.getHash("cfmqlafjfmgkzbt4r3jsfyhgsr5abgxryl6fnz3d3y5a365di5aa.b32.i2p");
 
   private final I2PSnarkUtil _util;
   private final MetaInfo meta;
@@ -156,6 +160,7 @@ public class TrackerClient implements Runnable {
       consecutiveFails = 0;
       runStarted = false;
       _fastUnannounce = false;
+      snark.setTrackerProblems(null);
       _thread = new I2PAppThread(this, _threadName + " #" + (++_runCount), true);
       _thread.start();
       started = true;
@@ -362,12 +367,21 @@ public class TrackerClient implements Runnable {
       if (h == null) {
           if (_log.shouldLog(Log.WARN))
               _log.warn("Bad announce URL: [" + ann + ']');
-         return false;
+          return false;
+      }
+      // comment this out if tracker.welterde.i2p upgrades
+      if (h.equals(DSA_ONLY_TRACKER)) {
+          Destination dest = _util.getMyDestination();
+          if (dest != null && dest.getSigType() != SigType.DSA_SHA1) {
+              if (_log.shouldLog(Log.WARN))
+                  _log.warn("Skipping incompatible tracker: " + ann);
+              return false;
+          }
       }
       if (existing.size() >= MAX_TRACKERS) {
           if (_log.shouldLog(Log.INFO))
               _log.info("Not using announce URL, we have enough: [" + ann + ']');
-         return false;
+          return false;
       }
       boolean rv = existing.add(h);
       if (!rv) {
@@ -898,7 +912,7 @@ public class TrackerClient implements Runnable {
         if (path == null || path.length() < 517 ||
             !path.startsWith("/"))
             return null;
-        String[] parts = path.substring(1).split("/?&;", 2);
+        String[] parts = path.substring(1).split("[/\\?&;]", 2);
         return ConvertToHash.getHash(parts[0]);
     }
     return null;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
index 85a0807f51b668eaef1a68a89419c7cf0ce86b2e..58e0f39fca73397ccf946974ea77e82f697d011e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
@@ -842,7 +842,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
         if (_log.shouldLog(Log.INFO))
             _log.info("Sending error " + msg + " to: " + nInfo);
         Map<String, Object> map = new HashMap<String, Object>(4);
-        List<Object> error = new ArrayList(2);
+        List<Object> error = new ArrayList<Object>(2);
         error.add(Integer.valueOf(err));
         error.add(msg);
         map.put("e", error);
@@ -1294,7 +1294,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
         } else {
             List<byte[]> hashes;
             if (peers.isEmpty()) {
-                hashes = Collections.EMPTY_LIST;
+                hashes = Collections.emptyList();
             } else {
                 hashes = new ArrayList<byte[]>(peers.size());
                 for (Hash peer : peers) {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/package.html b/apps/i2psnark/java/src/org/klomp/snark/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..a617ebef615673869690df8284ef52b2cd6d0441
--- /dev/null
+++ b/apps/i2psnark/java/src/org/klomp/snark/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+I2P version of the snark bittorrent client, imported in 2005 and heavily enhanced
+to add a web UI, DHT support, and other features.
+</p>
+</body>
+</html>
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
index b3a1a6a5c319205c43d3e266498219ee49e382de..95e012b49e80c76e06259ef181db4c7a3a936ec2 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
@@ -358,6 +358,7 @@ class BasicServlet extends HttpServlet
             writeHeaders(response, content, content_length);
             response.setStatus(416);
             response.setHeader("Content-Range", InclusiveByteRange.to416HeaderRangeString(content_length));
+            in.close();
             return;
         }
 
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index e19e978b264c0a557029dbfbe829954f0f92fcb2..47ff29de765ff4e66834853e3d0f8ea5c564fe25 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1095,7 +1095,7 @@ public class I2PSnarkServlet extends BasicServlet {
                 }
             }
         } else if ("Save".equals(action)) {
-            String dataDir = req.getParameter("dataDir");
+            String dataDir = req.getParameter("nofilter_dataDir");
             boolean filesPublic = req.getParameter("filesPublic") != null;
             boolean autoStart = req.getParameter("autoStart") != null;
             String seedPct = req.getParameter("seedPct");
@@ -2138,7 +2138,8 @@ public class I2PSnarkServlet extends BasicServlet {
                   "<table border=\"0\"><tr><td>");
 
         out.write(_("Data directory"));
-        out.write(": <td><input name=\"dataDir\" size=\"80\" value=\"" + dataDir + "\" spellcheck=\"false\"></td>\n" +
+        out.write(": <td><input name=\"nofilter_dataDir\" size=\"80\" value=\"" +
+                  DataHelper.escapeHTML(dataDir) + "\" spellcheck=\"false\"></td>\n" +
 
                   "<tr><td>");
         out.write(_("Files readable by all"));
@@ -2268,13 +2269,13 @@ public class I2PSnarkServlet extends BasicServlet {
         out.write("<tr><td>");
         out.write(_("Inbound Settings"));
         out.write(":<td>");
-        out.write(renderOptions(1, 6, 3, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL));
+        out.write(renderOptions(1, 8, 3, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL));
         out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
         out.write(renderOptions(0, 4, 3, options.remove("inbound.length"), "inbound.length", HOP));
         out.write("<tr><td>");
         out.write(_("Outbound Settings"));
         out.write(":<td>");
-        out.write(renderOptions(1, 6, 3, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL));
+        out.write(renderOptions(1, 8, 3, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL));
         out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
         out.write(renderOptions(0, 4, 3, options.remove("outbound.length"), "outbound.length", HOP));
 
@@ -2693,7 +2694,7 @@ public class I2PSnarkServlet extends BasicServlet {
             buf.append("&nbsp;<b>")
                .append(_("Info hash"))
                .append(":</b> ")
-               .append(hex)
+               .append(hex.toUpperCase(Locale.US))
                .append("</td></tr>\n");
 
             String announce = null;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/package.html b/apps/i2psnark/java/src/org/klomp/snark/web/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..56fda906f57d29554381d8bec802b8446c951a52
--- /dev/null
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+The i2psnark user interface, implemented as a webapp in i2psnark.war.
+</p>
+</body>
+</html>
diff --git a/apps/i2psnark/locale/messages_ar.po b/apps/i2psnark/locale/messages_ar.po
index 64675ad7f70f1f56fb02e800969079a96e11981d..9d37a395af5f4ee2dfbd8054f424c5960f905edf 100644
--- a/apps/i2psnark/locale/messages_ar.po
+++ b/apps/i2psnark/locale/messages_ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -25,221 +25,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "تم قفل النفق"
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "تم تغببر مجموع حد الرفع الى {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "اقل حد الرفع الى {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "حولت سرعة الرفع الى {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "اقل سرعة رفع هي{0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "تغير تأخير البداية الى {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "سيتم تفعيل التغيير بعد اعادة التشغيل"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "فك الاتصال"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr " تغيرت الاعدادات الى {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "فشل في الاتصال بالاعدادات الجديدة، سيتم الرجوع الى الاعدادات القديمة"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "فشل في اعادة الاتصال بالاعدادات القديمة!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "اتصال بوجهة جديدة"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "اعادة التشغيل \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "تشغيل عند البداية"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "الغاء التشغيل عند البداية"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "تفعيل open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "الغاء تفعيل open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} تم تحميل التيمة  ارجع الى صفحة للمشاهدة i2psnark."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "لم تتغير الاعدادات"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "تغيير open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "فشل في حفظ الاعدادات {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "جاري الاتصال بشبكة I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "فشل في الاتصال ب I2P - تخقق من اعدادات I2CP !"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "خطأ: فشل في اضافة التورنت {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "فشل في فتح \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "تورنت بهذه المعلومات مشغل: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -247,34 +248,34 @@ msgid ""
 "torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "تورنت في \"{0}\"غير صحيح"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "خطأ - لا توجد ذاكرة كافية، لا يمكن انشاء تورنت {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "تم اضافة وتشغيل التورنت: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "تمت اضافة: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "يحمل {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -282,132 +283,132 @@ msgid ""
 "DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "اضافة {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "فشل في نسخ التورنت الى {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "ملفات كثيرة في  \"{0}\" ({1}) تم حذف"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "ملف التورنت \"{0}\" لا يمكنه الانتهاء ب \".torrent\", سيتم حذفه!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "ﻻ أجزاء في \"{0}\",  حذف!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "الأجزاء كبيرة في \"{0}\" ({1}B), حذف."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "حدود {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "تورنت أكبر من {0}B غير مدعومة سيحذف \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "خطأ: ﻻيمكن حذف التورنت {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "تورنت متوقف: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "تورنت محذوف: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "اضف تورنت في {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "انتهى التحميل: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "بداية التورنت {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "فشل في اضافة I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "فتح النفق واطلاق جميع التورنت"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "توقيف جميع التورنت و قفل النفق I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
@@ -422,178 +423,208 @@ msgstr ""
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "لم يتم تحميل التورنت من {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "تم تحميل الملف من {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "تورنت مفعل: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "تورنت في قائمة الانتظار: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "تورنت غير صحيح {0} "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark برنامج تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "اعدادات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "أنعش الصفحة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "منتدى"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "الحالة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "اخفاء النظائر"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "أظهر النظائر"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
+msgid "ETA"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
 msgid "Estimated time remaining"
 msgstr "تقدير للوقت الباقي"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
-msgid "ETA"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
+msgid "RX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
 msgid "Downloaded"
 msgstr "محمل"
 
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "الحجم"
+
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
-msgid "RX"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
+msgid "TX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
 msgid "Uploaded"
 msgstr "رفع"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
-msgid "TX"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
+msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
 msgid "Down Rate"
 msgstr "معدل التحميل"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
-msgid "RX Rate"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
+msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
 msgid "Up Rate"
 msgstr ""
 
-#. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
-msgid "TX Rate"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "توقيف جمبع التورنت و النفق I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "توقيف الجمبع"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "شغل الجمبع"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "شغل جمبع التورنت و النفق I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "لم يحمل تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "مجموع"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
@@ -604,7 +635,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
@@ -615,7 +646,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
@@ -626,198 +657,203 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "تم حذف ملف مغناطيس: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "تم خذف ملف التورنت: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "خذف ملف البيانات: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "فشل في حذف الملف: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "تم انشاء تورنت لـ \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "العديد من trackers يطلبون تسجيل التورنت قبل مشاركتها، قم بذلك قبل البداية {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "فشل في انشاء تورنت لـ \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "لا يمكن انشاء تورنت لبيانات غير موجودة: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "فشل في انشاء تورنت - عليك اختيار ملف أو مجلد"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr ""
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Tracker خطأ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
@@ -828,352 +864,366 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "بشارك"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "اكتمل"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "موافق"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "متوقف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "لا بوجد نظائر"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "متوقف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "تفاصيل التورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "أظهر الملفات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "فتح ملف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "قف التورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "قف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "ابدأ التورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "ابدأ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "حذف التورنت من القائمة، حذف ملف .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "حذف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "خذف ملف التورنت و الملفات المرتبطة به"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "هل أنت متأكد من حذف التورنت \\''{0}\\'' وجمبع البيانات المحملة؟"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "حذف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "شارك"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "غير مهم (النظير لا يحتوي على اجزاء نحتاجها)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "مشكلة (لا يمكن الحصول على اجزاء الملف من النظائر)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "تفاصيل حول {0} tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "معلومات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "أضف تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "من عنوان"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "أضف تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "يمكن ايضا .نقل ملفات تورنت الى: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "سيتم القاف التورنت عند حذف الملف torrent."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "أنشئ تورنت"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "البيانات المشاركة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "أنشئ تورنت"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "مجلد البيانات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "اذا تم تفعيل، يقوم بتشغيل التورنت تلقائيا عند اضافته"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "تيمة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "تأخر البداية"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "دقائق"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "اقصى حد للرفع"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "النظائر"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "اقصى حد لسرعة الاتصال"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "ينصح باستعمال نصف سرعة الشبكة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "أظهر أو غير سرعة الموجه"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "استعمال open trackers ايضا"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "اعدادت الاتصال الداخلي"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "اعدادت الاتصال الخارجي"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "حفظ الاعدادات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "فتح"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "غنوان مغناطيس غير صحيح {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -1184,7 +1234,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -1195,110 +1245,119 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "وصلة مغناطيس"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "الحجم"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "انتهاء"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "الملفات"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "القطع"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "حجم القطعة"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "المجلد"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "الأولوية"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "تورنت غير موجود؟"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "الملف غير موجود في التورنت؟"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "اكتمل"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "عالي"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "عادي"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "تجاوز"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "حفظ الأولويات"
diff --git a/apps/i2psnark/locale/messages_cs.po b/apps/i2psnark/locale/messages_cs.po
index 97eb5c297f565cc8900e7ce5aa362112fd9bde8e..bd68b90867ed90a37a13b7a7907b1ac1257d7586 100644
--- a/apps/i2psnark/locale/messages_cs.po
+++ b/apps/i2psnark/locale/messages_cs.po
@@ -4,14 +4,15 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# A5h8d0wf0x <littleslyfoxie28@gmail.com>, 2014
 # tradukisto <inactive+tradukisto@transifex.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2014-09-14 21:28+0000\n"
-"Last-Translator: tradukisto <inactive+tradukisto@transifex.com>\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,221 +21,226 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:69
-#: ../java/src/org/klomp/snark/SnarkManager.java:1949
-#: ../java/src/org/klomp/snark/SnarkManager.java:1960
+msgid "No more torrents running."
+msgstr "Neběží žádné další torrenty."
+
+#: ../java/src/org/klomp/snark/IdleChecker.java:70
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P tunel uzavřen."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1655
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
-msgstr ""
+msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:515
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Celkový limit sdílečů změněn na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:517
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Nejmenší celkový limit sdílečů je {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:529
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Horní BW limit změněn na {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:531
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Nejmenší horní limit přenosové rychlist je {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:543
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Prodleva při startu změněna na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:554
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Doba aktualizace stavu (refresh time) změněna na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:556
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Aktualizace stavu vypnuta"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:572
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:581
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:583
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:585
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:587
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:592
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:647
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Změny I2CP a tunelu se projeví až po zastavení všech torrentů"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:651
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Nastavení (options) I2CP změněno na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:657
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Odpojuji se od starého I2CP cíle"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:659
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Nastavení (settings) I2CP změněno na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:664
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Nemůžu se připojit s novým nastavením I2CP, vracím se k předhozímu."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:668
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Nemohu se opětovně připojit ani s předchozím nastavením!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:670
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Opětovně připojeno k novému I2CP cíli"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:677
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP listener restartován pro \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:691
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Nové soubory budou veřejně přístupné"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:693
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Nové soubory nebudou veřejně přístupné"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:700
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Automatické spuštění zapnuto"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:702
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Automatické spuštění vypnuto"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:708
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Zapnuto automatické spuštění"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:710
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Otevřené trackery vypnuty - aby se změna projevila je nutné restartovat všechny torrenty"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:717
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT povoleno."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:719
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT zakázáno."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:721
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:728
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "Téma {0} bylo nahráno, přejděte prosím na hlavní stránku i2snark"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:738
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Nastavení nebylo změněno."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:770
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Seznam otevřených trackerů změněn - aby se změna projevila je nutné restartovat všechny torrenty"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:780
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:826
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Nemůžu uložit soubor s nastavením do souboru {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:904
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Připojuji se k I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Při připojování k I2P nastala chyba, zkontrolujte prosím nastavení I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:916
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Chyba: nepodařilo se přidat torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Nejde otevřít \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:957
-#: ../java/src/org/klomp/snark/SnarkManager.java:1058
-#: ../java/src/org/klomp/snark/SnarkManager.java:1140
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent s tímto infohašišem již běží: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:963
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:965
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:968
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:970
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -242,34 +248,34 @@ msgid ""
 "torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:992
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent v \"{0}\" je chybný"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:999
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:186
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "CHYBA - nedostatek paměti, nemohu vytvořit torrent z {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1011
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent přidán a spuštěn: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1013
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent přidán:  \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1069
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Získávám {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1075
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -277,311 +283,348 @@ msgid ""
 "DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1079
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Přídávám {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1111
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1150
-#: ../java/src/org/klomp/snark/SnarkManager.java:1173
-#: ../java/src/org/klomp/snark/SnarkManager.java:1611
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Chyba: nepodařilo se zkopírovat soubor torrentu do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1400
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "V \"{0}\" ({1}) je příliš mnoho souborů, mažu je!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1402
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Jméno souboru torrentu \"{0}\" nemůže končit na \".torrent\", mažu ho!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1404
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "\"{0}\" neobsahuje žádné části, mažu to!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1406
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Příliš mnoho částí v \"{0}\", maximum je {1}, mažu to!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1408
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1409
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1411
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1419
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1435
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1456
-#: ../java/src/org/klomp/snark/SnarkManager.java:1474
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent zastaven: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1495
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent smazán: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1503
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1534
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1556
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Stahování dokončeno: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1607
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1608
-#: ../java/src/org/klomp/snark/SnarkManager.java:1837
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1623
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1686
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1836
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1860
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1923
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1942
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:234
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
 
 #: ../java/src/org/klomp/snark/UpdateHandler.java:49
-#: ../java/src/org/klomp/snark/UpdateRunner.java:227
+#: ../java/src/org/klomp/snark/UpdateRunner.java:228
 msgid "Updating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/UpdateRunner.java:114
+#: ../java/src/org/klomp/snark/UpdateRunner.java:115
 #, java-format
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:184
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:247
-msgid "I2PSnark - Anonymous BitTorrent Client"
-msgstr "I2PSnark - Anonymní BitTorrent klient"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
+msgid "I2PSnark"
+msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
+msgid "Configuration"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
+msgid "Anonymous BitTorrent Client"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242
-msgid "I2PSnark"
-msgstr "I2PSnark"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Fórum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:345
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:400
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2427
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2429
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Status"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Skrýt peery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:423
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Ukázat peery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:432
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:434
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2236
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2256
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:442
-msgid "Estimated time remaining"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:450
-msgid "Downloaded"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:458
-msgid "Uploaded"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
-msgid "Down Rate"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:470
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:476
-msgid "Up Rate"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
@@ -589,7 +632,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
@@ -597,7 +640,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
@@ -605,174 +648,203 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:814
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+#, java-format
+msgid "Cannot add a torrent ending in \".torrent\": {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
+#, java-format
+msgid "Torrent with this name is already running: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
+#, java-format
+msgid "Cannot add a torrent including an I2P directory: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
+#, java-format
+msgid "Cannot add torrent {0} including another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:946
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent vytvořen pro \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2019
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1025
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2017
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Přidat tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1077
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr ""
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2021
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1085
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1206
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1209
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1210
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1224
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1254
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1275
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
@@ -780,356 +852,366 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1234
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1243
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1247
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2369
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2483
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1266
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1267
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1278
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1329
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1402
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1404
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1418
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1430
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1435
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1438
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1455
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1458
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1607
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1624
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Přidat torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Z URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1680
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1685
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Přidat torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Můžete také zkopírovat .torrent soubory do: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1690
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1713
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Vytvořit torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1720
-msgid "File or directory to seed (must be within the specified path)"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
+#, java-format
+msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Hlavní"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Vytvořit torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1747
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2033
-msgid "Configuration"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1784
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1796
-msgid "Auto start"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
+msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1800
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Vzhled"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1830
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1844
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1871
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1875
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1878
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1884
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1888
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1892
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1912
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1918
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1926
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1931
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1946
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1951
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1973
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1975
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1977
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1979
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2009
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr ""
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -1137,7 +1219,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -1145,106 +1227,119 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2265
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2278
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
+msgid "Data location"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2287
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2340
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2347
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2421
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2423
-msgid "Size"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2381
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2386
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2390
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2413
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2417
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2442
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2472
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2480
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2494
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2548
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2562
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr ""
diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po
index e33cb493d36b15721d56e20bf3cc2af1587f0f46..71ee2b07e4d33c0d1bd3b63a730cc20146b29817 100644
--- a/apps/i2psnark/locale/messages_de.po
+++ b/apps/i2psnark/locale/messages_de.po
@@ -12,6 +12,7 @@
 # foo <foo@bar>, 2009
 # SteinQuadrat, 2013
 # Lars Schimmer <echelon@i2pmail.org>, 2014
+# Max Muster <scr53875@soisz.com>, 2014
 # mixxy, 2011
 # nextloop <ga25day@mytum.de>, 2013
 # pirr <pirr@tormail.org>, 2012
@@ -20,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-23 09:16+0000\n"
-"Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-20 00:31+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,1259 +33,1318 @@ msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:69
 msgid "No more torrents running."
-msgstr "Keine weiteren laufenden Torrents."
+msgstr "Keine weiteren Torrents laufen."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P-Tunnel geschlossen."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
-msgstr "Gesamtanzahl der Uploadslots geändert auf {0}"
+msgstr "Gesamthochladerbegrenzung geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
-msgstr "Minimale Anzahl derUploadslots ist {0}"
+msgstr "Minimale Gesamthochladerbegrenzung ist {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
-msgstr "Upload-Bandbreite wurde auf {0}kbyte/s geändert."
+msgstr "Hochladebandbreitenbegrenzung geändert auf {0}kbyte/s."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
-msgstr "Minimales Limit der Upload-Bandbreite ist {0} kbyte/s."
+msgstr "Minimale Hochladebandbreitenbegrenzung ist {0} kbyte/s."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
-msgstr "Startverzögerung auf {0} gesetzt"
+msgstr "Startverzögerung geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
-msgstr "Auffrischungsrate auf {0} gesetzt"
+msgstr "Aktualisierungsrate geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
-msgstr "Auffrischung abgeschaltet"
+msgstr "Aktualisierung deaktiviert"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Seitengröße geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Datenverzeichnis muss ein absoluter Pfad sein"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
-msgstr "Datenverzeichnis existiert nicht"
+msgstr "Datenverzeichnis nicht vorhanden"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Kein Verzeichnis"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Unlesbar"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Datenverzeichnis geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Änderungen an I2CP und am Tunnel werden nach dem Stoppen aller Torrents wirksam"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
-msgstr "I2CP-Optionen auf {0} gesetzt"
+msgstr "I2CP-Optionen geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
-msgstr "Trenne das alte I2CP-Ziel"
+msgstr "Altes I2CP-Ziel wird getrennt"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP-Einstellungen geändert auf {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Verbinden mit den neuen Einstellungen nicht möglich, benutze wieder die alten I2CP-Einstellungen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Verbinden mit den alten Einstellungen nicht möglich!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Verbunden auf dem neuem I2CP-Ziel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
-msgstr "I2CP-Verbindung neu gestartet für \"{0}\""
+msgstr "I2CP-Lauscher neu gestartet für \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
-msgstr "Neu angelegte Dateien werden allgemein lesbar sein."
+msgstr "Neu Dateien werden allgemein lesbar sein."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
-msgstr "Neu angelegte Dateien werden nicht allgemein lesbar sein."
+msgstr "Neue Dateien werden nicht allgemein lesbar sein."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
-msgstr "Aktiviere Autostart"
+msgstr "Autostart wird aktiviert"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
-msgstr "Deaktiviere Autostart"
+msgstr "Autostart wird deaktiviert"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "OpenTracker aktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "OpenTracker deaktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
-msgstr "DHT eingeschaltet"
+msgstr "DHT aktiviert."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
-msgstr "DHT ausgeschaltet"
+msgstr "DHT deaktiviert."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
-msgstr "DHT-Änderungen bedürfen des anhaltens und erneuten Startens der Tunnel."
+msgstr "DHT-Änderungen erfordern das Anhalten und erneutes Öffnen des Tunnels"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
-msgstr "Thema {0} geladen. Gehen Sie zurück zur Hauptseite von i2psnark, um die Änderungen zu sehen!"
+msgstr "{0} Theme geladen. Gehen Sie zurück zur Hauptseite von i2psnark, um die Änderungen zu sehen!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Konfiguration nicht geändert."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "OpenTracker-Liste geändert - Um dies anzuwenden, müssen die Torrents neu gestartet werden"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
-msgstr "Liste privater Tracker geändert - betrifft nur neu erstellte Torrents"
+msgstr "Liste privater Tracker geändert - betrifft nur neu erstellte Torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Konnte Konfiguration nicht in {0} speichern"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Verbinde mit I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
-msgstr "Fehler beim Verbinden mit I2P - Kontrollieren Sie die I2CP-Einstellungen!"
+msgstr "Fehler beim Verbinden mit I2P - Überprüfen Sie Ihre I2CP-Einstellungen!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Fehler: Konnte den Torrent \"{0}\" nicht hinzufügen"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
-msgstr "Kann dies nicht öffnen: \"{0}\""
+msgstr "Kann \"{0}\" nicht öffnen"
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent mit diesem Infohash läuft schon: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
-msgstr "Fehler - Keine I2P-Tracker im privaten Torrent {0}"
+msgstr "FEHLER - Keine I2P-Tracker im privaten Torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
-msgstr "Warnung - keine I2P-Tracker in \"{0}\", werde nur bei I2P-OpenTrackern und mittels DHT bekanntgeben"
+msgstr "Warnung - Keine I2P-Tracker in \"{0}\", es wird nur bei I2P-OpenTrackern und mittels DHT bekanntgeben"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
-msgstr "Warnung - keine I2P-internen Tracker in \"{0}\", und OpenTracker deaktiviert. Bekanntgabe erfolgt nur mittels DHT."
+msgstr "Warnung - Keine I2P-Tracker in \"{0}\" und OpenTrackers sind deaktiviert. Bekanntgabe erfolgt nur mittels DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
 "disabled, you should enable open trackers or DHT before starting the "
 "torrent."
-msgstr "Warnung - keine I2P-internen Tracker in \"{0}\", und as Benutzen von sowohl DHT alsauch OpenTracker sind deaktiviert. DHT oder OpenTracker sollten aktiviert werden, bevor du den Torrent startest."
+msgstr "Warnung - Keine I2P-Tracker in \"{0}\", und DHT und OpenTrackers sind deaktiviert. Sie sollten DHT oder OpenTrackers vor dem Starten des Torrents aktivieren."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent in \"{0}\" ist nicht gültig"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
-msgstr "Fehler - unzureichender Arbeitsspeicher, kann keinen Torrent von {0} erstellen."
+msgstr "FEHLER - Unzureichender Arbeitsspeicher, kann keinen Torrent von {0} erstellen."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent hinzugefügt und gestartet: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent hinzugefügt: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
-msgstr "Hole {0}"
+msgstr "{0} wird abgerufen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
 "succeed until you start another torrent, enable open trackers, or enable "
 "DHT."
-msgstr "Das Verwenden von OpenTrackern ist abgeschaltet und wir haben keine DHT-Gegenstellen. Das Herunterladen von {0} könnte scheitern, sofern kein anderer Torrent gestartet und die Verwendung von OpenTrackern oder DHT erlaubt wird."
+msgstr "Das Verwenden von OpenTrackern ist deaktiviert und wir haben keine DHT-Gegenstellen. Das Abrufen von {0} könnte scheitern, sofern Sie keinen anderen Torrent starten. Aktivieren Sie OpenTracker oder DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
-msgstr "Hinzufügen {0}"
+msgstr "{0} wird hinzugefügt"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
-msgstr "Download läuft bereits: {0}"
+msgstr "Herunterladen läuft bereits: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
-msgstr "Konnte Torrent-Datei nicht nach {0} kopieren"
+msgstr "Fehler beim Kopieren der Torrentdatei nach {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Zu viele Dateien in  \"{0}\" ({1}), wird gelöscht! "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrentdatei \"{0}\" darf nicht auf '.torrent' enden, wird gelöscht!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
-msgstr "Keine Teile in \"{0}\", wird entfernt!"
+msgstr "Keine Teile in \"{0}\", wird gelöscht!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Zu viele Teile in  \"{0}\", das Limit sind {1}, werden gelöscht!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
-msgstr "Teile in \"{0}\" sind zu groß ({1}B), lösche es."
+msgstr "Teile in \"{0}\" sind zu groß ({1}B), werden gelöscht!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Limit ist \"{0}\"Bytes"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Torrent \"{0}\" enthält keine Daten und wird gelöscht!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
-msgstr "Torrents größer als \"{0}\"Bytes werden nicht unterstützt, lösche \"{1}\"."
+msgstr "Torrents größer als \"{0}\"Bytes werden nicht unterstützt, \"{1}\" wird gelöscht."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Fehler: Konnte den Torrent \"{0}\" nicht entfernen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
-msgstr "Torrent angehalten: \"{0}\""
+msgstr "Torrent gestoppt: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent entfernt: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
-msgstr "Füge Torrents in {0} hinzu ..."
+msgstr "Torrents in {0} werden hinzugefügt"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
-msgstr "Limit der Upload-Bandbreite ist {0} KByte/s."
+msgstr "Hochladebandbreitenbegrenzung ist {0} KByte/s."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
-msgstr "vollständig heruntergeladen:\"{0}\""
+msgstr "Herunterladen abgeschlossen: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo für {0} erhalten"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
-msgstr "Starte Torrent {0} ..."
+msgstr "Torrent {0} wird gestartet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Fehler bei Torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Konnte keine Verbindung zu I2P herstellen!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
-msgstr "I2P Tunnel öffnen ..."
+msgstr "I2P-Tunnel wird geöffnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
-msgstr "Öffne den I2P-Tunnel und starte alle Torrents ..."
+msgstr "Den I2P-Tunnel öffnen und alle Torrents starten."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
-msgstr "Stoppe alle Torrents und beende den I2P-Tunnel."
+msgstr "Alle Torrents stoppen und den I2P-Tunnel schließen."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Der I2P-Tunnel wird nach Benachrichtigung der Tracker geschlossen."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
-msgstr "Keine gültigen Tracker für {0}. Sollen OpenTracker und/oder DHT verwendet werden?"
+msgstr "Keine gültigen Tracker für {0}. OpenTrackers oder DHT aktivieren?"
 
 #: ../java/src/org/klomp/snark/UpdateHandler.java:49
 #: ../java/src/org/klomp/snark/UpdateRunner.java:228
 msgid "Updating"
-msgstr "Lade Aktualisierung ..."
+msgstr "Aktualisierung"
 
 #: ../java/src/org/klomp/snark/UpdateRunner.java:115
 #, java-format
 msgid "Updating from {0}"
-msgstr "Lade Aktualisierung von {0}"
+msgstr "Aktualisierung von {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
-msgstr "Torrent-Datei von {0} herunterladen"
+msgstr "Torrentdatei von {0} herunterladen"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent wurde nicht geladen von {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
-msgstr "Torrent geholt von {0}"
+msgstr "Torrent abgerufen von {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent läuft schon: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent ist schon in der Warteschlange: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent in {0} war nicht gültig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
-msgstr "Einstellungen"
+msgstr "Konfiguration"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr "Anonymer BitTorrent-Client"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Router ist Offline"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
-msgstr "Aktualisiere Seite"
+msgstr "Seite aktualisieren"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
-msgstr "Drücke den \"Torrent Hinzufügen\" Button um den Torrent zu laden"
+msgstr "Klicken Sie die \"Torrent Hinzufügen\"-Schaltfläche, um den Torrent abzurufen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
-msgstr "Lösche Nachrichten"
+msgstr "Nachrichten löschen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
-msgstr "Zustand"
+msgstr "Status"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Sortieren nach {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Teilnehmer ausblenden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Teilnehmer einblenden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "geschätzte verbleibende Zeit"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Dateityp"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
-msgstr "Dauer"
+msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "heruntergeladen"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Geschätzte verbleibende Zeit"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
-msgstr " "
+msgstr " Empf."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "hochgeladen"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Heruntergeladen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Größe"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
-msgstr " "
+msgstr " Send."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "eingehend"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Hochladeverhältnis"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Hochgeladen"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
-msgstr "Downloadgeschwindigkeit"
+msgstr "Übertragungsrate für den Empfang"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "ausgehend"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Herunterladegeschwindigkeit"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
-msgstr "Uploadgeschwindigkeit"
+msgstr "Übertragungsrate fürs Senden"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Hochladegeschwindigkeit"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
-msgstr "Stoppe alle Torrents und den I2P-Tunnel"
+msgstr "Alle Torrents und den I2P-Tunnel stoppen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
-msgstr "Stoppe alle"
+msgstr "Alle stoppen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
-msgstr "Alle angehaltenen Torrents fortsetzen"
+msgstr "Alle gestoppten Torrents fortsetzen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
-msgstr "Starte alle"
+msgstr "Alle starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
-msgstr "Starte alle Torrents und den I2P-Tunnel"
+msgstr "Alle Torrents und den I2P-Tunnel starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
-msgstr "keine Torrents geladen"
+msgstr "Keine Torrents geladen."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Gesamt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 Torrent"
 msgstr[1] "{0} Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 verbundener Teilnehmer"
 msgstr[1] "{0} verbundene Teilnehmer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
-msgstr[0] "eine DHT-Gegenstelle"
+msgstr[0] "1 DHT-Gegenstelle"
 msgstr[1] "{0} DHT-Gegenstellen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
-msgstr "erste"
+msgstr "Erste"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Erste Seite"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
-msgstr "Vorheriger"
+msgstr "Vorherige"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Vorherige Seite"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
-msgstr "Nächster"
+msgstr "Nächste"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Nächste Seite"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
-msgstr "letzte"
+msgstr "Letzte"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
-msgstr "letzte Seite"
+msgstr "Letzte Seite"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "Datenverzeichnis kann nicht erstellt werden"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "Kann den Torrent {0} nicht hinzufügen, da dieser in einem anderen Torrent ist: {1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
-msgstr "ungültige URL - muss mit \"http://\", \"{0}\" oder \"{1}\" anfangen"
+msgstr "Ungültige URL - muss mit \"http://\", \"{0}\" oder \"{1}\" anfangen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
-msgstr "Magnetlink wurde gelöscht: {0}"
+msgstr "Magnetlink gelöscht: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Torrentdatei gelöscht: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Download gelöscht: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
-msgstr "Daten gelöscht: {0}"
+msgstr "Datendatei gelöscht: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Daten konnten nicht gelöscht werden: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Das Verzeichnis {0} konnte nicht gelöscht werden."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Verzeichnis gelöscht: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr "Kann keinen Torrent mit der Endung \".torrent\" hinzufügen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr "Torrent mit diesem Namen ist schon aktiv: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr "Kann keinen Torrent hinzufügen, der das I2P Verzeichnis beinhaltet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr "Kann den Torrent {0} nicht hinzufügen, da dieser in einem anderen Torrent ist: {1}"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr "Kann den Torrent {0} nicht hinzufügen, da dieser den Torrent {1} enthält."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Fehler - Einfügen alternativer Tracker ohne primären Tracker nicht möglich"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Fehler - Mischen von privaten und öffentlichen Trackern in einem Torrent nicht möglich"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent erstellt für \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Viele I2P-Tracker erfordern eine Registrierung, bevor der Torrent verteilt wird. Bitte tun Sie dies vor dem Start von \"{0}\"!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Fehler beim Erstellen eines Torrents für \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
-msgstr "Kann keinen Torrent für nicht existente Daten erstellen: {0}"
+msgstr "Kann keinen Torrent für nicht existente vorhandene erstellen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Fehler beim Erstellen des Torrents - Sie müssen eine Datei oder ein Verzeichnis angeben."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
-msgstr "Lösche ausgewähltes"
+msgstr "Ausgewählte löschen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
-msgstr "Trackereinstellungen speichern"
+msgstr "Trackerkonfiguration speichern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Entfernt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
-msgstr "Füge Tracker hinzu"
+msgstr "Tracker hinzufügen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
-msgstr "Gib einen gültigen Tracker-Namen sowie die URLs an!"
+msgstr "Geben Sie einen gültigen Tracker-Namen und die URLs ein"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
-msgstr "Auf Default zurücksetzen"
+msgstr "Auf Standardeinstellungen zurücksetzen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
-msgstr "Auf Default Tracker zurückgesetzt"
+msgstr "Auf Standard-Tracker zurückgesetzt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Überprüfe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Reserviere"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Trackerfehler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 Teilnehmer"
 msgstr[1] "{0} Teilnehmern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
-msgstr "Verteile"
+msgstr "Verteilvorgang"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
-msgstr "vollständig"
+msgstr "Vollständig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Stillstand"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
-msgstr "keine Teilnehmer"
+msgstr "Keine Teilnehmer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
-msgstr "angehalten"
+msgstr "Gestoppt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Details"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
-msgstr "Zeige Dateien"
+msgstr "Dateien ansehen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
-msgstr "Öffne Datei"
+msgstr "Datei öffnen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Torrent stoppen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Torrent starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Start"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
-msgstr "entfernt den Torrent von der aktiven Liste und löscht die .torrent-Datei"
+msgstr "Entfernt den Torrent von der aktiven Liste und löscht die .torrent-Datei"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
-msgstr "Möchten Sie wirklich die Datei  \\''{0}\\'' löschen (Heruntergeladene Daten werden nicht gelöscht) ?"
+msgstr "Sind Sie sicher, dass Sie die Datei  \\''{0}\\'' löschen möchten (Heruntergeladene Daten werden nicht gelöscht)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
-msgstr "löscht die .torrent-Datei und dazugehörige Daten Datei(en)"
+msgstr "Löscht die .torrent-Datei und (die) dazugehörige Datendatei(en)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Sind Sie sicher, dass Sie die Torrentdatei \\''{0}\\'' und alle heruntergeladenen Daten löschen wollen?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Quelle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
-msgstr "uninteressant (Der Teilnehmer hat keine Teile, die wir benötigen)"
+msgstr "Uninteressant (Der Teilnehmer hat keine Teile, die wir benötigen)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
-msgstr "gedrosselt (Der Teilnehmer hat uns nicht erlaubt, Teile anzufordern)"
+msgstr "Gedrosselt (Der Teilnehmer hat uns nicht erlaubt, Teile anzufordern)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
-msgstr "uninteressiert (Wir haben keine Teile, die der Teilnehmer benötigt)"
+msgstr "Uninteressiert (Wir haben keine Teile, die der Teilnehmer benötigt)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
-msgstr "gedrosselt (Wir erlauben dem Teilnehmer nicht, Teile anzufordern)"
+msgstr "Gedrosselt (Wir erlauben dem Teilnehmer nicht, Teile anzufordern)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Details beim Tracker {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Torrent hinzufügen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
-msgstr "Quell-URL"
+msgstr "Von URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
-msgstr "Gib die URL einer Torrentdatei (I2P-Link), einen Magnet- / Maggot-Link oder einen Info-Hash ein!"
+msgstr "Geben Sie die URL zum Herunterladen einer Torrentdatei (I2P-Link), einen Magnet-Link, einen Maggot-Link oder einen Info-Hash ein!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Füge Torrent hinzu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Datenverzeichnis"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Geben Sie das Verzeichnis zum Speichern der Daten ein (Standardeinstellung {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Alternativ können Sie die .torrent-Dateien auch nach {0} kopieren."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Das Entfernen der .torrent-Datei stoppt den jeweiligen Torrent."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Torrent erstellen"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Daten zum Verteilen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr "Datei oder Verzeichnis zum Verteilen (Gesamter Pfad oder aus dem Verzeichnis {0} )"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primär"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternativen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
-msgstr "Erstelle Torrent"
+msgstr "Torrent erstellen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
-msgstr "Keiner"
+msgstr "keiner"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Datenverzeichnis"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Dateien von allen lesbar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
-msgstr "Ist dies markiert, können andere Benutzer auf die heruntergeladenen Dateien zugreifen."
+msgstr "Wenn abgehakt, können andere Benutzer auf die heruntergeladenen Dateien zugreifen."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr "Torrents automatisch starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
-msgstr "Wenn markiert, werden hinzugefügte Torrents automatisch gestartet."
+msgstr "Wenn abgehakt, werden hinzugefügte Torrents automatisch gestartet."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Aufmachung"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
-msgstr "Auffrischungsintervall"
+msgstr "Aktualisierungsintervall"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Nie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Startverzögerung"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Seitengröße"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Gesamtlimit an Hochladern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "Teilnehmer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Bandbreitenbegrenzung beim Hochladen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Halbe verfügbare Bandbreite wird empfohlen."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Routerbandbreite ansehen oder ändern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
-msgstr "Benutze auch OpenTracker"
+msgstr "Auch OpenTracker verwenden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
-msgstr "Wenn markiert, wird der Torrent neben dem angegebenen Tracker auch bei den OpenTrackern bekanntgegeben."
+msgstr "Wenn abgehakt, wird der Torrent neben dem in der Torrentdatei angegebenen Tracker auch bei den OpenTrackern bekanntgegeben."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
-msgstr "DHT einschalten"
+msgstr "DHT aktivieren"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
-msgstr "Wenn ausgewählt, wird DHT verwendet"
+msgstr "Wenn abgehakt, wird DHT verwendet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Einstellungen eingehend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Einstellungen ausgehend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP-Host"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP-Port"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP-Optionen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Name"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "Webseiten-URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Standard"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
-msgstr "offen"
+msgstr "Offen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
-msgstr "privat"
+msgstr "Privat"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Ankündigungs-URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
-msgstr "ungültige Magnet-URL {0}"
+msgstr "Ungültige Magnet-URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 Zwischenstation"
 msgstr[1] "{0} Zwischenstationen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 Tunnel"
 msgstr[1] "{0} Tunnel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
-msgstr "Torrent Datei"
+msgstr "Torrentdatei"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr "Datenadresse"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Info-Hash"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Primärer Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
-msgstr "Tracker Liste"
+msgstr "Tracker-Liste"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Erstellt von"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnetlink"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
-msgstr "privater Torrent"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Größe"
+msgstr "Privater Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Fortschritt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Verbleibend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Dateien"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Stücke"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Stückgröße"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Eine Hierarchie nach oben"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrentdatei nicht gefunden?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Datei nicht gefunden im Torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "vollständig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "verbleibend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
-msgstr "hoch"
+msgstr "Hoch"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
-msgstr "normal"
+msgstr "Normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
-msgstr "auslassen"
+msgstr "Überspringen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Alle auf hoch festlegen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Alle auf normal festlegen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Alle überspringen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Prioritäten speichern"
diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po
index 2539f6219c51971113f3880e3af71b182cc2e7be..7d2ae5bad88b0586af72f48072998c59df27b096 100644
--- a/apps/i2psnark/locale/messages_en.po
+++ b/apps/i2psnark/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2psnark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-30 20:10+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+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"
@@ -23,386 +23,387 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2235
-#: ../java/src/org/klomp/snark/SnarkManager.java:2246
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1941
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:743
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:755
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:768
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:784
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:799
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:804
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:859
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:863
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:871
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:876
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:882
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:889
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:905
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:914
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:922
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:933
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:940
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:950
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:982
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:992
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1038
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1117
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1120
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1129
-#: ../java/src/org/klomp/snark/SnarkManager.java:1978
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr ""
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1151
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr ""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1170
-#: ../java/src/org/klomp/snark/SnarkManager.java:1275
-#: ../java/src/org/klomp/snark/SnarkManager.java:1362
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1178
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and "
 "DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1183
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
 "disabled, you should enable open trackers or DHT before starting the torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1209
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1216
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1230
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1286
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1292
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
 "succeed until you start another torrent, enable open trackers, or enable DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1296
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1328
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1372
-#: ../java/src/org/klomp/snark/SnarkManager.java:1397
-#: ../java/src/org/klomp/snark/SnarkManager.java:1897
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1691
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1694
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1702
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1718
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1739
-#: ../java/src/org/klomp/snark/SnarkManager.java:1757
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1778
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1786
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1817
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1840
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1893
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1894
-#: ../java/src/org/klomp/snark/SnarkManager.java:2123
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1909
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1972
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2122
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2146
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2209
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2228
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:244
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
@@ -417,901 +418,915 @@ msgstr ""
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:267
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:310
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2603
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:272
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:274
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:305
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:316
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:338
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:489
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:507
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:564
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2894
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2911
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2923
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2935
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
 #, java-format
 msgid "Sort by {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:458
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:464
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:487
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2589
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:489
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2894
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "File type"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:507
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
 msgid "Estimated time remaining"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
 msgid "Downloaded"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2759
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2909
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
 msgid "Size"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:562
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:564
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
 msgid "Upload ratio"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:564
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
 msgid "Uploaded"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
 msgid "Down Rate"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:592
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
 msgid "Up Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:625
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:627
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:641
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:639
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:664
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:672
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:684
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:808
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:808
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:942
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1024
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1037
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1051
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1109
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1114
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1130
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1161
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1174
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1200
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1204
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1238
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1238
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1255
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2347
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2349
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1310
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1313
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr ""
 
 #. "<input type=\"reset\" class=\"cancel\" value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1315
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1426
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1427
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1429
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1430
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1453
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1481
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1497
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1456
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1457
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1465
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1469
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1484
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2772
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2988
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1488
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1494
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1495
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1500
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1506
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1510
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1584
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1636
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1638
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1651
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1653
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1666
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1693
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2307
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1733
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1745
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1768
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1770
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1790
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1908
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1925
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1998
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2000
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2003
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or "
 "info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2008
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2011
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2013
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2026
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr ""
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2029
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2033
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2036
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2281
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2038
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2040
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2043
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2061
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2102
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2106
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2110
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2114
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2118
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2132
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2157
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2159
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2186
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2190
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2203
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed "
 "in the torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2211
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2227
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2233
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2261
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2266
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2286
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2894
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2290
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
 msgid "Standard"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2292
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3021
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2294
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr ""
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2388
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2389
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2632
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2640
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2649
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
 msgid "Info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2668
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2702
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2712
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2723
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2735
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2748
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2797
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2923
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2814
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2820
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2945
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2979
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2985
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2998
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2999
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3050
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3055
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3065
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
 msgid "Set all high"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3067
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
 msgid "Set all normal"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3069
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
 msgid "Skip all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr ""
diff --git a/apps/i2psnark/locale/messages_es.po b/apps/i2psnark/locale/messages_es.po
index 716df7377afa966e155f903c4dd06649e2b3e615..4b8c77502fcd947c9a4cd836c88737c28e8caf55 100644
--- a/apps/i2psnark/locale/messages_es.po
+++ b/apps/i2psnark/locale/messages_es.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 03:32+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2014-12-01 03:03+0000\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -34,221 +34,222 @@ msgid "No more torrents running."
 msgstr "No hay más torrents intercambiandose."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Túnel I2P cerrado."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Enlace magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "El límite total de usuarios subiendo ha cambiado a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "El límite mínimo total de usuarios subiendo es {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "El límite de ancho de banda de subida cambió a {0} KB/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "El límite mínimo de ancho de banda de subida es {0} KB/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "El retardo en el arranque cambió a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Hora de actualización cambiado a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Actualización deshabilitada"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Tamaño de página cambiado a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "La carpeta de datos tiene que ser una ruta absoluta"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "La carpeta de datos no existe"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "No es una carpeta"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "No se pudo leer"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Carpeta de datos cambiada a {0} "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Los cambios de I2CP (protocolo cliente I2P) y túnel serán efectivos después de detener todos los torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Opciones I2CP cambiadas a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Desconectando destino I2CP antiguo"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Preferencias de I2CP cambiadas a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "No se pudo conectar usando las nuevas preferencias de I2CP (protocolo cliente I2P), volviendo a las antiguas"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "¡No se pudo reconectar usando las preferencias antiguas!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Reconectado con el nuevo destino I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "El escuchador de I2CP se reinició para \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Los ficheros nuevos serán públicamente legibles"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Los ficheros nuevos no serán públicamente legibles"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Arranque automático activado"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Arranque automático desactivado"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Trackers (rastreadores) abiertos activados - requiere reiniciar el torrent para que sea efectivo."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Trackers (rastreadores) abiertos desactivados - requiere reiniciar el torrent para que sea efectivo."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT habilitada."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT deshabilitada."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Cambiar la DHT (tabla de hash distribuida) requiere cerrar el túnel y volver a abrirlo"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "Tema {0} cargado, vuelva a la página principal de i2psnark para verlo"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "La configuración no cambió."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "La lista de trackers (rastreadores) abiertos cambió - requiere reiniciar el torrent para que sea efectiva."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "La lista de trackers (rastreadores) privados cambió - afactará sólo a los torrents creados a partir de ahora."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "No se pudo guardar la configuración en {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Conectando a I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Error al conectar a I2P - ¡compruebe sus preferencias de I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Error: No se pudo añadir el torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "No se pudo abrir \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Ya hay un torrent con esta información de hash (identificador criptográfico): {0}."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "ERROR - No hay trackers I2P en el torrent privado \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", sólo se anunciará a trackers abiertos I2P y a la DHT (tabla de hash distribuida)."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", y los trackers abiertos están deshabilitados. Sólo se anunciará a la DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -256,34 +257,34 @@ msgid ""
 "torrent."
 msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", y la DHT (tabla de hash distribuida) y los trackers abiertos están deshabilitados, debe habilitar los trackers abiertos o la DHT antes de iniciar el torrent."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "El torrent en \"{0}\" no es válido."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERROR - Sin memoria disponible, no se pudo crear un torrent a partir de {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent añadido e iniciado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent añadido: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Obteniendo {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -291,132 +292,132 @@ msgid ""
 "DHT."
 msgstr "Los rastreadores abiertos están desactivados y no hay pares DHT. Es posible que no se puedan obtener para {0}  hasta que no inicie otro torrent, active los rastreadores abiertos o active la DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Añadiendo {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Descarga ya en marcha: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "No se pudo copiar el fichero torrent a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Hay demasiados ficheros en \"{0}\" ({1}), ¡borrándolos!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "El fichero torrent \"{0}\" no puede terminar en \".torrent\". ¡borrándolo!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "No hay partes en \"{0}\", ¡borrándolo!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Hay demasiadas partes en \"{0}\", el límite es {1}, ¡borrándolo!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Las partes en \"{0}\" ({1}Bytes) son demasiado grandes, ¡borrándolas!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "El límite es de \"{0}\"Bytes"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "El torrent \"{0}\" no contiene datos, ¡borrándolo!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Los torrents mayores de \"{0}\"Bytes aún no están soportados, borrando \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Error: No se pudo eliminar el torrent \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent detenido: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent eliminado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Añadiendo torrents en {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "El limite de ancho de banda de subida es {0} KB/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Descarga finalizada: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo recibida para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Iniciando el torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Error en el torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "¡No se pudo conectar con I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Abriendo el túnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Abriendo el túnel I2P e iniciando todos los torrents ..."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Deteniendo todos los torrents y cerrando el túnel I2P."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Cerrando túnel I2P después de avisar a los trackers"
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:244
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "No hay rastreadores válidos para {0}. ¿Quiere activar los rastreadores abiertos o la DHT?"
@@ -431,859 +432,917 @@ msgstr "Actualizando"
 msgid "Updating from {0}"
 msgstr "Actualizando desde {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Descargar archivo torrent desde {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "El torrent no se pudo obtener desde {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent obtenido desde {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent ya en marcha: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent ya en cola: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "El torrent en {0} no era válido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr "Cliente BitTorrent anónimo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "El router está caído"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Actualizar página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Foro"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Haga clic en el botón \"Añadir torrent\" para obtener un torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "eliminar mensajes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Estado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Ordenado por {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Ocultar pares ('peers')"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Mostrar pares ('peers')"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Tiempo restante estimado"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Tipo de fichero"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Llegada"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Descargado"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Tiempo restante estimado"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "Receptor"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Subido"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Descargado"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Tamaño"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "Transmisor"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Tasa de descarga"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Tasa de subida"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Subido"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "Tasa de descarga"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Tasa de subida"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Tasa de descarga"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "Tasa de subida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Tasa de subida"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Detener todos los torrents y el túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Detener todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Iniciar todos los torrents parados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Iniciar todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Iniciar todos los torrents y el túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "No hay torrents cargados."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totales"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 par conectado"
 msgstr[1] "{0} pares conectados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "1 par DHT"
 msgstr[1] "{0} pares DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Primera"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Primera página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Anterior"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Página siguiente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Última"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Última página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "No se pudo crear el directorio de datos"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "No puede añadir un torrent {0} dentro de otro torrent: {1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "URL no válida: debe comenzar con \"http://\", \"{0}\", o \"{1}\"."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet borrado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Fichero torrent borrado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Descarga borrada: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Fichero de datos borrado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "No se pudo borrar el fichero de datos: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "No se pudo borrar la carpeta {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Carpeta borrada: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr "No se pudo añadir un torrent que acaba en \".torrent\": {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr "Un torrent con este nombre ya está intercambiandose: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr "No puede añadir un torrent que incluye un directorio I2P: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr "No puede añadir un torrent {0} dentro de otro torrent: {1}"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr "No puede añadir un torrent {0} que incluye otro torrent: {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Error - No se pueden incluir trackers alternativos sin un tracker principal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Error - No se pueden mezclar trackers privados y públicos en un torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent creado para \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Muchos trackers (rastreadores) I2P requieren que registre los nuevos torrents antes del seeding (sembrado) - por favor hágalo antes de iniciar \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Error al crear un torrent para \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "No se pudo crear un torrent para los datos inexistentes: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Error al crear torrent - ha de introducir un fichero o carpeta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Borrar seleccionados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Guardar configuración de tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Eliminado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Añadir tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Introduzca nombre y URLs de tracker (rastreador) válidos"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Restaurar predeterminados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Trackers (rastreadores) predeterminados restaurados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Comprobando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Asignando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Error del tracker (rastreador)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 par"
 msgstr[1] "{0} pares"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Iniciando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Sembrando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Estancado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Sin pares"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Detalles del torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Ver ficheros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Abrir fichero"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Detener el torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Detener"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Iniciar el torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Eliminar el torrent de la lista de torrents activos, borrando el fichero .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "¿Está seguro de que quiere borrar el fichero \\''{0}\\'' (los datos descargados no serán borrados)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Borrar el fichero .torrent y el(los) ficheros(s) de datos asociado(s)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "¿Está seguro de que quiere borrar el torrent \\''{0}\\'' y todos los datos descargados correspondientes?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Semilla (seed)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Sin interés (el par no tiene las partes que necesitamos)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Restringido (el par no nos está permitiendo solicitar partes)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "No interesado (no tenemos las partes que el par precisa)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Restringiendo (no estamos permitiendo al par solicitar partes)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detalles en el tracker (rastreador) {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Información"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Añadir torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Desde la URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Introduzca URL de descarga del fichero torrent (sólo I2P), enlace magnet, enlace maggot, o información de hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Añadir torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Dir de datos"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Introduzca el directorio en el que guardar los datos (por defecto {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "También puede copiar ficheros .torrent a: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Eliminar un fichero .torrent provocará que se detengan sus transferencias."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Crear un torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Datos a sembrar ('seed')"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr "Fichero o directorio a sembrar (seed) (ruta completa o dentro del directorio {0} ) "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Principal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternativos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Crear torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "ninguno"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Carpeta de datos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Ficheros legibles por todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Si está marcada, otros usuarios pueden acceder a los ficheros descargados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr "Auto iniciar torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Si está marcado, iniciará automáticamente los torrents se añadan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Tema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Hora de actualización"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Nunca"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Retardo al arrancar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minutos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Tamaño de página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Límite total de usuarios subiendo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "pares"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Límite de velocidad de subida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Se recomienda la mitad del ancho de banda disponible."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Mostrar o cambiar ancho de banda del router (enrutador)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Usar también trackers (rastreadores) abiertos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Si está marcado, anuncia los torrents a los trackers (rastreadores) abiertos así como a los listados en el fichero torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Habilitar DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Si está marcada, usar DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Preferencias de entrada"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Preferencias de salida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Anfitrión I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Puerto I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Opciones de I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Guardar configuración"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Nombre"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL del sitio web"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Estándar"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Abrir"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "URL de anunciamientos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Añadir"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "URL de magnet no válida: {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 salto"
 msgstr[1] "{0} saltos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 túnel"
 msgstr[1] "{0} túneles"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Fichero torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr "Ubicación de los datos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Información de hash"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Tracker principal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Lista de trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Creado en"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Creado por"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Enlace de magnet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Torrent privado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Tamaño"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Finalización"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Restante"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Ficheros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Partes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Tamaño de las partes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Carpeta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Subir a la carpeta del siguiente nivel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "¿No se encotró el fichero torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "¿No se encontró el fichero en el torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "restante"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Alta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Saltar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Configurar todos a alto "
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Configurar todos a normal"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Omitir todos"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Guardar prioridades"
diff --git a/apps/i2psnark/locale/messages_fr.po b/apps/i2psnark/locale/messages_fr.po
index 5c5da6cd93d78cdead75b8c4d0ea783f5144423b..a8c3fa4d6e9519dfdfd3224220aa7bb31cd64e3a 100644
--- a/apps/i2psnark/locale/messages_fr.po
+++ b/apps/i2psnark/locale/messages_fr.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 16:24+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2014-12-22 09:56+0000\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -31,221 +31,222 @@ msgid "No more torrents running."
 msgstr "Il n'y a plus de torrents en fonctionnement."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Tunnel I2P fermé."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Limite totale uploaders modifiée à : {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "La limite de nombre minimal d''uploaders est {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Limite d’envoi modifiée à : {0} ko/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "La limite minimale d’envoi est {0} ko/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Délai de démarrage modifié à {0} minutes"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Temps de rafraîchissement changé pour {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Rafraîchissement  désactivé"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Taille de la page changée pour {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Répertoire des données doit être un chemin absolu"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Répertoire de données n'existe pas"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Pas un répertoire"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Illisible"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Répertoire des données changé pour {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Les modifications sur I2CP et les tunnels seront pris en compte après avoir arrêté tous les torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Options  I2CP changées pour {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Déconnexion des anciennes destination I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Les paramètres I2CP ont été changés à {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Impossible de se connecter avec les nouveaux paramètres, retour à l'ancienne configuration I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Impossible de se reconnecter avec les anciens paramètres!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Reconnexion sur la nouvelle destination I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "Écouteur I2CP redémarré pour \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Les nouveaux fichiers seront publiquement lisibles"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Les nouveaux fichiers ne seront pas publiquement lisibles"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Démarrage automatique activé"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Démarrage automatique désactivé"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Open trackers activés - redémarrage des torrents requis pour prise en compte."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Open trackers désactivés - redémarrage des torrents requis pour prise en compte."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT activée."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT désactivée."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Le changement DHT nécessite la fermeture puis réouverture du tunnel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "Thème {0}  chargé, revenez à la page d''accueil d''i2psnark pour voir comme il est beau !"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Aucun changement de configuration."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Liste des Open trackers modifiée - redémarrage des torrents requis pour prise en compte"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Liste tracker privé modifiée - affecte seulement les torrents nouvellement créés."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Impossible de sauvegarder la configuration vers {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Connexion à I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Erreur de connexion à I2P - Vérifiez vos paramètres I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Erreur : Impossible d’ajouter le torrent : {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Impossible d’ouvrir: \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Un torrent avec cette empreinte est déjà actif: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "ERREUR - Pas de trackers I2P dans le torrent privé \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", vais annoncer aux trackers I2P ouverts et DHT seulement."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", et les trackers ouverts sont désactivés, vais annoncer à DHT seulement."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -253,34 +254,34 @@ msgid ""
 "torrent."
 msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", et DHT et les trackers ouverts sont désactivés, vous devriez activer les trackers ouverts ou DHT avant de démarrer le torrent."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Le torrent dans \"{0}\" est invalide"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERREUR - Mémoire insuffisante, impossible de créer le torrent depuis {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent ajouté et démarré: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent ajouté: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Envoi {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -288,132 +289,132 @@ msgid ""
 "DHT."
 msgstr "Les trackers ouverts sont désactivés et nous n''avons pas de pairs DHT. La recherche de {0} pourrait ne pas réussir jusqu''à ce que vous démarriez un autre torrent, activiez trackers ouverts, ou activeiz DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Ajout {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Téléchargements déjà en cours: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Impossible de copier le torrent vers {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Trop de fichiers dans \"{0}\" ({1}), suppression! "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Le fichier torrent \"{0}\" ne peut pas se terminer par \".torrent\", suppression!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Pas de tronçon dans \"{0}\", suppression!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Trop de tronçons dans \"{0}\" , la limite est {1}, suppression!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Les tronçons sont trop larges dans \"{0}\" ({1}B), suppression."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "La limite est de \"{0}\"octets"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Le fichier torrent \"{0}\" n'a pas de données, suppression!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Les torrents dont la taille est supérieure à \"{0}\"octets ne sont pas encore supportés, suppression \"{1}\"."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Erreur: Impossible de supprimer le torrent \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent arrêté: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent supprimé: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Ajout des torrents dans {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Limite bande passante haute est {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Téléchargement terminé: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo reçue pour {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Démarrage du torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Erreur sur torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Impossible de se connecter à I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Ouverture du tunnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Ouverture du tunnel I2P and démarrage de tous les torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Arrêt de tous les torrents et fermeture du tunnel I2P."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Fermeture du tunnel I2P après notification aux trackers."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:244
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Pas de trackers valides pour {0} - activer trackers ouverts ou DHT?"
@@ -428,859 +429,917 @@ msgstr "En cours de mise à jour"
 msgid "Updating from {0}"
 msgstr "Mise à jour depuis {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Téléchargement fichier torrent depuis {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Le torrent n’a pas été reçu de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent reçu de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent déjà actif: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent déjà dans la file d''attente: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Le torrent {0} est invalide"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr "Client BitTorrent anonyme"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Le routeur est tombé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Rafraîchir la page"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Cliquer le bouton \"Ajout torrent\" pour aller chercher le torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "nettoyer messages"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "État"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Trier par {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Cacher les pairs"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Afficher les pairs"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Temps restant estimé"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Type de fichier"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Temps"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Téléchargé"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Temps restant estimé"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "Reçu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Envoyé"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Téléchargé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Taille"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "Envoyé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Taux de téléchargement"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Radio en upload"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Envoyé"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "Taux RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Taux d'envoi"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Taux de téléchargement"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "Taux TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Taux d'envoi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Arrêter tous les torrents et le tunnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Arrêter tout"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Démarrer tous les torrents arrêtés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Démarrer tout"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Démarrer tous les torrents et le tunnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Aucun torrent chargé."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totaux"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "{0} torrent"
 msgstr[1] "{0} torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "{0} pair connecté"
 msgstr[1] "{0} pairs connectés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "1 pair DHT"
 msgstr[1] "{0} pairs DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Premier"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Première page"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Préc"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Page suivante"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Suivant"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Page suivante"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Dernier"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Dernière page"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "Le répertoire données ne peut pas être créé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "Ne peut pas ajouter le torrent {0} à l'intérieur d'un autre torrent: {1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "URL incorrecte - elle doit débuter par \"http://\", \"{0}\", ou \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet supprimé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Fichier torrent effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Téléchargement effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Fichier de données effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Le fichier de données ne peut être effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Le répertoire n''a pas pu être effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Répertoire effacé: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr "Ne peut pas ajouter un torrent se terminant par \".torrent\": {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr "Un torrent avec ce nom est déjà en cours: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr "Ne peut pas ajouter un torrent incluant un dossier d''I2P: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr "Ne peut pas ajouter le torrent {0} à l'intérieur d'un autre torrent: {1}"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr "Ne peut pas ajouter le torrent {0} incluant un autre torrent: {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Erreur - Ne peut pas inclure de trackers trackers alternatifs sans un tracker primaire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Erreur - Ne peut pas mixer dans un torrent trackers public et privés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent créé pour \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "De nombreux trackers I2P nécessitent d’enregistrer les nouveaux torrents avant de seeder - faites-le avant de démarrer \"{0}\"!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Erreur de création du torrent pour \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Impossible de créer un torrent pour des données inexistantes: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Erreur de création du torrent - vous devez saisir un fichier ou un répertoire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Effacer les sélectionnés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Sauvegarder la configuration du tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Retiré"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Ajout tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Entrez nom de tracker valide et URLs"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Restaurer les paramètres d'origine"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Restaurer les trackers d'origine"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Vérification"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Allocation"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Erreur du tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} pair"
 msgstr[1] "{0} pairs"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Démarrage"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seed en cours"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Complet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Figé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Pas de pair"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Détails du torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Voir les fichiers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Ouvrir fichier"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Arrêter le torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Démarrer le torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Démarrer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Enlever le torrent de la liste active, suprression du fichier .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Êtes-vous sûr que vous voulez supprimer le fichier \\''{0}\\'' (les données téléchargées ne seront pas supprimées) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Supprimer le fichier .torrent et le(s) fichier(s) de données associé(s)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Êtes-vous certain de vouloir supprimer le torrent \\''{0}\\'' ainsi que toutes les données téléchargées ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Aucun intérêt (le pair n'a aucun tronçon utile)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "bridé (le pair ne nous permet pas de demander des tronçons)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Pas intéressé (aucun tronçon utile au pair)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "bridage (nous ne permettons pas au pair de demander un tronçon)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Détails au tracker {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Ajouter torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Depuis l'URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Entrez l'URL de téléchargement du fichier torrent (I2P seulement), lien magnet, lien maggot, or l'info hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Ajouter torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Répertoire données"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Saisissez le répertoire où sauvegarder les données par défaut (default {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Vous pouvez aussi copier les fichiers .torrent vers {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "La suppression d'un fichier .torrent entraîne l'arrêt du torrent."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Créer torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Données à seeder"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr "Fichier ou dossier à seeder (chemin complet ou dans le dossier {0} )"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primaire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternatifs"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Créer torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "aucun"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Répertoire de données"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Fichiers lisibles par tous"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Si coché, les autres utilisateurs pourront accéder aux fichiers téléchargés."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr "Démarrer automatiquement les torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Si coché, les torrents démarreront automatiquement lors de l'ajout"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Thème"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Temps de rafraîchissement "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Jamais"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Délais de démarrage"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minutes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Taille page"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Limite totale d'envoi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "pairs"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Limite de bande passante en envoi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "La moitié de la bande passante est recommandée."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Consulter ou modifier la bande passante du routeur"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Utiliser les open trackers aussi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Si coché, les torrents seront annoncés vers les open trackers ainsi que vers les trackers indiqués dans le fichier torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Active DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Si coché, utilise DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Paramètres entrants"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Paramètres sortants"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Hôte I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Port I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Options I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Sauvegarder la configuration"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Nom"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL du site web"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Standard"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Ouvrir le fichier"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Annoncer URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Ajout"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "URL magnet {0} incorrecte"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0} saut"
 msgstr[1] "{0} sauts"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0} tunnel"
 msgstr[1] "{0} tunnels"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Fichier torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr "Emplacement donnée"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Info hachage"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Tracker primaire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Liste tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Créé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Créé par"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Lien magnet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Torrent privé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Taille"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Finalisation"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Restant"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Fichiers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Tronçons"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Taille des tronçons"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Répertoire"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Vers le répertoire parent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent non trouvé?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Fichier non trouvé dans le torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "complet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "restant"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Haut"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Ignorer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Mettre tous à haute"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Mettre tous à normale"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Tout sauter"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Sauvegarder les priorités"
diff --git a/apps/i2psnark/locale/messages_hu.po b/apps/i2psnark/locale/messages_hu.po
index 5972ca823bded0d287bc28f6155a16184c545de8..d5a03b354258ebba4f87e45ac98cdec26b58e1f6 100644
--- a/apps/i2psnark/locale/messages_hu.po
+++ b/apps/i2psnark/locale/messages_hu.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -24,221 +24,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P alagút lezárva."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Mágnes"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Teljes feltöltők korlátja megváltoztatva a következőre: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Teljes feltöltők minimum korlátja a következő: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Feltöltési sávszélesség korlátja megváltoztatva a következőre: {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "A minimum feltöltési sávszélesség korlátja {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Késleltetés indításkor megváltoztatva a következőre: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Frissítési idő a következőre változott: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Frissítés kikapcsolva"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Az I2CP-re és alagutakra vonatkozó változtatások az összes torrent leállítása után lépnek érvénybe"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "I2CP opciók a következőre lettek változtatva: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Lekapcsolódás a régi I2CP célállomásról"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP beállítások a következőre változtak: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Sikertelen kapcsolódás az új beállításokat használva, visszatérés a régi I2CP beállításokhoz"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Sikertelen újrakapcsolódás a régi beállításokat használva!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Újracsatlakozva az új I2CP célállomásra"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP figyelő újraindítva a következőhöz: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Az új fájlok nyilvánosan olvashatók lesznek"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Az új fájlok nyilvánosan nem lesznek olvashatók"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Automatikus indítás engedélyezve"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Automatikus indítás kikapcsolva"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Nyílt követők (tracker) engedélyezve - az érvénybe lépéshez a torrent újraindítása szükséges."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Nyílt követők (tracker) kikapcsolva - az érvénybe lépéshez a torrent újraindítása szükséges."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT engedélyezve."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT letiltva."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} téma betöltve, megtekintéséhez térj vissza az i2psnark főoldalára."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Beállítások nem lettek megváltoztatva."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Nyílt Követők (tracker) listája megváltozott - az érvénybe lépéshez a torrent újraindítása szükséges."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Megváltozott a privát tracker lista - csak az újonnan létrehozott torrentekre vonatkozik."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Nem sikerült a beállítások mentése a következőre: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Kapcsolódás az I2P-hez"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Hiba az I2P-hez való csatlakozáskor - ellenőrizd az I2CP beállításait!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Hiba: a következő torrent hozzáadása sikertelen: {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "\"{0}\" megnyitása sikertelen"
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "A torrent már fut ezzel az infó hash-el: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "HIBA - Nincsenek I2P követők (trackerek) a következő privát torrentben: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -246,34 +247,34 @@ msgid ""
 "torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Érvénytelen torrent a következőben: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "HIBA - nincs több memória, torrent létrehozása sikertelen a következőből: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent hozzáadva és elindítva: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent hozzáadva: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Leszedés: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -281,132 +282,132 @@ msgid ""
 "DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "{0} Hozzáadása"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Futó letöltés: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Nem sikerült a torrent fájl másolása a következőre: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Túl sok fájl a következőben: \"{0}\" ({1}), törlésre kerül!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrent fájl \"{0}\" nem végződhet így: \".torrent\", törlésre kerül!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Nincsenek részek a következőben: \"{0}\", törlésre kerül!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Túl sok rész a következőben: \"{0}\", a határ {1}, törlésre kerül!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "A részek túl nagyok a következőben: \"{0}\" ({1}B), törlésre kerül."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "A határ {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "\"{0}\" torrent nem tartalmaz adatot, törlésre kerül!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Nincsenek támogatva torrentek, melyek nagyobbak, mint {0}B, \"{1}\" törlésre kerül"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Hiba: a következő torrent eltávolítása sikertelen: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent leállítva: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent eltávolítva: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Torrentek hozzáadása a következőben: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Feltöltési sebesség korlát {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "A letöltés befejeződött: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainformáció letöltve a következőhöz: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "{0} torrent indítása"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Hiba a következő torrenten: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Sikertelen csatlakozás az I2P-hez!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Az I2P alagút megnyitása"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Az I2P alagút megnyitás, minden torrent indítás alatt."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Az összes torrent leállítás és az I2P alagút lezárás alatt."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
@@ -421,859 +422,917 @@ msgstr "Frissítés"
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent nem került letöltésre a következőről: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent leszedve a következőről: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent már fut: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent már a sorban van: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Érvénytelen torrent a következő helyen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Router leállva"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrentek"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Lap újratöltése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Fórum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Torrent leszedéséhez kattints a \"Torrent hozzáadása\" gombra"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "üzenetek törlése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Állapot"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Társak Elrejtése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Társak Megjelenítése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Becsült hátralévő idő"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "BIE"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Letöltött"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Becsült hátralévő idő"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "Be"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Feltöltött"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Letöltött"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Méret"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "Ki"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Letöltési Sebesség"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Feltöltött"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Feltöltési Sebesség"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Letöltési Sebesség"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Feltöltési Sebesség"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Minden torrent és az I2P alagút leállítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Mindet Leállít"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Mind Indítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Minden torrent és az I2P alagút indítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Egy torrent sem került betöltésre."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Összesen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 csatlakozott társ"
 msgstr[1] "{0} csatlakzott társ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Érvénytelen URL: \"http://\", \"{0}\", vagy \"{1}\" kell kezdődnie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Mágnes észlelve: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Torrent fájl törölve: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Letöltés törölve: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Adatfájl törölve: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Adatfájl törlése nem sikerült: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Könyvtár nem törölhető: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Könyvtár törölve: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent létrehozva a következőnek: \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Sok I2P követő (tracker) megköveteli az új torrentek regisztrációját táplálás (seed) előtt - kérlek, regisztrálj, mielőtt elindítod a következőt:  \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Hiba történt a torrent létrehozásakor  \"{0}\" számára"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Nem sikerült torrent létrehozása, nemlétező adat: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Hiba a torrent létrehozásakor - Fájl vagy könyvtár megadása kötelező"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Kijelöltek törlése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Eltávolítva"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Követő (tracker) hozzáadása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Adj meg érvényes követő (tracker) nevet és URL címeket"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Alapértelmezések visszaállítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Alapértelmezett követők (trackerek) visszaállítva"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Ellenőrzés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Helyfoglalás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Követő (tracker) Hiba"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 társ"
 msgstr[1] "{0} társ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Indítás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Táplálás (seeding)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Kész"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "Rendben"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Beragadt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Nincsenek Társak"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Leállítva"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Torrent részletek"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Fájlok megtekintése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Torrent leállítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Leállítás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Torrent indítása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Indítás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Torrent eltávolítása az aktív listáról, a .torrent fájl törlésével"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr ".torrent fájl törlése a hozzá tartozó adatfájlokkal együtt"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Biztos, hogy törlöd a következő torrentet és az összes letöltött adatot: \\''{0}\\'' ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Táplálás (Seed)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Érdektelen (társ nem rendelkezik számunkra szükséges részekkel)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Eltömődött (a társ nem engedi részek igénylését)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Érdektelen (nem rendelkezünk a társak számára szükséges részekkel)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Eltömődött (a társak számára a részek igénylése nem engedélyezett)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Részletek a következő követőn (tracker): {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Infó"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Torrent Hozzáadása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "URL címről"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Add meg a torrent fájl letöltési URL-jét (csak I2P), mágnes linket, maggot linket vagy infó hash-t"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Torrent hozzáadása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Másolhatsz .torrent fájlokat a következőhöz is: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "A .torrent fájl eltávolításával meg fog állni."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Torrent létrehozása"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Adat táplálásra (seed)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Követők (trackerek)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Torrent létrehozása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Adatkönyvtár"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Mindenki által olvasható fájlok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Ha be van jelölve, más felhasználók is elérhetik a letöltött fájlokat"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Ha be van jelölve, a hozzáadott torrentek automatikusan elindulnak"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Téma"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Idő frissítése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Soha"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Indítási késleltetés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "perc"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Teljes feltöltők korlát"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "társak"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Feltöltési sávszélesség korlát"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "A rendelkezésre álló sávszélesség fele javasolt."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "A router sávszélesség megtekintése vagy megváltoztatása"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Nyílt követőket (tracker) is használjon"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Ha be van jelölve, bejelenti a torrenteket a nyílt követőkre (tracker) és torrent fájlban feltüntetett követőre is"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "DHT engedélyezése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Bejövő Beállítások"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Kimenő Beállítások"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP hoszt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP port"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP opciók"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Név"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "Weboldal URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Megnyitás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privát"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Bejelentési URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Érvénytelen mágnes URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 ugrás"
 msgstr[1] "{0} ugrás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 alagút"
 msgstr[1] "{0} alagút"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Torrent fájl"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Mágnes link"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Privát torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Méret"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Befejezés"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Hátralévő"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Fájlok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Részek"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Rész méret"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioritás"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Vissza a felsőbb szintű könyvtárba"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent nem található?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "File nem található a torrentben?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "kész"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "hátralévő"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Magas"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normál"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Kihagy"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Tulajdonságok mentése"
diff --git a/apps/i2psnark/locale/messages_it.po b/apps/i2psnark/locale/messages_it.po
index f47eb4e8f43000655828228ed786dae3bfa155c7..150d39fc1f05d963e7a6d4c91f6e423cc058dd9d 100644
--- a/apps/i2psnark/locale/messages_it.po
+++ b/apps/i2psnark/locale/messages_it.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -29,221 +29,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Tunnel I2P chiuso."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Limite del totale di uploaders modificato a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Il minimo limite del totale di uploaders è {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Il minimo limite della banda in up modificato a {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Il minimo limite della banda in up è {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Ritardo startup modificato a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Tempo di aggiornamento cambiato in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Aggiornamento disabilitato"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Dimensione pagina cambiata a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "La cartella dei dati deve essere un percorso assoluto"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "La cartella dei dati non esiste"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Non è una cartella"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Illeggibile"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Cartella dei dati cambiata a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "I cambiamenti di tunnel ed I2CP saranno effettivi dopo aver fermato tutti i torrent "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Opzioni I2CP modificate in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "La vecchia destinazione I2CP è in disconnessione"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Impostazioni I2CP cambiate a {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Impossibile connettersi con le nuove impostazioni, ritorno alle vecchie impostazioni I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Impossibile riconnettersi con le vecchie impostazioni!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Riconnesso sulla nuova destinazione I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "Listener I2CP riavviato per \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "I nuovi file saranno visibili pubblicamente"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "I nuovi file non saranno visibili pubblicamente"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Autostart abilitato"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Autostart disabilitato"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Tracker aperti abilitati - è richiesto il riavvio dei torrent perchè la modifica abbia effetto."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Tracker aperti disabilitati - è richiesto il riavvio dei torrent perchè la modifica abbia effetto."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "Abilita DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "Disabilita DHT"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "La modifica DHT richiede il riavvio dei tunnel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} tema caricato, ritornare alla pagina i2psnark principale per vederlo."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Configurazione non modificata."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Lista dei tracker aperti modificata - è richiesto il riavvio dei torrent perchè la modifica abbia effetto."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Elenco tracker privati modificato - solo per i nuovi torrent creati."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Impossibile salvare la configurazione su {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "In connessione a I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Errore nella connessione a I2P - controlla le tue impostazioni I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Errore: Non è stato possibile aggiungere il torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Impossibile aprire \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Un torrent con questo info hash è già attivo: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "ERRORE - Nessun tracker I2P nel torrent privato \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", sarà richiesto alla rete i2P di aprire solamente trackers e peers DHT"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", l'apertura di trackers è disabilitata e sarà richiesto di aprire solo peers DHT"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -251,34 +252,34 @@ msgid ""
 "torrent."
 msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", l'apertura di trackers e client DHT sono disabilitati. Dovresti, prima di far partire un torrent, abilitare l'apertura di trackers o peers DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Il torrent in \"{0}\" non è valido"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERRORE - Memoria piena, impossibile creare torrent da {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent aggounto e avviato: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent aggiunto: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Recupero di {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -286,132 +287,132 @@ msgid ""
 "DHT."
 msgstr "I trackers aperti sono disabilitati e non ci sono peers DHT. Il recupero {0} potrebbe non riuscire fino a che non fai partire un altro torrent, abiliti i trackers aperti o abiliti il DHT. "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "{0} in aggiunta"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Download già attivo: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Fallimento nella copia del file torrent su {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Troppi file in \"{0}\" ({1}), in rimozione!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Il file torrent \"{0}\" non può finire in \".torrent\", in rimozione!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Non ci sono pezzi in \"{0}\", in rimozione!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Troppi pezzi in \"{0}\", il limite è {1}, in rimozione!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "I pezzi sono troppo larghi in \"{0}\" ({1}B), in rimozione."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Il limite è {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Il torrent \"{0}\" non ha dati, in rimozione!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrent più grandi di {0}B non sono ancora supportati, \"{1}\" in rimozione"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Errore: Non è stato possibile rimuovere il torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent fermato: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent rimosso: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Torrent in aggiunta in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "La banda di Upload massima è {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Download completato: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo ricevute per {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Avvio del torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Errore sul torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Impossibile connettersi a I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Apertura tunnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Avvio di tutti i torrent e apertura del tunnel I2P in corso. "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Stop di tutti i torrent e chiusura del tunnel I2P in corso."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Chiusura tunnel I2P dopo la notifica ai trackers."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Trackers non validi {0} - abilitare i trackers aperti o il DHT?"
@@ -426,859 +427,917 @@ msgstr "Aggiornamento"
 msgid "Updating from {0}"
 msgstr "Aggiornamento da {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Download file torrent da {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Il torrent non è stato recuperato da {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent recuperato da {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent già avviato: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent già in coda: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Il torrent a {0} non è stato valido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Il router non è in funzione"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Ricarica pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Clicca il bottone \"Aggiungi torrent\" per scaricare il torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "pulisci messaggi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Stato"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Nascondi Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Mostra Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Stima del tempo rimanente"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Scaricato"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Stima del tempo rimanente"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Inviato"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Scaricato"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Dimensione"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Tasso di Download"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Inviato"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "Velocità Ricezione (RX) "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Tasso di Upload"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Tasso di Download"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "Velocità Trasmissione (TX)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Tasso di Upload"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Ferma tutti i torrent e il tunnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Ferma Tutto"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Avvia tutti i torrent fermati"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Avvia Tutti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Avvia tutti i torrent e il tunnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Nessun torrent caricato."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totali"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 peer connesso"
 msgstr[1] "{0} peer connessi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "uno: 1 DHT peer"
 msgstr[1] "altri: {0} DHT peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Primo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Prima pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Ind"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Pagina precedente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Avanti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Pagina successiva"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Ultimo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Ultima pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "URL non valido: Deve cominciare con \"http://\", \"{0}\", o \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet eliminato: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "File torrent eliminato: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Downloads cancellati: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "File di dati eliminato: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Non è stato possibile eliminare il file di dati: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "La Cartella non può essere cancellata: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Cartella cancellata: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Errore - Impossibile includere tracker alternativi senza un tracker primario"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Errore - Impossibile fare un mix di tracker privati e pubblici in un torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent creato per \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Molti tracker I2P ti richiedono di registrare nuovi torrent prima del seeding - per cortesia fallo, prima di avviare \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Errore nella creazione di un torrent per \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Impossibile creare un torrent per i dati nonesistenti: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Errore nella creazione del torrent - devi inserire un file o una directory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Elimina selezionati"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Salva configurazione tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Rimosso"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Aggiungi tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Inserisci nome e URL validi per il tracker"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Ripristina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Ripristina tracker di default"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Controllo (Check)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Allocando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Errore del Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 peer"
 msgstr[1] "{0} peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "In partenza"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seeding"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "In Stallo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Nessun Peer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Dettagli torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Vedi files"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Apri file"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Ferma il torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Ferma"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Avvia il torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Avvia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Rimuovi il torrent dalla lista attiva eliminando il file .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Sei sicuro di voler cancellare il file \\\"{0}\\\" (i dati scaricati non verranno cancellati)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Elimina il file .torrent e i file dati associati"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Sei sicuro di voler eliminare il torrent \\\"{0}\\\" e tutti i dati scaricati?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Non interessante (Il peer non ha pezzi di nostro interesse)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Soffocato (Il peer non ci sta permettendo di richiedere pezzi)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Non interessato (Non abbiamo pezzi di interesse per il peer)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Soffocando (Non stiamo permettendo al peer di richiedere pezzi)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Dettagli al tracker {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Aggiungi Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Da URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Inserisci l'URL del file torrent da scaricare (solo I2P), link magnet, link maggot o info hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Aggiungi torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Puoi anche copiare files .torrent su: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Rimuovere un .torrent lo fermerà."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Crea Torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Dati da mandare in seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primario"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternativi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Crea torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "nessuno"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Directory dati"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "File visibili da tutti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Se selezionato, gli altri utenti potrebbero accedere ai file scaricati"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Se selezionato, avvia automaticamente torrent che vengono aggiunti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Tema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Tempo di aggiornamento"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Mai"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Ritardo di avvio"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minuti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Dimensione pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Limite di uploader totale"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Limite di banda in upload"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Raccomandata metà della banda disponibile."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Vedi o cambia la banda del router"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Usa anche tracker aperti"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Se selezionato, annuncia i torrent sia a tracker aperti che ai tracker elencati nel file torrent "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Abilita DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Se selezionato, usa DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Impostazioni d'Entrata"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Impostazioni d'Uscita"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Host I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Porta I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Opzioni I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Nome"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL Sitoweb"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Apri"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privato"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "URL Announce"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Magnet URL {0} non valido"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 hop"
 msgstr[1] "{0} hop"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 tunnel"
 msgstr[1] "{0} tunnel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "File torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Tracker primario"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Elenco dei tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Commento"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Creato"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Creato da"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Link magnet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Torrent privato"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Dimensione"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Completamento"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Rimanente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Files"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Pezzi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Dimensione pezzo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Cartella"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Priorità"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Fino a cartella di livello superiore"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent non trovato?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "File non trovato nel torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "rimanente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Alto"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normale"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Salta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Salva priorità "
diff --git a/apps/i2psnark/locale/messages_nb.po b/apps/i2psnark/locale/messages_nb.po
index c02d9c73cdecf2d32fe9de24c1b8d6750f8194f9..2592898687b03c1f17daa9dcc4e7e9da85e20ce2 100644
--- a/apps/i2psnark/locale/messages_nb.po
+++ b/apps/i2psnark/locale/messages_nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -24,221 +24,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P tunnelen lukket."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Total opplaster grense satt til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Minimum total opplaster grense er {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Opp båndbredde endret til {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Minimum opp båndbredde grense er {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Oppstart utsettelse sett til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Oppdaterings tid endret til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Oppdatering skrudd av"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "I2CP og tunnel endringer vil ta effekt etter sopping av alle torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "I2CP instillinger endret til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Frakobler fra gammel I2CP destinasjon"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP instillinger endret til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Umulig å få tilkobling med de nye instillingene, går tilbake til de gamle I2CP instillingene"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Umulig å koble seg til på nytt med gammle instillinger!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Gjentilkobler på den nye I2CP destinasjonen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP lytter omstartet for \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Nye filer vil bli lesbar for alle"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Nye filer vil ikke bli lesbar for alle"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Autostart er skrudd på"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Autostart er avslått"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Skru på åpne trackers - krever torrent omstart for å ta effekt."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Skru av åpne trackers - krever torrent omstart for å ta effekt."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT skrudd på"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT skrudd av"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "DHT endring krever tunnel avslutting og gjennåpning"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} tema lastet, returner til hovedsiden for i2psnart for å se."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Konfigurasjon uendret."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Åpen tracker listen endret - torrent omstart kreves før det tar effekt."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Privat tracker list endret - vil kun påvirke ny opprettet torrent filer."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Umulig å lagre konfigurasjon til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Kobler til I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Feil ved tilkobling til I2P - Sjekk dine I2CP instillinger!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Feil: kan ikke legge til torrenten {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Kan ikke åpne \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent med samme info hash kjører allerede: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "FEIL - Ingen I2P trackers i privat torrent \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Advarsel - Ingen I2P trackers i \"{0}\", vil bare annonsere til I2P åpne trackers og DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Advarsel - Ingen I2P tracker i \"{0}\", og åpne trackers er skrudd av, vil annonsere kun på DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -246,34 +247,34 @@ msgid ""
 "torrent."
 msgstr "Advarsel - Ingen I2P trackers i \"{0}\", og DHT og åpne trackers er avskrudd, du burde skru på åpen tracker eller DHT før du starter torrenten."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent i \"{0}\" er ugyldig"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "FEIL - Tomt for minne, kan ikke lage torrent fra {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent lagt til og startet: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent lagt til: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Henter {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -281,132 +282,132 @@ msgid ""
 "DHT."
 msgstr "Åpne trackers er skrudd av og vi har ingen DHT peers. Mottak av {0} blir muligens ikke fullført før du starter en annen torrent, starter åpne trackers, eller DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Legger til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Nedlastning kjører alt: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Feilet med å kopiere torrent fil til {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "For mange filer i \"{0}\" ({1}), sletter det!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrent filen \"{0}\" kan ikke avsluttes i \".torrent\", sletter den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Ingen biter i \"{0}\", sletter den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "For mange biter i \"{0}\", grensen er {1}, sletter den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Bitene er for store i \"{0}\" ({1}B), sletter den."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Grensen er {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Torrent \"{0}\" har ingen data, sletter den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrents større enn {0}B er ikke supportet ennå, sletter \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Feil: kan ikke fjerne torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent stoppet: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent fjernet: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Legger til torrents i {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Opp hastighet grense er {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Nedlastning fullført: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Meta informasjon mottatt for {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Starter opp torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Feil i torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Umulig å koble til I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Åpner I2P tunnelen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Åpner I2P tunnelen og starter alle torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Stopper alle torrents og lukker I2P tunnelen."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Lukker I2P tunnel etter beskjed til trackers."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Ingen valid tracker for {0} - skru på åpne trackers eller DHT?"
@@ -421,859 +422,917 @@ msgstr "Oppdaterer"
 msgid "Updating from {0}"
 msgstr "Oppdaterer fra {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Last ned torrent file fra {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent var ikke mottatt fra {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent hentet fra {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent kjører allerede: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent allerede i kø: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent ved {0} var ikke valid"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Ruter er nede"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Oppdater side"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Klikk \"Legg til trorrent\" knappen for å motta torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "fjern meldinger"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Status"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Gjem peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Vis peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Beregnet tid som gjenstår"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Lastet ned"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Beregnet tid som gjenstår"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Lastet opp"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Lastet ned"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Størrelse"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Ned hastighet"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Lastet opp"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "RX Fart"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Opp hastighet"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Ned hastighet"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "TX Fart"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Opp hastighet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Stopp alle torrents og I2P tunellen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Stopp alle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Start alle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Start alle torrents og I2P tunellen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Ingen torrent lastet."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totaler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrents "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 tilkoblet peer"
 msgstr[1] "{0} tilkoblet peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "1 DHT peer"
 msgstr[1] "{0} DHT peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Ugyldig URL: Den må starte med \"http://\", \"{0}\", eller \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Torrent fil slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Nedlastning slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Data fil slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Data fil kunne ikke bli slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Mappen kunne ikke bli slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Mappe slettet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent laget for \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Mange I2P trackers krever at du registerer nye torrents før seeding - Vennligst gjør det før du starter \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Feil ved laging av torrent for \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Kan ikke lage torrent fra den ikke-eksisterende data: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Feil ved opprettelse av torrent - du må velge en fil eller mappe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Slett markerte"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Lagre tracker konfigurasjon"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Fjernet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Legg til tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Skriv inn valid tracker navn og URLer"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Gjenopprett standarder"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Gjenopprettet standard trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Sjekker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Tildeling"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Tracker Feil"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 peer"
 msgstr[1] "{0} peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Starter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Deler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Ferdig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Fastlåst"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Ingen Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Torrent detaljer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Vis filer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Stopp torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Start torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Start"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Fjern torrent fra den aktive listen, og slette .torrent filen"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Slett .torrent filen og all tilhørende data fil(er)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Er du sikker på at du vil slette torrent \\\"{0}\\\" og all nedlastet data?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Slett"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Deler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Uinteressang (Peeren har ingen biter vi trenger)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Skjult (Peeren gir oss ikke lov til å be om biter)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Uinteresang (Vi har ingen biter peeren trenger)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Hoster (Vi tillater ikke peeren til å be om biter)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detaljer hos {0} tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Informasjon"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Legg til torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Fra URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Skriv inn torrent fil nedlastings URL (kun I2P), magnet link, maggot link, eller info hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Legg til torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Du kan også kopiere .torrent filer til: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Fjerning av .torrent vil få den til å stoppe."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Opprett Torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Data for deling"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Opprett torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Data mappe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Filer tilgjengelig for alle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Hvis merket, andre lokale brukere kan få tilgang til nedlastninger"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Hvis avmerket, vil torrents som blir lagt til automatisk startet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Theme"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Oppdater tid"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Aldri"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Oppstarts utsettelse"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minutter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Total opplaster grense"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Opp båndbredde grense"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Halve tilgjengelige hastigheten er anbefalt."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Vis eller endre router båndbredde"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Bruk åpne trackers også"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Hvis avmerked, annonser torrenter til åpne trackers i tillegg til tracker listen i torrent filen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Skru på DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Hvis markert, bruk DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Inngående instillinger"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Utgående instillinger"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP vert"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP port"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP alternativer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Lagre konfigurasjon"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Navn"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "Webside URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Åpne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privat"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Annonserings URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Legg til"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Invalid magnet URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 hopp"
 msgstr[1] "{0} hopp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 tunnel"
 msgstr[1] "{0} tunneler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Torrent fil"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnet link"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Privat torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Fullføring"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Gjennstår"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Filer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Biter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Bit størrelse"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Mappe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Opp en level i mappe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent ikke funnet?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Fil ikke funnet i torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "ferdig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "gjennstår"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Høy"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Lagre prioriteter"
diff --git a/apps/i2psnark/locale/messages_nl.po b/apps/i2psnark/locale/messages_nl.po
index 780cd5be11100f1779949cb9e06e0a0e0a1f2327..66cb414884aa5d7b301169b7a7adfe1af8d27592 100644
--- a/apps/i2psnark/locale/messages_nl.po
+++ b/apps/i2psnark/locale/messages_nl.po
@@ -6,13 +6,14 @@
 # Translators:
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
+# Nathan Follens, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-02 10:43+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,1259 +23,1318 @@ msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:69
 msgid "No more torrents running."
-msgstr ""
+msgstr "Er draaien geen torrents meer."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P tunnel gesloten."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
-msgstr ""
+msgstr "Magneet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Totale uploaders limiet gewijzigd in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Minimum totale uploaders limiet is {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Up bandbreedte limiet gewijzigd in {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Minimum up bandbreedte limiet is {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Opstartvertraging gewijzigd in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
-msgstr ""
+msgstr "Ververstijd gewijzigd naar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
-msgstr ""
+msgstr "Verversen uitgezet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
-msgstr ""
+msgstr "Paginagrootte gewijzigd naar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
-msgstr ""
+msgstr "Data-directory moet een absoluut pad zijn"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
-msgstr ""
+msgstr "Data-directory bestaat niet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
-msgstr ""
+msgstr "Geen directory"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
-msgstr ""
+msgstr "Onleesbaar"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
-msgstr ""
+msgstr "Data-directory gewijzigd naar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "I2CP en tunnel wijzigingen hebben pas effect na het stoppen van alle torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
-msgstr ""
+msgstr "I2CP-opties gewijzigd naar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Oude I2CP destination wordt afgesloten"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP instellingen gewijzigd in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Kan geen connectie maken met de nieuwe instellingen, we keren terug naar oude I2CP instellingen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Kan niet opnieuw verbinden met de oude instellingen!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Opnieuw verbonden met de nieuwe I2CP destination"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP listener herstart voor \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
-msgstr ""
+msgstr "Nieuwe bestanden zullen publiek bereikbaar zijn"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
-msgstr ""
+msgstr "Nieuwe bestanden zullen niet publiek bereikbaar zijn"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Autostart ingeschakeld"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Autostart uitgeschakeld"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Open Trackers ingeschakeld - torrent herstart nodig."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Open Trackers uitgeschakeld - torrent herstart nodig."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
-msgstr ""
+msgstr "DHT aangezet."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
-msgstr ""
+msgstr "DHT uitgezet."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
-msgstr ""
+msgstr "DHT-wijziging vereist afsluiten en opnieuw openen van tunnel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} thema geladen, ga naar de hoofd i2psnark pagina om deze te bekijken."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Configuratie ongewijzigd."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Open Tracker lijst gewijzigd - torrent herstart nodig."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
-msgstr ""
+msgstr "Privé trackerlijst gewijzigd - beïnvloedt enkel nieuw aangemaakte torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Kan de configuratie niet opslaan in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Verbinden met I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Fout bij verbinden met I2P - controlleer je I2CP instellingen!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Fout: Kan de torrent {0} niet toevoegen"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Kan \"{0}\" niet openen"
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent met deze info hash is al actief: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
-msgstr ""
+msgstr "FOUT - Geen I2P-trackers in privé-torrent \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
-msgstr ""
+msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", zal alleen aankondigen aan open trackers en DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
-msgstr ""
+msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", en open trackers zijn uitgezet, zal alleen aankondigen aan DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
 "disabled, you should enable open trackers or DHT before starting the "
 "torrent."
-msgstr ""
+msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", en DHT en open trackers zijn uitgezet, je moet open trackers of DHT aanzetten alvorens de torrent te starten."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent in \"{0}\" is ongeldig"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERROR - Geen geheugen meer, kan geen torrent maken van {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent toegevoegd en gestart: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent toegevoegd: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Downloaden {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
 "succeed until you start another torrent, enable open trackers, or enable "
 "DHT."
-msgstr ""
+msgstr "Open trackers zijn uitgezet en we hebben geen DHT peers. Ophalen van {0} zal misschien niet lukken tot je een andere torrent start, open trackers aanzet, of DHT aanzet."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Toevoegen van {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
-msgstr ""
+msgstr "Download is al bezig: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Kan het torrent bestand niet kopieren naar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Te veel bestanden in \"{0}\" ({1}), wordt verwijderd!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrent bestand \"{0}\" kan niet eindigen in \".torrent\", wordt verwijderd!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Geen stukken in \"{0}\",  wordt verwijderd!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Te veel stukken in \"{0}\", limiet is {1}, wordt verwijderd!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Stukken zijn te groot in \"{0}\" ({1}B), wordt verwijderd."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Limiet is {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
-msgstr ""
+msgstr "Torrent \"{0}\" heeft geen data en wordt verwijderd!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrents groter dan {0}B worden nog niet ondersteund, verwijder \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Fout: Kan de torrent {0} niet verwijderen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent gestopt: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent verwijderd: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Toevoegen van torrents in {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
-msgstr ""
+msgstr "Bandbreedtelimiet omhoog is {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Download gereed: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo ontvangen voor {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Starten met torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
-msgstr ""
+msgstr "Fout bij torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Kan niet verbinden met I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
-msgstr ""
+msgstr "Bezig met openen van I2P-tunnel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Openen van de I2P tunnel en starten van alle torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Stoppen van alle torrents en sluiten van I2P tunnel."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
-msgstr ""
+msgstr "Bezig met sluiten van I2P-tunnel na verwittigen van trackers."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:244
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
-msgstr ""
+msgstr "Geen geldige trackers voor {0} - open trackers of DHT aanzetten?"
 
 #: ../java/src/org/klomp/snark/UpdateHandler.java:49
 #: ../java/src/org/klomp/snark/UpdateRunner.java:228
 msgid "Updating"
-msgstr ""
+msgstr "Bezig met updaten"
 
 #: ../java/src/org/klomp/snark/UpdateRunner.java:115
 #, java-format
 msgid "Updating from {0}"
-msgstr ""
+msgstr "Bezig met updaten van {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
-msgstr ""
+msgstr "Torrent-bestand downloaden van {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent was niet ontvangen van {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent gedownload van {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent draait al: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent zit al in de wachtrij: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent op {0} was niet geldig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
-msgstr ""
+msgstr "Anonieme BitTorrent-cliënt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
-msgstr ""
+msgstr "Router is uitgeschakeld"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Ververs pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
-msgstr ""
+msgstr "Klik op de \"Torrent toevoegen\"-knop om de torrent op te halen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
-msgstr ""
+msgstr "berichten wissen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Status"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Sorteren op {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Verberg Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Toon Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Schatting resterende tijd"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Bestandstype"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Gedownload"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Schatting resterende tijd"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Geupload"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Gedownload"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Grootte"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Down Snelheid"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Upload-ratio"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Geupload"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
-msgstr ""
+msgstr "RX-ratio"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Up Snelheid"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Down Snelheid"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
-msgstr ""
+msgstr "TX-ratio"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Up Snelheid"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Stop alle torrents en de I2P tunnel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Stop Alle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
-msgstr ""
+msgstr "Start alle gestopte torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Start Alle"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Start alle torrents en de I2P tunnel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Geen torrents geladen."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totalen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 verbonden peer"
 msgstr[1] "{0} verbonden peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 DHT peer"
+msgstr[1] "{0} DHT peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
-msgstr ""
+msgstr "Eerste"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
-msgstr ""
+msgstr "Eerste pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
-msgstr ""
+msgstr "Vorige"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
-msgstr ""
+msgstr "Vorige pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
-msgstr ""
+msgstr "Volgende pagina"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
-msgstr ""
+msgstr "Laatste"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
-msgstr ""
+msgstr "Laatste pagina"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "Data-directory kan niet aangemaakt worden"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "Kan torrent {0} niet toevoegen binnen andere torrent: {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Ongeldige URL: moet beginnen met \"http://\", \"{0}\", of \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Torrent bestand verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
-msgstr ""
+msgstr "Download verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Data bestand verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Kan data bestand niet verwijderen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
-msgstr ""
+msgstr "Directory kon niet worden verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
-msgstr ""
+msgstr "Map verwijderd: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
-msgstr ""
+msgstr "Kan geen torrent toevoegen die eindig op \".torrent\": {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
-msgstr ""
+msgstr "Torrent met deze naam is al bezig: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
-msgstr ""
+msgstr "Kan geen torrent toevoegen die een I2P-directory bevat: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
-msgstr ""
+msgstr "Kan torrent {0} die een andere torrent bevat niet toevoegen: {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
-msgstr ""
+msgstr "Fout - Kan geen alternatieve trackers toevoegen zonder een primaire tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
-msgstr ""
+msgstr "Fout - Kan privé en publieke trackers in een torrent niet mengen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent gemaakt voor \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Veel I2P trackers vereisen dat je de nieuwe torrent registreert voor het seeden - doe dit voordat je \"{0}\" start"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Fout bij het maken van een torrent voor \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Kan geen torrent maken voor niet-bestaande data: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Fout bij het maken van de torrent - je moet een bestand of directory invullen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
-msgstr ""
+msgstr "Geselecteerde verwijderen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
-msgstr ""
+msgstr "Trackerconfiguratie opslaan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
-msgstr ""
+msgstr "Verwijderd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
-msgstr ""
+msgstr "Tracker toevoegen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
-msgstr ""
+msgstr "Geef een geldige trackernaam en URLs in"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
-msgstr ""
+msgstr "Standaardtrackers herstellen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
-msgstr ""
+msgstr "Standaardtrackers hersteld"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
-msgstr ""
+msgstr "Bezig met controleren"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
-msgstr ""
+msgstr "Bezig met toewijzen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Tracker Fout"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 peer"
 msgstr[1] "{0} peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
-msgstr ""
+msgstr "Bezig met starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seeding"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Voltooid"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Geen Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Torrent details"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Bekijk bestanden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Open bestand"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Stop de torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Stop"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Start de torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Start"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Verwijder de torrent van de actieve lijst, het .torrent bestand wordt verwijderd"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
-msgstr ""
+msgstr "Ben je zeker dat je het bestand \\''{0}\\'' wil verwijderen (gedownloade data zullen niet verwijderd worden)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Weghalen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Verwijder het .torrent bestand en de gerelateerde data bestand(en)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Weet je zeker dat je de torrent \\''{0}\\'' en alle gedownloade data wilt verwijderen?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Niet interessant (De peer heeft geen stukken die we nodig hebben)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Verstikt (De peer laat ons niet toe om stukken op te vragen)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Niet geïnteresseerd (We heben geen stukken die de peer nodig heeft)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Verstikt (We laten de peer niet toe om stukken op te vragen)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Details op de {0} tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Torrent Toevoegen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Van URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
-msgstr ""
+msgstr "Voer de download-URL (alleen I2P), magneetlink, maggotlink of infohash van het torrentbestand in"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Torrent toevoegen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Datamap"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Voer de directory om de gegevens in op te slaan in (standaard {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Je kan ook .torrent bestanden kopieren naar: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Verwijderen van een .torrent zorgt dat deze stopt."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Creëer Torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Data om te seeden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
-msgstr ""
+msgstr "Bestand of directory om te seeden (volledig pad of binnen de directory {0} )"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
-msgstr ""
+msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
-msgstr ""
+msgstr "Primair"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
-msgstr ""
+msgstr "Alternatieven"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Creëer torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
-msgstr ""
+msgstr "geen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Data directory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
-msgstr ""
+msgstr "Bestanden leesbaar door iedereen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
-msgstr ""
+msgstr "Indien aangevinkt hebben andere gebruikers toegang tot de gedownloade bestanden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
-msgstr ""
+msgstr "Torrents automatisch starten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Indien aangevinkt, start toegevoegde torrents automatisch"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Thema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
-msgstr ""
+msgstr "Ververstijd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
-msgstr ""
+msgstr "Nooit"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Startup vertraging"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minuten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
-msgstr ""
+msgstr "Paginagrootte"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
-msgstr ""
+msgstr "torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Totale uploader limiet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Up bandbreedte limiet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Helft van beschikbare bandbreedte aanbevolen."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Bekijk of wijzig router bandbreedte"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Gebruik ook open trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Indien aangevinkt, kondig torrents ook aan bij de tracker uit het torrent bestand"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
-msgstr ""
+msgstr "DHT aanzetten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
-msgstr ""
+msgstr "Gebruik DHT indien aangevinkt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Inkomende Instellingen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Uitgaande Instellingen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP host"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP poort"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP opties"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Configuratie opslaan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
-msgstr ""
+msgstr "Website-URL"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Standaard"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Open"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
-msgstr ""
+msgstr "Privé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
-msgstr ""
+msgstr "Kondig URL aan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
-msgstr ""
+msgstr "Toevoegen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Ongeldige magnet URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 hop"
 msgstr[1] "{0} hops"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 tunnel"
 msgstr[1] "{0} tunnels"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
-msgstr ""
+msgstr "Torrentbestand"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
-msgstr ""
+msgstr "Datalocatie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Infohash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
-msgstr ""
+msgstr "Primaire tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
-msgstr ""
+msgstr "Trackerlijst"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
-msgstr ""
+msgstr "Opmerking"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
-msgstr ""
+msgstr "Aangemaakt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
-msgstr ""
+msgstr "Aangemaakt door"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnet link"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Grootte"
+msgstr "Privé-torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Voltooiing"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
-msgstr ""
+msgstr "Resterend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Bestanden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Stukken"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Stukgrootte"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Directory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Naar bovenliggende directory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent niet gevonden?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Bestand niet gevonden in torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "voltooid"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
-msgstr ""
+msgstr "resterend"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Hoog"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Overslaan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Stel alle in als hoog"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Stel alle in als normaal"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Alle overslaan"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Prioriteiten opslaan"
diff --git a/apps/i2psnark/locale/messages_pl.po b/apps/i2psnark/locale/messages_pl.po
index 6998f693afc580d5b80d5a6b258ef7dc288113c3..c4ef204ee60e1eb40d022d754d25808077252d18 100644
--- a/apps/i2psnark/locale/messages_pl.po
+++ b/apps/i2psnark/locale/messages_pl.po
@@ -7,6 +7,7 @@
 # PolishAnon <b790979@klzlk.com>, 2011
 # Warton <businesshehe@yahoo.com>, 2012
 # foo <foo@bar>, 2009
+# polacco <polacco@i2pmail.org>, 2014-2015
 # polacco <polacco@i2pmail.org>, 2012
 # seb, 2014
 # Smert i2p <Smert@safe-mail.net>, 2013
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-17 20:52+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,392 +27,393 @@ msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:69
 msgid "No more torrents running."
-msgstr ""
+msgstr "Nie ma więcej uruchomionych torrentów."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Zamknięto tunel I2P."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Ograniczenie liczby uploaderów zmieniono do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Minimalny całkowity limit uploadera: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
-msgstr "Ograniczenie pasma WY zmieniono na: {0} KB/s"
+msgstr "Ograniczenie pasma wyjściowego zmieniono na: {0} KB/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
-msgstr "Minimalne pasmo WY to: {0} KB/s"
+msgstr "Minimalne pasmo wyjściowe to: {0} KB/s"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
-msgstr "Opóźnienia startu zmieniono na {0}"
+msgstr "Opóźnienie uruchamiania zmieniono na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Czas odświerzania zmieniony na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Odświeżanie wyłączone"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Rozmiar strony zmieniony do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
-msgstr "Katalog danych musi być pełna ścieżką"
+msgstr "Katalog danych musi być pełną ścieżką"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Katalog danych nie istnieje"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "To nie jest katalog"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Nieczytelne"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Katalog danych zmieniony do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Zmiany dotyczące I2CP i tuneli będą wprowadzone po zatrzymaniu wszystkich torrentów."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Opcje I2CP zmienione na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Rozłączanie starych celów I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Ustawienia I2CP zmienione do: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Nie można połączyć się z nowymi ustawieniami, powrót do starych ustawień I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Nie można się połączyć ze starymi ustawieniami!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Ponowne podłączanie do nowych celów I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "Nasłuch I2CP zrestartowany dla \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Nowe pliki będą publicznie dostępne"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Nowe pliki nie będą publicznie dostępne"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
-msgstr "Włącz automatycznie uruchamianie"
+msgstr "Włączono automatyczne uruchamianie"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
-msgstr "Wyłącz automatycznie uruchamianie"
+msgstr "Wyłączono automatyczne uruchamianie"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Włączono otwarte trackery - wymagane ponowne uruchomienie torrenta."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Wyłączono otwarte trackery - wymagane ponowne uruchomienie torrenta."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT włączone."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT wyłączone."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Zmiana DHT wymaga zamknięcia tunelu i jego ponownego otwarcia"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
-msgstr "{0} temat załadowany, powrót do strony głównej i2psnark by zobaczyć."
+msgstr "Załadowano temat {0}. Przejdź do strony głównej i2psnark, by zobaczyć."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Ustawienia niezmienione."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
-msgstr "Zmieniła się lista otwartych trackerów - wymagane ponowne uruchomienie torrenta."
+msgstr "Lista otwartych trackerów została zmieniona – wymagane ponowne uruchomienie torrenta."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
-msgstr "Prywatna lista trackerów została zmieniona - dotyczy tylko nowo utworzonych torrentów. "
+msgstr "Lista prywatnych trackerów została zmieniona – dotyczy tylko nowo utworzonych torrentów."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Nie można zapisać konfiguracji do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Łączenie z I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Nie można się połączyć z I2P, sprawdź swoje ustawienia I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Błąd: Nie można dodać torrenta {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Nie można otworzyć \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent o tym hashu jest już uruchomiony: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "BŁĄD – brak trackerów w prywatnym torrencie \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
-msgstr "Uwaga - Nie ma trackerów I2P w \"{0}\", zostanie to zameldowane tylko do otwartych I2P trackerów i DHT."
+msgstr "Uwaga – Nie ma trackerów I2P w \"{0}\", zostanie to zameldowane tylko do otwartych trackerów i DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
-msgstr "Ostrzeżenie - Brak Trackerów I2P w \"{0}\", i DHT również otwarte trackery są wyłączone, w odniesieniu do DHT tylko."
+msgstr "Uwaga – Brak trackerów I2P w \"{0}\", a otwarte trackery są wyłączone. Torrent będzie działał wyłącznie w oparciu o DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
 "disabled, you should enable open trackers or DHT before starting the "
 "torrent."
-msgstr "Ostrzeżenie - Brak Trackerów I2P w \"{0}\", i DHT również otwarte trackery są wyłączone, należy włączyć otwarte trackery lub DHT przed rozpoczęciem torrenta. "
+msgstr "Uwaga – Brak trackerów I2P w \"{0}\". Otwarte trackery i DHT również są wyłączone. Należy włączyć otwarte trackery lub DHT przed rozpoczęciem torrenta."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent w \"{0}\" jest niepoprawny"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
-msgstr "BŁĄD - Brak pamięci, nie można utworzyć pliku torrent z {0}"
+msgstr "BŁĄD – Brak pamięci, nie można utworzyć pliku torrent z {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent dodany i uruchomiony: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent dodany: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Pobieranie: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
 "succeed until you start another torrent, enable open trackers, or enable "
 "DHT."
-msgstr "Otwarte trackery są wyłączone i nie mamy żadnych DHT peerów. Pobranie z {0} może się nie udać dopóki nie uruchomisz innego torrenta, włączysz otwarte trackery, lub włączysz DHT."
+msgstr "Otwarte trackery są wyłączone i nie mamy żadnych peerów DHT. Pobranie z {0} może się nie udać, dopóki nie uruchomisz innego torrenta, włączysz otwarte trackery lub włączysz DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Dodawanie {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Pobieranie już zostało uruchomione: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Nie udało się skopiować pliku torrent do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Za dużo plików w \"{0}\" ({1}), usuwanie go!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrent \"{0}\" nie może się kończyć w \".torrent\", usuwanie go!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "W torrencie \"{0}\" nie ma piece'ów, usuwanie go!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Za dużo piece''ów w \"{0}\" (limit to {1}), usuwanie go!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Za duże piece''y w torrencie \"{0}\" ({1}B), usuwanie go."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Granica to {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
-msgstr "cTorrent \"{0}\" nie zawiera danych, usuwanie!"
+msgstr "Torrent \"{0}\" nie zawiera danych, usuwanie!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrenty większe niż {0}B nie są jeszcze wspierane, usunięcie \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Błąd: nie można usunąć torrenta {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent zatrzymany: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent usunięty: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Dodawanie torrentów w {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
-msgstr "limit transferu połczeń wychodzcych to {0} KBps"
+msgstr "Limit transferu połączeń wychodzcych to {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Pobieranie ukończone: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo otrzymane dla {0} "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Uruchamianie torrenta: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Błąd w torrencie {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Nie można podłączyć się do I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Otwieranie tunelu I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Otwieranie tunelu I2P i uruchamianie wszystkich torrentów."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
-msgstr "Zatrzymywanie wszystkich torrentów i zamykanie tunelu I2P"
+msgstr "Zatrzymywanie wszystkich torrentów i zamykanie tunelu I2P."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Zamknięcie tunelu I2P po powiadomieniu trackerów."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:244
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Brak prawidłowych trackerów dla {0} – włączyć otwarte trackery lub DHT?"
@@ -426,178 +428,208 @@ msgstr "Aktualizacja"
 msgid "Updating from {0}"
 msgstr "Aktualizacja z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Pobieranie pliku torrent z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent nie był pobrany z: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent pobrano z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent już uruchomiony: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent już w kolejce: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent pobrany z {0} jest niepoprawny"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Ustawienia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
-msgstr ""
+msgstr "Anonimowy klient protokołu BitTorrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
-msgstr "Ruter jest wyłączony"
+msgstr "Węzeł jest wyłączony"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Odśwież stronę"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Kliknij \"Dodaj torrent\" by pobrać torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "wyczyść komunikaty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Stan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Sortuj wg {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Ukryj peery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Pokaż peery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Szacowany pozostały czas"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Rodzaj pliku"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Pozostało"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Pobrano"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Szacowany pozostały czas"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Wysłano"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Pobrano"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Rozmiar"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Prędkość pobierania"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Współczynnik wysyłania (ratio)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Wysłano"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
-msgstr "Ocena RX"
+msgstr "↓"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Prędkość wysyłania"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Prędkość pobierania"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
-msgstr "Ocena TX"
+msgstr "↑"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Prędkość wysyłania"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Zatrzymaj wszystkie torrenty i tunel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Zatrzymaj wszystkie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Uruchom wszystkie zatrzymane torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Uruchom wszystkie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Uruchom wszystkie torrenty i tunel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Nie załadowano torrentów."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Łącznie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
@@ -605,7 +637,7 @@ msgstr[0] "{0} torrent"
 msgstr[1] "{0} torrenty"
 msgstr[2] "{0} torrentów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
@@ -613,7 +645,7 @@ msgstr[0] "{0} podłączony peer"
 msgstr[1] "{0} podłączone peery"
 msgstr[2] "{0} podłączonych peerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
@@ -621,198 +653,203 @@ msgstr[0] "{0} peer DHT"
 msgstr[1] "{0} peery DHT"
 msgstr[2] "{0} peerów DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
-msgstr "Pierwszy"
+msgstr "Pierwsza"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Pierwsza strona"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
-msgstr "Poprzedni"
+msgstr "Poprzednia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
-msgstr "Następny"
+msgstr "Następna"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Następna strona"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Ostatnia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Ostatnia strona"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "Katalog nie może zostać utworzony"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "Nie można dodać torrenta {0} wewnątrz innego torrenta {1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Nieprawidłowy URL: musi zaczynać się od \"http://\", \"{0}\" lub \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Odnośnik Magnet usunięty: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Plik torrenta usunięto: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Pobrane usunięte: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Pliki z danymi usunięte: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Nie można usunąć pliku z danymi: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Katalog nie może być usunięty: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Usunięto katalog: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
-msgstr ""
+msgstr "Nie można dodać torrent kończącego się \".torrent\": {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
-msgstr ""
+msgstr "Torrent z tą nazwą już jest uruchomiony: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
+msgstr "Nie można dodać torrenta zawierającego katalog I2P: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
-msgstr ""
+msgstr "Nie można dodać torrenta {0} zawierającego inny torrent {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
-msgstr "Błąd - Nie można dodać alternatywnych trackerów bez głównego trackera"
+msgstr "Błąd – Nie można dodać alternatywnych trackerów bez głównego trackera"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
-msgstr "Błąd - Nie można mieszać prywatnych i publicznych trackerów w torrencie"
+msgstr "Błąd – Nie można mieszać prywatnych i publicznych trackerów w torrencie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Utworzono torrent dla \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
-msgstr "Wiele trackerów w I2P wymaga zarejestrowania torrenta przed seedowaniem - proszę, zrób tak przed uruchomieniem \"{0}\""
+msgstr "Wiele trackerów w I2P wymaga zarejestrowania torrenta przed seedowaniem – proszę, zrób tak przed uruchomieniem \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Błąd podczas tworzenia torrenta dla: \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Nie można utworzyć torrenta dla nieistniejących danych: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
-msgstr "Błąd przy tworzeniu torrenta - musisz podać plik lub katalog"
+msgstr "Błąd przy tworzeniu torrenta – musisz podać plik lub katalog"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Usuń zaznaczone"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Zapisz ustawienia trackerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Usunięto"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Dodaj tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Podaj prawidłową nazwę trackera i URL"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Przywróć domyślne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
-msgstr "Przywróć domyślne trackery"
+msgstr "Przywrócono domyślne trackery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Sprawdzanie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Alokowanie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Błąd trackera"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
@@ -820,352 +857,366 @@ msgstr[0] "{0} peer"
 msgstr[1] "{0} peery"
 msgstr[2] "{0} peerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Uruchamianie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seedowanie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Zakończono"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Utknięto"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Brak peerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Szczegóły torrenta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Zobacz pliki"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Otwórz plik"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Zatrzymaj torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Uruchom torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Uruchom"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Usuń torrent z aktywnej listy, usuwając plik .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Czy jesteś pewnien, że chcesz usunąć plik \\''{0}\\'' (pobrane dane nie będą usunięte) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Usuń plik .torrent i związane z nim pliki z danymi"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Czy na pewno chcesz usunąć plik \\''{0}.torrent\\'' oraz pobrane dane?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Uninteresting (peer nie ma piece'ów, które potrzebujemy)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Choked (peer nie pozwala nam na prośbę o piece)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Uninterested (nie mamy piece'ów, których peer potrzebuje)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Choking (nie pozwalamy peerowi na prośbę o piece)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Szczegóły na trackerze {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Dodaj torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Z adresu URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
-msgstr "Wpisz adres URL pliku torrent (I2P tylko), Magnet link, link maggot, lub info hash"
+msgstr "Wpisz adres URL pliku torrent (tylko I2P), Magnet link, link maggot lub info hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Dodaj torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Katalog na pobrane dane"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Podaj katalog do zapisu danych (domyślnie: {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
-msgstr "Możesz także skopiować pliki .torrent do: {0}"
+msgstr "Możesz także skopiować pliki .torrent do: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Usunięcie pliku .torrent spowoduje jego zatrzymanie."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Utwórz torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Dane do seedowania"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
-msgstr ""
+msgstr "Plik lub katalog do seedowania (pełna ścieżka lub katalog wewnątrz \"{0}\")"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Główne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternatywne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Utwórz torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "brak"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Katalog z danymi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Pliki dostępne dla wszystkich"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Jeśli zaznaczone, inni użytkownicy mogą mieć dostęp do pobranych plików"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
-msgstr ""
+msgstr "Uruchamiaj automatycznie torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
-msgstr "Jeśli zaznaczone - automatycznie uruchamiaj dodane torrenty"
+msgstr "Jeśli zaznaczone – automatycznie uruchamiaj dodane torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Motyw"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Czas odświerzania"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Opóźnienie uruchomienia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minuty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Rozmiar strony"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Całkowity limit uploaderów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peery"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
-msgstr "Ograniczenie pasma WY"
+msgstr "Ograniczenie pasma wyjściowego"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Zalecana połowa dostępnego pasma."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
-msgstr "Zobacz lub zmień pasmo routera"
+msgstr "Zobacz lub zmień pasmo węzła"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Używaj również otwartych trackerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Jeśli zaznaczone, zgłaszaj torrenty do otwartych trackerów, jak również do trackerów podanych w pliku torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Włącz DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Jeśli zaznaczone, używa DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Tunele wejściowe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Tunele wyjściowe"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Adres I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Port I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Parametry I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Zapisz ustawienia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL strony www"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Standardowy"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
-msgstr "Otwórz"
+msgstr "Otwarty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Prywatny"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "URL rozgłaszania"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
-msgstr "Nieprawidłowy URL magnet {0}"
+msgstr "Nieprawidłowy link magnet {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -1173,7 +1224,7 @@ msgstr[0] "{0} skok"
 msgstr[1] "{0} skoki"
 msgstr[2] "{0} skoków"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -1181,110 +1232,119 @@ msgstr[0] "{0} tunel"
 msgstr[1] "{0} tunele"
 msgstr[2] "{0} tuneli"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Plik torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
-msgstr ""
+msgstr "Położenie danych"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Info hash"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
-msgstr "Główne Trackery"
+msgstr "Główny Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Lista Trackerów"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Utworzony"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Utworzony przez"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Link magnet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Prywatny torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Rozmiar"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
-msgstr "Zkończono"
+msgstr "Zakończono"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Pozostało"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Pliki"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Części"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Rozmiar części"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Katalog"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Priorytet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Do katalogu nadrzędnego"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
-msgstr "Torrent not found?"
+msgstr "Torrent nie znaleziony?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
-msgstr "File not found in torrent?"
+msgstr "Plik nie znaleziony w torrencie?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "zakończono"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "pozostało"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Wysoki"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normalny"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Pomiń"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Ustaw wszystkie na wysoki"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Ustaw wszystkie na normalny"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Pomiń wszystkie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Zapisz priorytety"
diff --git a/apps/i2psnark/locale/messages_pt.po b/apps/i2psnark/locale/messages_pt.po
index 227cc1c168f4eaea2c258dee61527075e7fde2c0..b116a00d75f11023103c272f42279547b9dc2398 100644
--- a/apps/i2psnark/locale/messages_pt.po
+++ b/apps/i2psnark/locale/messages_pt.po
@@ -12,14 +12,14 @@
 # wtfisthis <low_fps11@yahoo.com>, 2013
 # Rafael Ferrari, 2013
 # Ruthein Alex <rutweiller@hotmail.com>, 2012
-# Tulio Simoes Martins Padilha, 2013
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
 # wicked, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -33,221 +33,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Túnel I2P fechado"
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Limite total de uploaders alterado para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Limite mínimo de uploaders alterado para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Largura de banda para a envio alterada para {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Largura de banda mínima para envio é {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Demora na inicialização alterada para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Tempo de actualização alterado para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Actualização desactivada"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Tamanho de pagina alterado para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Diretório de dados deve ter um caminho absoluto"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Diretório de dados não existe"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Não é um diretório"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Ilegível"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Diretório de dados alterado para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Mudanças do I2CP e do túnel farão efeito após interromper todos os torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "opções de I2cp alteradas para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Desconectando destinação anterior do I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Preferências do I2CP alteradas para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Conectar-se não foi posível com as novas preferências I2CP, utilizarei as anteriores."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Impossível se conectar usando as preferências anteriores!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Conectado com a nova Destinação I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "Conexão I2CP re-estabelecida para \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Novos ficheiros serão lidos pelo publico"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Novos ficheiros não serão lidos pelo publico"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Ativado o iniciar automáticamente"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Desativado o iniciar automáticamente"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Uso de rastreadores abertos ativado - Para ter efeito é necesário reiniciar os torrentes."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Uso dos rastreadores abertos desativado - Para ter efeito é necesário reiniciar os torrentes."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "Habilitar DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "Desabilitar DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Mudança no DHT requer fechamento e reabertura do túnel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "Tema {0} foi carregado. Volte no menú principal para vê-lo."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Configuração não mudada."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Listado de rastreadores abertos mudado - Para ter efeito é necesário reiniciar os torrentes."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Lista de rastreadores privados alterada - somente afetará os novos torrentes criados."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Não se pode guardar a configuração em {0}."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Conectando com I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Erro ao se conectar com I2P - Verifique a sua configuração I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Erro: Não se pode adicionar o torrente {0}."
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Não pode se abrir \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "torrente com este info hash já em marcha: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "ERRO - Não há tracker I2P no torrent privado \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", o anúncio será feito apenas por rastreadores I2P abertos e DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", e rastreadores I2P abertos estão desabilitados. O anúncio será feito apenas por DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -255,34 +256,34 @@ msgid ""
 "torrent."
 msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", e DHT e rastreadores abertos estão desabilitados. Rastreadores abertos ou DHT devem ser habilitados antes de começar o torrente."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "O arquivo .torrent em \"{0}\" não é válido."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERRO - Não ha espaço suficente, não se pode crear um torrente desde {0}."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "torrente adicionado e iniciado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "torrente adicionado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Buscando {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -290,132 +291,132 @@ msgid ""
 "DHT."
 msgstr "Rastreadores abertos estão desabilitados e não há participantes DHT. Descarregamento de {0} pode não prosseguir enquanto outra torrente não for iniciada,  rastreadores abertos forem habilitados ou DHT habilitado."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Adicionando {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "arquivo já descarregando: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Não se pode copiar o torrente para {0}."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Ha arquivos demais no  \"{0}\", se apagará ({1}). "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "O arquivo de dados do torrente \"{0}\" não pode terminar em \".torrent' e será apagado."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Não ha peças no \"{0}\", se apagará."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Ha peças demais no  \"{0}\" e o limite é {1}. Se apagarão."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Peças no \"{0}\" são grandes demais ({1}B). Se apagarão."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "O limite são \"{0}\"Bytes"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "O torrente \"{0}\" não contem dados e será apagado."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "torrentes maiores que \"{0}\" Bytes ainda não funcionam, se apagará \"{1}\"."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Erro: Não se pode quitar o torrente \"{0}\"."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "torrente detido: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "torrente quitado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Os torrentes serão adicionados em {0} ..."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Limite de transmissão de dados é {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Finalizada a descarga de \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo recibido para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Iniciando o torrente {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Erro no torrente {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Impossível de se conectar com I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Abrindo o túnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Abrendo o túnel I2P e iniciando os torrentes ..."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Detindo todos os torrentes e fechando o túnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Fechando túnel I2P após notificar os rastreadores."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Nenhum rastreador válido para {0} - habilitar rastreadores abertos ou DHT?"
@@ -430,859 +431,917 @@ msgstr "Atualizando"
 msgid "Updating from {0}"
 msgstr "Atualizando de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Descarregando arquivo torrente de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Não se pode obter torrente de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "torrente obtido de {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "torrente já em marcha: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "torrente já na cola: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "torrente em {0} não foi válido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Preferências"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Roteador não está funcionando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "torrentes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Atualizar página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Foro"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Clique no botão \"Adicionar torrent\" para obter o torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "limpar mensagens"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Estado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "ocultar parceiros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "mostrar parceiros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Tempo que falta para completar"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Tempo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Descarregado"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Tempo que falta para completar"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "Baixado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Subido"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Descarregado"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Tamanho"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "Subido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Taxa de descarga"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Subido"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "Taxa de recepção"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Taxa de subida"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Taxa de descarga"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "Taxa de transmissão"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Taxa de subida"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Deter todos os torrentes e o túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Deter tudos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Iniciar todos os torrents interrompidos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Arrancar todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Iniciar todos os torrentes e o túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Não carregado nenhum torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Total"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrente"
 msgstr[1] "{0} torrentes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 parceiro conectado"
 msgstr[1] "{0} parceiros conectados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "1 parceiros DHT"
 msgstr[1] "{0} parceiros DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Prim."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Primeira página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Ant."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Próx."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Próxima página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Últ."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Última página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Endereço não válido - tem que começar com \"http://\", \"{0}\", ou \"{1}\"."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Apagada o magnet: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Apagado o arquivo torrente: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Download excluído: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Apagado o arquivo de dados: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Não se pode apagar o arquivo de dados: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Pasta não pôde ser excluída: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Pasta excluída: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Erro - Impossível incluir rastreadores alternativos sem o rastreador primário"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Erro - Impossível misturar rastreadores públicos e privados num torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "torrente criado para \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Muitos rastreadores no I2P exigem que você registre novos torrentes antes de poder semeá-los. Por favor, faça isto antes de iniciar \"{0}\"!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Erro ao criar o torrente \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Não se pode criar um torrente para dados que não existam: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Erro ao criar o torrente - Tens que especificar um arquivo ou uma pasta."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Excluir selecionado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Salvar configurações do rastreador"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Excluído"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Adicionar tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Insira um nome válido para o tracker e URLs"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Voltar aos padrões"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Voltar aos rastreadores padrão"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Verificando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Reservando espaço"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Erro do rastreador"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 parceiro"
 msgstr[1] "{0} parceiros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Iniciando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "semeando"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "bem"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "estancado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "sem parceiros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "detenido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Detalhes do torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "mostrar arquivos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "abrir arquivo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Deter o torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Deter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Iniciar o torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Retire o torrente da lista ativa, apagando o arquivo .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Tem a certeza que deseja apagar o ficheiro \\\"{0}\\\" (dados transferidos não serão apagados) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Apagar o arquivo torrente e o(s) arquivo(s) de dados pertenecentes"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Está seguro de que quer apagar o arquivo torrente \\''{0}\\'' e todos os dados descarregados deste torrente?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "desconhecido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Semeador"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "não interessante (O parceiro não tem peças que precisamos.)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "sufocado (De momento o parceiro não está nos permitindo pedir mais peças.c)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "desinteressado (Não temos as peças que o parceiro quer.)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "sufocando (De momento não estamos permitindo que os parceiros peçam mais peças)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detalhes no rastreador {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Adicionar um torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "URL fonte:"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Digite a URL para download do arquivo torrent (só I2P), ou magnet link, maggo link, ou ainda o seu hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Adicionar torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Também pode copiar arquivos torrentes a {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "A remoção de um arquivo .torrent fará com que ele pare."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Criar um torrente"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Dados para semear"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Rastreadores"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primário"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternativos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Criar torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "nenhum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Pasta de dados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Ficheiro legível por todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Se marcado, outros usuários poderão acessar os ficheiros descarregados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "se marcado, os torrentes adicionados se iniciarão automaticamente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Tema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Tempo de actualização"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Nunca"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Demora do arranque"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minutos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Tamanho da página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Limite global de subidores"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "parceiros"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Limite de largura de banda para a subida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Se recomenda a metade da largura de banda disponível."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "mostrar e mudar as preferências da largura de banda do roteador"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "usar também rastreadores abertos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Se marcado, anunciar os torrentes aos rastreadores abertos, assim como aos rastreadores listados no arquivo torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Habilitar DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Se marcado, usar DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Preferências de entrada"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Preferências de saida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Anfitrião I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Porto I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Opções I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Guardar configuração"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Nome"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL do Website"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "abrir"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "URL para anúncio"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "URL magnet {0} não válida"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 salto"
 msgstr[1] "{0} saltos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 túnel"
 msgstr[1] "{0} túneles"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Arquivo torrente"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Rastreador Primário"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Lista de Rastreadores"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Commentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Criado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Criado por"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "URL magnet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Torrente privado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Tamanho"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Finalização"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Restantes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Arquivos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Peças"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Tamanho das peças"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Pasta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Subir uma herarquia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Não achei o arquivo torrente?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Arquivo não achado no torrente?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "restantes"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "alta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Guardar prioridades"
diff --git a/apps/i2psnark/locale/messages_pt_bR.po b/apps/i2psnark/locale/messages_pt_bR.po
index 0e26aea0e672253e5d056dfadd394248d16f6c69..b3498e374146dd7e2d448b0cfadd5a4d4c482cb1 100644
--- a/apps/i2psnark/locale/messages_pt_bR.po
+++ b/apps/i2psnark/locale/messages_pt_bR.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2014-07-05 19:07+0000\n"
-"Last-Translator: testsubject67 <deborinha97@hotmail.com>\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,221 +20,226 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:69
-#: ../java/src/org/klomp/snark/SnarkManager.java:1949
-#: ../java/src/org/klomp/snark/SnarkManager.java:1960
+msgid "No more torrents running."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/IdleChecker.java:70
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Túnel I2P fechado"
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1655
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:515
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Limite de uploaders totais alterada para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:517
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Mínimo de uploaders totais alterada para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:529
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Limite de Up BW alterada para {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:531
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "O limite de mínimo de banda larga é {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:543
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Atraso de inicialização alterada para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:554
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:556
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:572
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:581
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:583
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:585
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:587
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:592
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:647
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Alterações em túneis e I2C entrarão em vigor depois de parar todos torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:651
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:657
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Desconectando destinação do velho I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:659
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Configurações de I2CP alteradas para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:664
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Não é possível conectar com as novas configurações. Revertendo para as prévias configurações de I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:668
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Não é possível conectar com as novas configurações!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:670
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Reconectado à nova destinação de I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:677
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "Auditor I2CP recomeçadas a \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:691
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:693
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:700
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Autocomeço permitido"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:702
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Autocomeço não permitido"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:708
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Trackers abertos permitidos - reinício de torrents é preciso para entrar em vigor"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:710
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Trackers abertos não permitidos - reinício de torrents é preciso para entrar em vigor"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:717
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:719
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:721
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:728
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "Tema {0} carregado, retornar para a página principal de i2psnark para visualizar."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:738
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Configuração sem alteração"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:770
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Lista de trackers abertos alterada - reinício de torrents é preciso para entrar em vigor"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:780
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:826
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Não é possivel salvar configurações para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:904
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Conectando a I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Erro ao conectar a I2P - verifique as configurações de I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:916
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Erro: não é possível adicionar o torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Não é possível abrir \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:957
-#: ../java/src/org/klomp/snark/SnarkManager.java:1058
-#: ../java/src/org/klomp/snark/SnarkManager.java:1140
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "O torrent com este info has já está sendo executado: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:963
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:965
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:968
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:970
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -242,34 +247,34 @@ msgid ""
 "torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:992
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "O torrent em \"{0}\" é inválido"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:999
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:186
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1011
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent adicionado e começado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1013
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent adicionado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1069
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Buscando {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1075
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -277,968 +282,1057 @@ msgid ""
 "DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1079
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Adicionando {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1111
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1150
-#: ../java/src/org/klomp/snark/SnarkManager.java:1173
-#: ../java/src/org/klomp/snark/SnarkManager.java:1611
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Falha ao copiar arquivo de torrent de {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1400
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Arquivos em excesso em \"{0}\" ({1}), deletando!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1402
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Arquivo de torrent \"{0}\" não pode terminar em \".torrent\", deletando!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1404
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Sem peças em \"{0}\", deletando!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1406
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Peças em excesso em \"{0}\". O limite é {1}, deletando!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1408
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Peças são muito grande em \"{0}\" ({1}B), deletando."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1409
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "O limite é {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1411
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1419
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrents maiores do que {0}B não são suportados ainda, deletando \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1435
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Erro: não foi possível remover o torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1456
-#: ../java/src/org/klomp/snark/SnarkManager.java:1474
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent parado: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1495
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent removido: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1503
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Adicionando torrents em {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1534
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1556
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Download terminado: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1607
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo recebido para {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1608
-#: ../java/src/org/klomp/snark/SnarkManager.java:1837
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Iniciando torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1623
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1686
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Incapaz de conectar ao I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1836
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1860
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Abrindo o túnel I2P e começando todos os torrents."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1923
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Parando todos os torrents e fechando o túnel I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1942
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:234
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
 
 #: ../java/src/org/klomp/snark/UpdateHandler.java:49
-#: ../java/src/org/klomp/snark/UpdateRunner.java:227
+#: ../java/src/org/klomp/snark/UpdateRunner.java:228
 msgid "Updating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/UpdateRunner.java:114
+#: ../java/src/org/klomp/snark/UpdateRunner.java:115
 #, java-format
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:184
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:247
-msgid "I2PSnark - Anonymous BitTorrent Client"
-msgstr "I2PSnark - BitTorrent Client Anônimo"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
+msgid "I2PSnark"
+msgstr "I2PSnar"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
+msgid "Configuration"
+msgstr "Configuração"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
+msgid "Anonymous BitTorrent Client"
+msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242
-msgid "I2PSnark"
-msgstr "I2PSnar"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Recarregar página"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Fórum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:345
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:400
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2427
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2429
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Status"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Ocultar Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:423
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Mostrar Peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:432
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:434
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2236
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2256
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:442
-msgid "Estimated time remaining"
-msgstr "Tempo restante estimado"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:450
-msgid "Downloaded"
-msgstr "Baixado"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Tempo restante estimado"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:458
-msgid "Uploaded"
-msgstr "Uploaded"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Baixado"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
-msgid "Down Rate"
-msgstr "Taxa de down"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Uploaded"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:470
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:476
-msgid "Up Rate"
-msgstr "Taxad de up"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Taxa de down"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Taxad de up"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Parar todos os torrents e o túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Parar todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Começar todos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Começar todos os torrents e o túnel I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Nenhum torrent carregado."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totais"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrents"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 peer conectado"
 msgstr[1] "{0} peers conectados"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "URL inválido: deve começar com \"http://\", \"{0}\", ou \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:814
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet deletado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Arquivo de torrent deletado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Arquivo de data deletado: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Não foi possível apagar o arquivo de data: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+#, java-format
+msgid "Cannot add a torrent ending in \".torrent\": {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
+#, java-format
+msgid "Torrent with this name is already running: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
+#, java-format
+msgid "Cannot add a torrent including an I2P directory: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
+#, java-format
+msgid "Cannot add torrent {0} including another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:946
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent criado para \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Muitos I2P trackers requerem o registro de torrents antes de seeding - por favor, faça isso antes de começar \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Erro ao criar torrent para \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Não foi possível criar um torrent para a informação inexistente: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Erro ao criar torrent - é preciso um arquiso ou diretório"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2019
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1025
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2017
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1077
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr ""
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2021
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1085
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1206
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1209
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1210
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1224
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Erro de tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1254
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1275
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 peer"
 msgstr[1] "{0} peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1234
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1243
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seeding"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1247
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2369
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2483
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Completo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1266
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1267
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1278
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Estagnado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Sem peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Parad"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1329
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Detalhes do torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Ver arquivos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Abrir arquivos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1402
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Parar o torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1404
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Começar o torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1418
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Começar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1430
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Remover o torrent da lista de ativos, deletando o arquivo .torrent"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1435
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1438
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Remover"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Deletar o arquivo ;torrent e associar data file(s)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1455
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Tem certeza que quer remover o torrent \\''{0}\\'' e todas as informaçoes baixadas?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1458
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Deletar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "desconhecido"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Desinteressante (O peer não tem as peças de interesse)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Engasgado (O peer não deixa solicitar as peças)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Desinteressado (Peer não precisa das peças)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Engasgando (Peer está impossibilitado de solicitar peças)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1607
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detalhes em tracker {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1624
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Adicionar Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Do URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1680
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1685
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Acidionar torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Pode também copiar arquivos .torrents de: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1690
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "A remoção de um .torrent parará a mesma"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1713
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Criar Torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Arquivo para seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1720
-msgid "File or directory to seed (must be within the specified path)"
-msgstr "Arquivo ou diretório para seed (deve ser dentro do caminho especificado)"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
+#, java-format
+msgid "File or directory to seed (full path or within the directory {0} )"
+msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Criar torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1747
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2033
-msgid "Configuration"
-msgstr "Configuração"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1784
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Diretório de arquivo"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1796
-msgid "Auto start"
-msgstr "Autocomeçar"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
+msgid "Auto start torrents"
+msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1800
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Automaticamente começar torrents adicionados se verificado"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Tema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1830
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Atraso de inicialização"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minutos"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1844
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Limite total do uploader"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1871
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1875
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Up limite de banda larga"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1878
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1884
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1888
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1892
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1912
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1918
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1926
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1931
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1946
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1951
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1973
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1975
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Abrir"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1977
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1979
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2009
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr ""
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2265
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2278
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
+msgid "Data location"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2287
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2340
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2347
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2421
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2423
-msgid "Size"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2381
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2386
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2390
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2413
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2417
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2442
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2472
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2480
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2494
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2548
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2562
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr ""
diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po
index 640cf6ad63f888a6ff981516e60a4603e4dfb92b..d6078a74a08e4e88a86bc3f844c8af63b30ff294 100644
--- a/apps/i2psnark/locale/messages_ru.po
+++ b/apps/i2psnark/locale/messages_ru.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 08:25+0000\n"
-"Last-Translator: Dmitriy Mamonov <sassy.but.classic@gmail.com>\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-27 16:05+0000\n"
+"Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,221 +34,222 @@ msgid "No more torrents running."
 msgstr "Нет запущенных торрентов."
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Соединение с I2P закрыто."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Новое значение лимита количества слотов отдачи: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Минимально допустимое значение для количества слотов: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Новое значение лимита скорости отдачи: {0} КБ/с"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Минимально допустимое значение для лимита скорости отдачи: {0} КБ/с"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Задержка запуска изменена на {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Время обновления изменено на {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Обновление отключено"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Размер страницы изменён на {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Директория данных должна быть абсолютным путём"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Директория данных не существует"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Не директория"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Нечитаемо"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Директория данных изменена на {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Изменения настроек I2CP и туннелей вступят в силу после остановки всех торрентов."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Параметры I2CP изменены на {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Разрываем старое I2CP соединение"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Новые параметры I2CP: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Не удалось соединиться с использованием новых настроек I2CP, возвращаемся к старым настройкам"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Не удалось пересоединиться с использованием старых настроек I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Пересоединились по новому адресу I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP-приёмник перезапущен для \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Новые файлы будут доступны на чтение публично"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Новые файлы не будут доступны на чтение публично"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Автостарт включен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Автостарт выключен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Включено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Отключено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT включено."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT выключено."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Изменение DHT требует повторного открытия туннеля"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} тема загружена, вернитесь на основную страницу i2psnark для просмотра."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Настройки не изменились."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Изменен список открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Список частных трекеров изменился - влияет только на заново созданные торренты."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Не удалось сохранить настройки в {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Устанавливается соединение с I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Ошибка соединения с I2P, проверьте настройки I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Ошибка: Не удалось добавить торрент {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Не удалось открыть \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Торрент с таким info hash уже запущен: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "ОШИБКА - нет I2P-трекеров в частном торренте \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Предупреждение - Нет I2P трекеров в \"{0}\", анонсирование будет выполняться только на открытых трекерах и в DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Предупреждение - Нет I2P трекеров в \"{0}\" и использование открытых трекеров запрещено, анонсирование будет выполняться только в DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -256,34 +257,34 @@ msgid ""
 "torrent."
 msgstr "Предупреждение - Нет I2P трекеров в \"{0}\" и использование открытых трекеров и DHT запрещено. Следует разрешить их использование перед запуском торрента."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Торрент в \"{0}\" некорректен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ОШИБКА - нехватка памяти, невозможно создать торрент из {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Торрент добавлен и запущен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Торрент добавлен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Получение торрента: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -291,132 +292,132 @@ msgid ""
 "DHT."
 msgstr "Использование открытых трекеров запрещено и нет DHT-пиров. Передача {0} не может быть завершена. Запустите другой торрент или разрешите использование открытых трекеров и/или DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Добавление {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Закачка уже запущена: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Не удалось скопировать торрент в: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Слишком много частей в \"{0}\" (предел — {1}), удаляем торрент!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Слишком крупные части в \"{0}\" ({1}Б), удаляем торрент."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Наш предел {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Торрент \"{0}\" не содержит данных, удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Торренты крупнее чем {0}Б пока не поддерживается, удаляем \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Ошибка: Невозможно удалить торрент {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Торрент остановлен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Торрент удален: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Добавление торрентов через {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Ограничение отдачи {0} КБ/с"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Закачка завершена: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Метаданные получены для {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Запускаем торрент: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Ошибка в торренте {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Не удалось установить соединение с I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Открытие I2P туннеля"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Соединяемся с I2P и запускаем все торренты."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Останавливаем все торренты и закрываем соединение с I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Закрытие туннеля I2P после уведомления трекеров"
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Нет трекеров для {0} — включены ли открытые трекеры или DHT?"
@@ -431,178 +432,208 @@ msgstr "Обновление"
 msgid "Updating from {0}"
 msgstr "Обновлено из {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Загрузка торрент файла из: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Не удалось получить торрент из: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Получен торрент из: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Торрент уже запущен: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Торрент уже в очереди: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Торрент полученный из {0} некорректен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Настройки"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr "Анонимный BitTorrent клиент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Маршрутизатор выключен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Торренты"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Обновить страницу"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Форум"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Нажмите \"Добавить торрент\", чтобы получить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "очистить сообщения"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Статус"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "Сортировать по {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "скрыть список пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "показать список пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Примерное оставшееся время"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "Тип файла"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Осталось"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Получено"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Примерное оставшееся время"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "Принято"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Отдано"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Получено"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Размер"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "Отдано"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Скорость загрузки"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "Коэффициент отдачи"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Отдано"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "Скорость получения"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Скорость отдачи"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Скорость загрузки"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "Скорость отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Скорость отдачи"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Остановить все торренты и закрыть соединение с I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Остановить все"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Запустить все остановленные торренты"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Запустить все"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Запустить все торренты и открыть соединение с I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Нет загруженных торрентов."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Всего"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
@@ -610,7 +641,7 @@ msgstr[0] "{0} торрент"
 msgstr[1] "{0} торрента"
 msgstr[2] "{0} торрентов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
@@ -618,7 +649,7 @@ msgstr[0] "{0} подсоединенный пир"
 msgstr[1] "{0} подсоединенных пиров"
 msgstr[2] "{0} подсоединенных пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
@@ -626,198 +657,203 @@ msgstr[0] "{0} DHT пир"
 msgstr[1] "{0} DHT пира"
 msgstr[2] "{0} DHT пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Первый"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Первая страница"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Предыдущее"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Следующее"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Последний"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Последняя страница"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "Не удалось создать директорию для файлов"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "Не могу добавить торрент {0} в состав другого торрента: {1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Некорректный URL: должен начинаться с \"http://\", \"{0}\", или \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet удален: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Удален торрент: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Закачка удалена: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Файл удален: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Не удалось удалить файл: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Каталог не может быть удалён: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Каталог удалён: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr "Не могу добавить окончание торрента в файл \".torrent\": {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr "Торрент с таким именем уже запущен: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr "Не могу добавить торрент с I2P директорией: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr "Не могу добавить торрент {0} в состав другого торрента: {1}"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr "Не могу добавить торрент {0}, включающий в себя другой торрент: {1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Ошибка - нельза добавить альтернативные трекеры без основного"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Ошибка - невозможно объединить приватный и публичные трекеры в торренте"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Создан торрент для \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Многие I2P трекеры требуют зарегистрировать на них торрент перед началом раздачи — пожалуйста проверьте требуется ли это перед запуском \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Ошибка при создании торрента для: \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Невозможно создать торрент для несуществующего файла или директории: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Торрент не создан — вы должны указать файл или директорию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Удалить выбранное"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Сохранить настройки трекеров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Удален"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Добавить трекер"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Введите действительное название и URL трекера"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Восстановить значения по-умолчанию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Восстановить трекеры по-умолчанию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Проверка"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Выделение места"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Ошибка Трекера"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
@@ -825,352 +861,366 @@ msgstr[0] "{0} пир"
 msgstr[1] "{0} пира"
 msgstr[2] "{0} пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Запускается"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Раздается"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Завершен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "Загружается"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Простаивает"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Нет пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Подробная информация"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Открыть директорию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Остановить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Остановить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Запустить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Запустить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Удалить торрент из списка и с диска"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Вы уверены, что хотите удалить файл \\''{0}\\'' (скачанные данные не будут удалены) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Удалить торрент и стереть загруженные файлы"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Вы действительно хотите удалить торрент \\''{0}\\'' и все загруженные файлы?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Стереть"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Сид"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Uninteresting (У пира нет нужных нам частей торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Choked (Этот пир не позволяет нам запрашивать части торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Uninterested (У нас нужных этому пиру частей торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Детали на трекере {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Информация"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Добавить Торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Из URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Введите URL для скачивания torrent-файла (только I2P), magnet-/maggot-ссылку или хэш"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Добавить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "Директория для файлов"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "Путь для сохранения файлов (по умолчанию {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Либо вы можете просто скопировать .torrent-файлы в директорию {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Удаление .torrent-файла приведёт к остановке торрента."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Создать Торрент"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Файлы для раздачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr "Файл или директория для раздачи (полный путь или относительно директории {0} )"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Трекеры"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Основной"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Альтернативный"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Создать торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "нет"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Директория для файлов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Файлы доступны для чтения всеми"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Если отмечено, другие пользователи могут иметь доступ к скачанным файлам"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr "Автоматически стартовать торренты"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Автоматически запускать торренты после добавления"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Тема"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Время обновления интерфейса"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Никогда"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Задержка запуска"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "минут"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Размер страницы"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "торренты"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Ограничение количества слотов отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Ограничение скорости отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Рекомендуется использовать половину от доступной пропускной способности."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Дополнительно использовать открытые трекеры"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Анонсировать торренты на открытых трекерах, дополнительно к тем, что указаны внутри торрента"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Включить DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Если выбрано, используется DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Входящие туннели"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Исходящие туннели"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "Адрес I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "Порт I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Параметры I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Сохранить настройки"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Имя"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL сайта"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "Стандартный"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Открыть"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Частный"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "URL анонсирования"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Добавить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Неправильный magnet URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -1178,7 +1228,7 @@ msgstr[0] "{0} хоп"
 msgstr[1] "{0} хопа"
 msgstr[2] "{0} хопов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -1186,110 +1236,119 @@ msgstr[0] "{0} туннель"
 msgstr[1] "{0} туннеля"
 msgstr[2] "{0} туннелей"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Торрент-файл"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr "Расположение данных"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "Инфо хэш"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Первичный трекер"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Список трекеров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Комментарий"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Создан"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Создан кем"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnet-ссылка"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Частный Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Размер"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Загружено"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Осталось"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Файлов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Части"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Размер части"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Директория"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Перейти в директорию уровнем выше"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent not found?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "File not found in torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "скачано"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "осталось"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Высокий"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Нормальный"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Пропустить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "Всем высокий приоритет"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "Всем нормальный приоритет"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "Пропустить все"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Сохранить приоритеты"
diff --git a/apps/i2psnark/locale/messages_sk.po b/apps/i2psnark/locale/messages_sk.po
index 942717e949e63473d78a7254459150445b03da29..9a7d03bbee001c605c881d0a2c675a6b304c291c 100644
--- a/apps/i2psnark/locale/messages_sk.po
+++ b/apps/i2psnark/locale/messages_sk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,221 +24,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P tunel je zatvorený."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Celkový limit uploaderov bol zmenený na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Minimálny celkový limit uploaderov je {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Limit nárastu ŠP bol zmenený na {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Minimálny limit nárastu šírky pásma je {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Zdržanie pri spustení bolo zmenené na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Čas refreshu bol zmenený na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Refresh zakázaný"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Veľkosť stránky bola zmenená na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Dátový priečinok musí byť absolútna cesta"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Dátový priečinok neexistuje"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Nie je priečinok"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Nečitateľné"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Dátový priečinok bol zmenený na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "Zmeny I2CP a tunelov sa prejavia po zastavení všetkých torrentov"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "I2CP nastavenia boli zmenené na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Odpája sa starý I2CP cieľ"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP nastavenia boli zmenené na {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Nie je možné sa pripojiť pomocou nových nastavení, vracia sa naspäť k starým I2CP nastaveniam"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Nie je možné sa znova pripojiť pomocou starých nastavení!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Znova sa pripája k novému I2CP cieľu"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP listener bol reštartovaný pre \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Nové súbory budú verejne čitateľné"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Nové súbory nebudú verejne čitateľné"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Povolené automatické spustenie"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Zakázané automatické spustenie"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Povolené otvorené stopovače - pre prejavenie efektu sa vyžaduje reštart torrentu."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Zakázané otvorené stopovače - pre prejavenie efektu sa vyžaduje reštart torrentu."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "Povolené DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "Zakázané DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Zmena DHT vyžaduje vypnutie a znovuotvorenie tunela"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} téma bola načítaná, vráťte sa na hlavnú stránku i2psnark pre zobrazenie."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Konfigurácia nebola zmenená."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Zoznam otvorených stopovačov sa zmenil - pre prejavenie efektu sa vyžaduje reštart torrentu."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Súkromný zoznam stopovačov bol zmenený - to sa bude týkať iba novo vytvorených torrentov."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Nebolo možné uložiť konfiguráciu do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Pripája sa k I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Chyba pri pripájaní sa k I2P - skontrolujte si vaše I2CP nastavenia!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Chyba: Nebolo možné pridať torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Nie je možné otvoriť \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent s týmto info hashom je už spustený: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "CHYBA - Žiadne I2P stopovače v súkromnom torrente \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, oznámené to bude iba DHT a otvoreným stopovačom I2P."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, pričom otvorené stopovače sú zakázané, oznámené to bude iba DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -246,34 +247,34 @@ msgid ""
 "torrent."
 msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, pričom otvorené stopovače aj DHT sú zakázané, mali by ste otvorené stopovače alebo DHT pred spustením torrentu povoliť."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent v \"{0}\" je neplatný"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "CHYBA - Nedostatok pamäte, nie je možné vytvoriť torrent z {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent bol pridaný a spustený: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent bol pridaný: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Získava sa {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -281,132 +282,132 @@ msgid ""
 "DHT."
 msgstr "Otvorené stopovače sú zakázané a my nemáme žiadnych DHT peerov. Získanie {0} nemusí uspieť, pokiaľ nespustíte ďalší torrent, prípadne nepovolíte otvorené stopovače alebo DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Pridáva sa {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Sťahovanie je už spustené: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Nepodarilo sa skopírovať súbor torrentu do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Príliš veľa súborov v \"{0}\" ({1}), odstraňuje sa!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Súbor torrentu \"{0}\" nemôže končiť na \".torrent\", odstraňuje sa!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "V \"{0}\" nie sú žiadne kúsky, odstraňuje sa!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "V \"{0}\" je príliš veľa kúskov, limit je {1}, odstraňuje sa!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Kúsky v \"{0}\" ({1}B) sú príliš veľké, odstraňuje sa."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Limit je {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Torrent \"{0}\" neobsahuje žiadne dáta, odstraňuje sa!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrenty väčšie než {0}B zatiaľ nie sú podporované, odstraňuje sa \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Chyba: Nebolo možné odstrániť torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent bol zastavený: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent bol odstránený: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Pridávajú sa torrenty do {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Limit nárastu šírky pásma je {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Sťahovanie bolo dokončené: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainformácie pre {0} boli doručené"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Spúšťa sa torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Chyba na torrente {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Nie je možné sa pripojiť k I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Otvára sa I2P tunel"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Otvára sa I2P tunel a spúšťajú sa všetky torrenty."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Zastavujú sa všetky torrenty a zatvára sa I2P tunel."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Po upozornení stopovačov sa zatvára I2P tunel."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Nie sú žiadne platné stopovače pre {0} - povoliť otvorené stopovače alebo DHT?"
@@ -421,178 +422,208 @@ msgstr "Aktualizuje sa"
 msgid "Updating from {0}"
 msgstr "Aktualizuje sa z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Stiahnuť súbor torrentu z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent nebol získaný z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent bol získaný z {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent už spustený je: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent už vo fronte je: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent na {0} nebol platný."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Konfigurácia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Router nie je spustený"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Obnoviť stránku"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Fórum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Kliknite na tlačidlo \"Pridať torrent\" pre získanie torrentu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "zmazať správy"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Stav"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Skryť peerov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Zobraziť peerov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Odhadovaný zostávajúci čas"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "ETA"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Stiahnuté"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Odhadovaný zostávajúci čas"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Uploadnuté"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Stiahnuté"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Veľkosť"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Dolná sadzba"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Uploadnuté"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "RX sadzba"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Horná sadzba"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Dolná sadzba"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "TX sadzba"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Horná sadzba"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Zastaviť všetky torrenty a I2P tunel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Zastaviť všetko"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Spustiť všetky zastavené torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Spustiť všetko"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Spustiť všetky torrenty a I2P tunel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Neboli načítané žiadne torrenty."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Súhrny"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
@@ -600,7 +631,7 @@ msgstr[0] "1 torrent"
 msgstr[1] "{0} torrenty"
 msgstr[2] "{0} torrentov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
@@ -608,7 +639,7 @@ msgstr[0] "1 pripojený peer"
 msgstr[1] "{0} pripojení peerovia"
 msgstr[2] "{0} pripojených peerov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
@@ -616,198 +647,203 @@ msgstr[0] "1 DHT peer"
 msgstr[1] "{0} DHT peerovia"
 msgstr[2] "{0} DHT peerov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Prvé"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Prvá stránka"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Predchádzajúce"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Predchádzajúca stránka"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Nasledujúce"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Nasledujúca stránka"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Posledné"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Posledná stránka"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Neplatná URL: Musí začínať na \"http://\", \"{0}\" alebo \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet bol odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Súbor torrentu bol odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Sťahovanie odstránené: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Dátový súbor bol odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Dátový súbor nemohol byť odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Priečinok nemohol byť odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Priečinok bol odstránený: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Chyba - Nie je možné zahrnúť alternatívne stopovače bez toho primárneho"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Chyba - Nie je možné zmiešať v torrente súkromné aj verejné stopovače"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Pre \"{0}\" bol vytvorený torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Mnoho I2P stopovačov od vás vyžaduje registrovať pred seedovaním nové torrenty - prosím urobte tak pred spustením \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Chyba pri vytváraní torrentu pre \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Nie je možné vytvoriť torrent pre neexistujúce dáta: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Chyba pri vytváraní torrentu - musíte zadať súbor alebo priečinok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Zvolená možnosť odstrániť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Uložiť konfiguráciu stopovača"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Odstránené"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Pridať stopovač"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Zadajte platný názov a URL stopovača"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Obnoviť predvolené nastavenia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Obnoviť predvolené stopovače"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Kontroluje sa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Alokuje sa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Chyba stopovača"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
@@ -815,352 +851,366 @@ msgstr[0] "1 peer"
 msgstr[1] "{0} peerovia"
 msgstr[2] "{0} peerov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Spúšťa sa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Seeduje sa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Dokončené"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Zablokované"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Žiadni peerovia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Zastavené"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Detaily torrentu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Zobraziť súbory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Zastaviť torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Spustiť torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Spustiť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Odstrániť torrent zo zoznamu aktívnych zmazaním .torrent súboru."
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Ste si istý, že chcete odstrániť súbor \\\"{0}\\\"\n(stiahnuté dáta nebudú odstránené) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Odstrániť .torrent súbor a aj príslušný dátový súbor(y)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Ste si istý, že chcete odstrániť torrent \\\"{0}\\\" a s ním aj všetky stiahnuté dáta?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Zmazať"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Seed"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Nezaujímavý (Peer nemá žiadne kúsky, ktoré potrebujeme)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Zapchaný (Peer nám neumožňuje žiadať o kúsky)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Nezaujímajúci sa (Nemáme žiadne kúsky, ktoré peer potrebuje)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Zapchaný (Neumožňujeme peerovi žiadať o kúsky)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detaily sú v {0} stopovači"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Informácie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Pridať torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Z URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Zadajte URL (iba I2P) pre stiahnutie torrentu, magnetový alebo maggotový link, prípadne info hash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Pridať torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Môžete tiež skopírovať .torrent súbory do: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Odstránenie .torrent spôsobí jeho zastavenie."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Vytvoriť torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Dáta na seedovanie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Stopovače"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primárne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternatívne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Vytvoriť torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "žiadne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Dátový priečinok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Súbory čitateľné všetkými"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Ak je zaškrtnuté, ostatní užívatelia budú môcť pristupovať k stiahnutým súborom"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Ak je zaškrtnuté, automaticky sa spustia pridané torrenty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Téma"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Čas refreshu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Zdržanie pri spustení"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minúty"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Veľkosť stránky"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrentov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Celkový limit uploaderov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "peerovia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Limit nárastu šírky pásma"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Odporúča sa polovica dostupnej šírky pásma."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Zobraziť alebo zmeniť šírku pásma routra"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Použiť aj otvorené stopovače"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Ak je zaškrtnuté, otvorené stopovače tak isto ako aj stopovače vypísané v súbore torrentu sa oboznámia so všetkými torrentmi"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Povoliť DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Ak je zaškrtnuté, použije sa DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Nastavenia prichádzajúcich dát"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Nastavenia odchádzajúcich dát"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP host"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP port"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP nastavenia"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Uložiť konfiguráciu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Názov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "URL webovej stránky"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Otvoriť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Súkromné"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Oznámiť URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Pridať"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Neplatná magnetová URL {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -1168,7 +1218,7 @@ msgstr[0] "1 hop"
 msgstr[1] "{0} hopy"
 msgstr[2] "{0} hopov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -1176,110 +1226,119 @@ msgstr[0] "1 tunel"
 msgstr[1] "{0} tunely"
 msgstr[2] "{0} tunelov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Súbor torrentu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Primárny stopovač"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Zoznam stopovačov"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Komentár"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Vytvorené"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Vytvorené užívateľom"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnetový link"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Súkromný torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Veľkosť"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Dokončenie"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Zostávajúce"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Súbory"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Kúsky"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Veľkosť kúsku"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Priečinok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Priorita"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Hore do priečinka vyššej úrovne"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent nenájdený?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Súbor nenájdený v torrente?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "dokončiť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "zostávajúcich"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Vysoká"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normálna"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Preskočiť"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Uložiť priority"
diff --git a/apps/i2psnark/locale/messages_sv.po b/apps/i2psnark/locale/messages_sv.po
index beac148f16d080524f5d3be9e09b037ba5380de6..59e5912b1684ff6971d99c2be2ef1ed211bc5a94 100644
--- a/apps/i2psnark/locale/messages_sv.po
+++ b/apps/i2psnark/locale/messages_sv.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -32,221 +32,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P-tunneln är stängd."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Gräns för totalt antal uppladdare är bytt till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Minsta tillåtna gräns för uppladdare är {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Uppladdningsbandbredd bytt till {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Minsta uppladdningsbandbredd bytt till {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "Fördröjning vid uppstart bytt till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "Uppdateringstiden ändrad till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "Uppdatering inaktiverad"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "Torrentar per sida ändrat till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "Datamappen måste vara en absolut sökväg"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "Datamappen finns ej"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "Inte en mapp"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "Oläsbar"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "Datamappen ändrad till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "I2CP- och tunnelförändringar kommer träda i kraft efter alla torrentar stoppats"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "Alternativ för I2CP ändrade till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "Kopplar ifrån gammal I2CP destination"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Inställningar för I2CP ändrade till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Misslyckades med anslutningsförsök med nya inställningar, återställer de gamla I2CP inställningarna"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "Misslyckades med anslutningsförsök med gamla inställningar!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "Återanslöt mot den nya I2CP destinationen"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP-lyssnare omstartad för \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "Nya filer kommer vara publikt läsbara"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "Nya filer kommer inte vara publikt läsbara"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "Aktiverade automatisk start"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "Inaktiverade automatisk start"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Aktiverade publika trackers - torrenten måste startas om för att inställningen ska träda i kraft"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Inaktiverade publika trackers - torrenten måste startas om för att inställningen ska träda i kraft"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "Aktivera DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "Inaktiverade DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "Förändring i DHT kräver att tunneln stängs och öppnas igen "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} tema laddat, återgå till huvudvyn för i2psnark."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "Inställningar oförändrade."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Listan över publika trackers förändrad - torrenten måste startas om för att inställningen ska träda i kraft"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "Privat trackerlista ändrad - påverkar bara nyligen skapade torrents"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Misslyckades med att spara inställningar till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Ansluter till I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Problem vid anslutning till I2P - kontrollera dina inställningar för I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Problem: Kunde inte lägga till torrent {0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Kan inte öppna \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Torrent med denna infohash körs redan: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "FEL - Inga I2P trackers i den privata torrenten \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "Varning - Ingen I2P tracker i \"{0}\", kommer enbart att annonsera till publika I2P trackers och DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "Varning - Ingen I2P tracker i \"{0}\" och publika trackers är inaktiverade, kommer enbart att annonsera till DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -254,34 +255,34 @@ msgid ""
 "torrent."
 msgstr "Varning - Ingen I2P tracker i \"{0}\" och både DHT och publika trackers är inaktiverade, du bör aktivera publika trackers eller DHT innan du startar torrenten. "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Torrent i \"{0}\" är ogiltig"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "FEL - Minnet har tagit slut, kan inte skapa torrent från {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Torrent tillagd och startad: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Torrent tillagd: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "Hämtar {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -289,132 +290,132 @@ msgid ""
 "DHT."
 msgstr "Publika trackers är inaktiverade och vi har inga DHT klienter. Hämtningen av {0} kan kanske inte genomföras innan du startar en annan torrent eller aktiverar publika trackers eller DHT."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "Lägger till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "Hämtar redan: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Misslyckades att kopiera torrentfil till {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "För många filer i \"{0}\" ({1}), tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Torrenten \"{0}\" får inte sluta med \".torrent\", tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "Inga delar i \"{0}\",  tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "För många delar i \"{0}\", gränsen är {1}, tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "För stora delar i \"{0}\" ({1}B), tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Gränsen är {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "Torrenten \"{0}\" har ingen data, tar bort den!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Torrentar större än {0}B stöds inte än, tar bort \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Fel: Kunde ej ta bort torrenten {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent stannad: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent borttagen: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Lägger till torrentar i {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "Upp bandbredds gräns är {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Hämtning klar: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo mottagen för {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Startar torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "Fel på torrent {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "Misslyckades med att ansluta till I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "Öppnar I2P tunneln"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Öppnar I2P-tunneln och startar torrentar."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Stoppar alla torrentar och stänger I2P-tunneln."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "Stänger I2P tunnel efter att ha meddelat trackers."
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "Ingen giltig tracker för {0} - aktivera publika trackers eller DHT?"
@@ -429,859 +430,917 @@ msgstr "Uppdaterar"
 msgid "Updating from {0}"
 msgstr "Uppdaterar från {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "Hämtar torrentfil från {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Torrent kunde inte hämtas från {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent hämtad från {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent redan igång: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent finns redan i kön: {0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Torrent vid {0} var inte giltig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Inställningar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "Routern är avstängd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "Torrentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Ladda om sida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "Klicka på \"Lägg till torrent\" för att hämta en torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "rensa meddelandena"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Status"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "Dölj klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "Visa klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "Uppskattad återstående tid"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "Förväntas klar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Hämtade"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "Uppskattad återstående tid"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "RX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Uppladdat"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Hämtade"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Storlek"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "TX"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "Nerhastighet"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Uppladdat"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "RX Rate"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "Upphastighet"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "Nerhastighet"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "TX Rate"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "Upphastighet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Stoppa alla torrents och I2P-tunneln"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "Stoppa alla"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "Starta alla stannade torrentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "Starta alla"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Starta alla torrents och I2P-tunneln"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "Inga torrents laddade."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Totalt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "1 torrent"
 msgstr[1] "{0} torrentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "1 ansluten klient"
 msgstr[1] "{0} anslutna klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "1 DHT klient"
 msgstr[1] "{0} DHT klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "Första"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "Första sidan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "Bakåt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "Nästa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "Sista"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "Sista sidan"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "Ogiltig adress: Måste inledas med \"http://\", \"{0}\" eller \"{1}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet borttagen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Torrentfil borttagen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "Hämtning borttagen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Datafil borttagen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Datafil kunde inte tas bort: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "Katalogen kunde inta tas bort: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "Katalogen bort tagen: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "Fel - Kan inte inkludera alternativa trackers utan en primär tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "Fel - Kan inte blanda privata och publika trackers i samma torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Torrent skapad för \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "Många I2P trackers kräver att du registrerar nya torrentar innan uppladdningen påbörjas - gör det innan \"{0}\" startas"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Misslyckades med att skapa torrent för \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Kan ej skapa torrent för data som ej finns: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Misslyckades med att skapa torrent - en fil eller mapp måste anges"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "Ta bort valda"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "Spara tracker konfiguration"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "Borttagen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "Lägg till tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "Ange giltigt namn och adresser för trackern "
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "Återställ standardvärden"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "Återställ standard trackers "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "Kontrollerar "
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "Allokerar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Trackerfel"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "1 klient"
 msgstr[1] "{0} klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "Startar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "Uppladdning"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Färdig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "Ok"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "Inga klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "Torrentdetaljer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Se filer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "Stoppa torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Stoppa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "Starta torrenten"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Starta"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Ta bort torrenten från den aktiva listan, tar bort .torrent filen"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "Är du säker på att du vill radera filen  \\''{0}\\' (hämtad data kommer ej raderas) ?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Ta bort .torrent filen och tillhörande datafil(er)"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "Är du säker på att du vill ta bort torrenten \"{0}\" och all hämtad data?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "Källa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Ointressant (klienten har inga delar vi behöver)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Strypt (klienten låter oss inte be om delar)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Ointresserad (vi har inga delar klienten behöver)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Stryper (vi låter inte klienten be om delar)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Detaljer för {0} tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Info"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "Lägg till torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "Adress"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "Ange torrentfilens adress (enbart I2P), magnet-länk, maggot-länk eller infohash"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "Lägg till torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Du kan även kopiera .torrent filer till: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "Borttagning av .torrent fil kommer stanna den."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "Skapa torrent"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "Data att ladda upp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "Primär"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "Alternativ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "Skapa torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "inga"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "Datamapp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "Filer läsbara för alla"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "Välj detta för att ge andra användare tillgång till hämtade filer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "Välj detta för att automatiskt starta tillagda torrentfiler"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "Tema"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "Uppdateringsintervall"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "Fördröjning av uppstart"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "minuter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "Per sida"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "torrentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "Gräns för totalt antal uppladdare"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "klienter"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Gräns för bandbredd uppåt"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "Hälften av tillgänglig bandbredd rekommenderas."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "Se eller ändra routerns bandbredd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "Använd också publika trackers"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "Välj detta för att annonsera torrentar till publika trackers såväl som de listade i torrentfilen"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "Aktivera DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "Välj detta för att använda DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "Inställningar för inkommande"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "Inställningar för utgående"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP-värd"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP-port"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "Alternativ för I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Spara inställningar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "Namn"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "Webbplatsadress"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Publik"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "Privat"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "Annonseringsadress"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "Ogiltig magnet-adress {0}"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 hopp"
 msgstr[1] "{0} hopp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 tunnel"
 msgstr[1] "{0} tunnlar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Torrentfil"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "Primär tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Trackerlista"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "Skapad"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "Skapad av"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnet länk"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "Privat torrent"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Storlek"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "Färdigställning"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "Kvar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Filer"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Delar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Delstorlek"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Mapp"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "Upp till högre mappnivå"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "Torrent hittades ej?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "Fil hittades ej i torrent?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "färdig"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "kvar"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Hög"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Normal"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "Spara prioriteter"
diff --git a/apps/i2psnark/locale/messages_vi.po b/apps/i2psnark/locale/messages_vi.po
index 63b54fd26026a4cc59b47fa08f35586a239a7add..261b49889c16ab52a22c90b928d8a33a64da74bb 100644
--- a/apps/i2psnark/locale/messages_vi.po
+++ b/apps/i2psnark/locale/messages_vi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-19 21:48+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -24,221 +24,222 @@ msgid "No more torrents running."
 msgstr ""
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "Đường hầm I2P đóng lại."
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Giới hạn băng thông lên đổi thành {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Tối thiểu băng thông lên là {0}KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "Nối kết vào I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr ""
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr ""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -246,34 +247,34 @@ msgid ""
 "torrent."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -281,132 +282,132 @@ msgid ""
 "DHT."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr ""
@@ -421,853 +422,911 @@ msgstr ""
 msgid "Updating from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "Nạp lại trang"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "Diễn đàn"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "Tình trạng"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr ""
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "Đã tải xuống"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "Đã tải lên"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "Đã tải xuống"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "Kích thước"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
 msgstr ""
 
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "Đã tải lên"
+
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
 msgstr ""
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "Tổng cộng"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr ""
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr ""
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "Hoàn tất"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "Khựng"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "Ngưng"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "Xem tập tin"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "Ngưng"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "Bắt đầu"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "Bỏ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr ""
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "Thông tin"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr ""
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "phút"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "Giới hạn băng thông lên"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "Lưu cấu hình"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "Mở"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr ""
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "Kích thước"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "Tập tin"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "Mảnh"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "Kích thước mảnh"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "Danh mục"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "hoàn tất"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "Cao"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "Thường"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "Lờ"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr ""
diff --git a/apps/i2psnark/locale/messages_zh.po b/apps/i2psnark/locale/messages_zh.po
index e44a48049bb4ae62a0bfecdc99d36a4e025a90fa..2a812a8d25754b00c7c35ae9cd36680d6cfa1476 100644
--- a/apps/i2psnark/locale/messages_zh.po
+++ b/apps/i2psnark/locale/messages_zh.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 23:35+0000\n"
+"POT-Creation-Date: 2014-11-19 21:48+0000\n"
+"PO-Revision-Date: 2014-11-20 07:17+0000\n"
 "Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -28,221 +28,222 @@ msgid "No more torrents running."
 msgstr "没有更多种子正在运行。"
 
 #: ../java/src/org/klomp/snark/IdleChecker.java:70
-#: ../java/src/org/klomp/snark/SnarkManager.java:2233
-#: ../java/src/org/klomp/snark/SnarkManager.java:2244
+#: ../java/src/org/klomp/snark/SnarkManager.java:2283
+#: ../java/src/org/klomp/snark/SnarkManager.java:2294
 msgid "I2P tunnel closed."
 msgstr "I2P隧道已关闭"
 
 #: ../java/src/org/klomp/snark/MagnetURI.java:42
 #: ../java/src/org/klomp/snark/MagnetURI.java:52
-#: ../java/src/org/klomp/snark/SnarkManager.java:1939
+#: ../java/src/org/klomp/snark/SnarkManager.java:1987
 msgid "Magnet"
 msgstr "Magnet"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:725
+#: ../java/src/org/klomp/snark/SnarkManager.java:749
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "总上传种子数限制已更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:727
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "最低上传种子数限制为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:739
+#: ../java/src/org/klomp/snark/SnarkManager.java:763
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "上传带宽限制改为 {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:741
+#: ../java/src/org/klomp/snark/SnarkManager.java:765
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "最小上传带宽限制为 {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:777
 #, java-format
 msgid "Startup delay changed to {0}"
 msgstr "下载前的延迟已更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:764
+#: ../java/src/org/klomp/snark/SnarkManager.java:788
 #, java-format
 msgid "Refresh time changed to {0}"
 msgstr "刷新时间更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:766
+#: ../java/src/org/klomp/snark/SnarkManager.java:790
 msgid "Refresh disabled"
 msgstr "刷新已禁用"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:782
+#: ../java/src/org/klomp/snark/SnarkManager.java:806
 #, java-format
 msgid "Page size changed to {0}"
 msgstr "页面容量更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:791
+#: ../java/src/org/klomp/snark/SnarkManager.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944
 msgid "Data directory must be an absolute path"
 msgstr "数据存放目录必须是绝对路径"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:793
+#: ../java/src/org/klomp/snark/SnarkManager.java:817
 msgid "Data directory does not exist"
 msgstr "数据存放目录不存在"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:795
+#: ../java/src/org/klomp/snark/SnarkManager.java:819
 msgid "Not a directory"
 msgstr "不是文件夹"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:797
+#: ../java/src/org/klomp/snark/SnarkManager.java:821
 msgid "Unreadable"
 msgstr "不可读"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:826
 #, java-format
 msgid "Data directory changed to {0}"
 msgstr "数据存放目录更新至{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:857
+#: ../java/src/org/klomp/snark/SnarkManager.java:881
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
 msgstr "I2CP与隧道设置的变化在所有种子停止后才能生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:861
+#: ../java/src/org/klomp/snark/SnarkManager.java:885
 #, java-format
 msgid "I2CP options changed to {0}"
 msgstr "I2CP 选项改为 {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:867
+#: ../java/src/org/klomp/snark/SnarkManager.java:891
 msgid "Disconnecting old I2CP destination"
 msgstr "正在断开旧的I2CP目标"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:869
+#: ../java/src/org/klomp/snark/SnarkManager.java:893
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP设置改为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:874
+#: ../java/src/org/klomp/snark/SnarkManager.java:898
 msgid ""
 "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "无法通过新设置连接,恢复I2CP的旧设置"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:878
+#: ../java/src/org/klomp/snark/SnarkManager.java:902
 msgid "Unable to reconnect with the old settings!"
 msgstr "旧设置也无法连接!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:880
+#: ../java/src/org/klomp/snark/SnarkManager.java:904
 msgid "Reconnected on the new I2CP destination"
 msgstr "重新连接新I2CP目标"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:887
+#: ../java/src/org/klomp/snark/SnarkManager.java:911
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "\"{0}\"的I2CP监听端口已启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:901
+#: ../java/src/org/klomp/snark/SnarkManager.java:925
 msgid "New files will be publicly readable"
 msgstr "新文件将对公共可读"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:903
+#: ../java/src/org/klomp/snark/SnarkManager.java:927
 msgid "New files will not be publicly readable"
 msgstr "新文件不会对公共可读"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:910
+#: ../java/src/org/klomp/snark/SnarkManager.java:934
 msgid "Enabled autostart"
 msgstr "启用自动启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:912
+#: ../java/src/org/klomp/snark/SnarkManager.java:936
 msgid "Disabled autostart"
 msgstr "禁用自动启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:918
+#: ../java/src/org/klomp/snark/SnarkManager.java:942
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "启用OpenTracker-重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:920
+#: ../java/src/org/klomp/snark/SnarkManager.java:944
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "禁用OpenTracker - 重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:927
+#: ../java/src/org/klomp/snark/SnarkManager.java:951
 msgid "Enabled DHT."
 msgstr "DHT 已启用"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:929
+#: ../java/src/org/klomp/snark/SnarkManager.java:953
 msgid "Disabled DHT."
 msgstr "DHT 已禁用"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:931
+#: ../java/src/org/klomp/snark/SnarkManager.java:955
 msgid "DHT change requires tunnel shutdown and reopen"
 msgstr "DHT 修改生效需要关闭或重启。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:938
+#: ../java/src/org/klomp/snark/SnarkManager.java:962
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
 msgstr "{0} 主题已加载,浏览效果请到 i2psnark 主页。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:948
+#: ../java/src/org/klomp/snark/SnarkManager.java:972
 msgid "Configuration unchanged."
 msgstr "设置未改变"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:1004
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "OpenTracker列表已改变 - 重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:990
+#: ../java/src/org/klomp/snark/SnarkManager.java:1014
 msgid "Private tracker list changed - affects newly created torrents only."
 msgstr "PT 列表已更改 - 仅对新创建的种子有效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1036
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "无法保存设置到{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1115
+#: ../java/src/org/klomp/snark/SnarkManager.java:1141
 msgid "Connecting to I2P"
 msgstr "正在连接到I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1118
+#: ../java/src/org/klomp/snark/SnarkManager.java:1144
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "连接I2P时发生错误 - 请检查I2CP设置!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1127
-#: ../java/src/org/klomp/snark/SnarkManager.java:1976
+#: ../java/src/org/klomp/snark/SnarkManager.java:1153
+#: ../java/src/org/klomp/snark/SnarkManager.java:2024
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "错误:无法添加种子{0}"
 
 #. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:1149
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "无法打开 \"{0}\""
 
 #. TODO - if the existing one is a magnet, delete it and add the metainfo
 #. instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:1168
-#: ../java/src/org/klomp/snark/SnarkManager.java:1273
-#: ../java/src/org/klomp/snark/SnarkManager.java:1360
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162
+#: ../java/src/org/klomp/snark/SnarkManager.java:1195
+#: ../java/src/org/klomp/snark/SnarkManager.java:1320
+#: ../java/src/org/klomp/snark/SnarkManager.java:1407
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "具有相同Hash链接的种子已在下载中:{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1201
 #, java-format
 msgid "ERROR - No I2P trackers in private torrent \"{0}\""
 msgstr "错误 - 私有种子\"{0}\"中缺少 I2P Tracker"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#: ../java/src/org/klomp/snark/SnarkManager.java:1203
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and"
 " DHT only."
 msgstr "警告 - \"{0}\"中缺少 I2P Tracker,程序将仅通过 I2P 中的开放式 Tracker 和 DHT 下载。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1179
+#: ../java/src/org/klomp/snark/SnarkManager.java:1206
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will "
 "announce to DHT only."
 msgstr "警告 - \"{0}\"中缺少 I2P Tracker,已禁用 I2P  Open Tracker,程序将仅通过 DHT 下载。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1181
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
 #, java-format
 msgid ""
 "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are "
@@ -250,34 +251,34 @@ msgid ""
 "torrent."
 msgstr "警告 - \"{0}\"中缺少 I2P Tracker,已禁用 I2P  Open Tracker 和 DHT,下载先您需要先启用  OpenTracker 或 DHT 。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1207
+#: ../java/src/org/klomp/snark/SnarkManager.java:1234
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "无效种子 \"{0}\" "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1214
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189
+#: ../java/src/org/klomp/snark/SnarkManager.java:1241
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "错误: 内存不足,无法为 {0} 创建种子。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1226
+#: ../java/src/org/klomp/snark/SnarkManager.java:1253
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "已添加并启动种子:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1228
+#: ../java/src/org/klomp/snark/SnarkManager.java:1255
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "已添加种子:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1284
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89
+#: ../java/src/org/klomp/snark/SnarkManager.java:1331
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93
 #, java-format
 msgid "Fetching {0}"
 msgstr "正在获取{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1290
+#: ../java/src/org/klomp/snark/SnarkManager.java:1337
 #, java-format
 msgid ""
 "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not "
@@ -285,132 +286,132 @@ msgid ""
 "DHT."
 msgstr "OpenTracker被禁用,程序目前没有DHT节点。{0}的下载不会成功,直到您启动另一个种子的下载、重新启用OpenTracker或DHT。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1294
+#: ../java/src/org/klomp/snark/SnarkManager.java:1341
 #, java-format
 msgid "Adding {0}"
 msgstr "正在添加{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1326
+#: ../java/src/org/klomp/snark/SnarkManager.java:1373
 #, java-format
 msgid "Download already running: {0}"
 msgstr "已经在下载中:{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1370
-#: ../java/src/org/klomp/snark/SnarkManager.java:1395
-#: ../java/src/org/klomp/snark/SnarkManager.java:1895
+#: ../java/src/org/klomp/snark/SnarkManager.java:1417
+#: ../java/src/org/klomp/snark/SnarkManager.java:1443
+#: ../java/src/org/klomp/snark/SnarkManager.java:1943
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "无法复制种子文件到{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1681
+#: ../java/src/org/klomp/snark/SnarkManager.java:1729
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "\"{0}\" ({1}) 含有太多文件,删除之!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1683
+#: ../java/src/org/klomp/snark/SnarkManager.java:1731
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "种子文件 \"{0}\" 不以 \".torrent\"结尾,正在删除!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1685
+#: ../java/src/org/klomp/snark/SnarkManager.java:1733
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "\"{0}\" 中没有数据片,删除之!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1687
+#: ../java/src/org/klomp/snark/SnarkManager.java:1735
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "\"{0}\" 中文件分片太多,限额为{1},删除之!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1689
+#: ../java/src/org/klomp/snark/SnarkManager.java:1737
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "\"{0}\" ({1}B) 中文件分片过大,删除之。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1690
+#: ../java/src/org/klomp/snark/SnarkManager.java:1738
 #, java-format
 msgid "Limit is {0}B"
 msgstr "限额为 {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1692
+#: ../java/src/org/klomp/snark/SnarkManager.java:1740
 #, java-format
 msgid "Torrent \"{0}\" has no data, deleting it!"
 msgstr "种子\"{0}\"中无数据,正在删除!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1700
+#: ../java/src/org/klomp/snark/SnarkManager.java:1748
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "目前不支持大于{0}B 的种子,正在删除\"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1716
+#: ../java/src/org/klomp/snark/SnarkManager.java:1764
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "错误:无法删除种子{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1737
-#: ../java/src/org/klomp/snark/SnarkManager.java:1755
+#: ../java/src/org/klomp/snark/SnarkManager.java:1785
+#: ../java/src/org/klomp/snark/SnarkManager.java:1803
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "种子已停止:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1776
+#: ../java/src/org/klomp/snark/SnarkManager.java:1824
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "种子已删除:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1784
+#: ../java/src/org/klomp/snark/SnarkManager.java:1832
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "{0} 分钟内完成添加"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1815
+#: ../java/src/org/klomp/snark/SnarkManager.java:1863
 #, java-format
 msgid "Up bandwidth limit is {0} KBps"
 msgstr "最小上传带宽限制为 {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1838
+#: ../java/src/org/klomp/snark/SnarkManager.java:1886
 #, java-format
 msgid "Download finished: {0}"
 msgstr "下载已完成: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1891
+#: ../java/src/org/klomp/snark/SnarkManager.java:1939
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "已获得 {0} 的 Metainfo"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1892
-#: ../java/src/org/klomp/snark/SnarkManager.java:2121
+#: ../java/src/org/klomp/snark/SnarkManager.java:1940
+#: ../java/src/org/klomp/snark/SnarkManager.java:2171
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "正在启动种子{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1907
+#: ../java/src/org/klomp/snark/SnarkManager.java:1955
 #, java-format
 msgid "Error on torrent {0}"
 msgstr "种子 {0} 发生错误"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:1970
+#: ../java/src/org/klomp/snark/SnarkManager.java:2018
 msgid "Unable to connect to I2P!"
 msgstr "无法连接至I2P!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2120
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126
+#: ../java/src/org/klomp/snark/SnarkManager.java:2170
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130
 msgid "Opening the I2P tunnel"
 msgstr "正在建立 I2P 隧道"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2144
+#: ../java/src/org/klomp/snark/SnarkManager.java:2194
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "正在打开I2P隧道并启动所有种子"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2207
+#: ../java/src/org/klomp/snark/SnarkManager.java:2257
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "正在停用所有种子并关闭I2P隧道。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:2226
+#: ../java/src/org/klomp/snark/SnarkManager.java:2276
 msgid "Closing I2P tunnel after notifying trackers."
 msgstr "正在关闭 I2P 隧道,已通知 Tracker。"
 
-#: ../java/src/org/klomp/snark/TrackerClient.java:242
+#: ../java/src/org/klomp/snark/TrackerClient.java:240
 #, java-format
 msgid "No valid trackers for {0} - enable opentrackers or DHT?"
 msgstr "{0} 中 Tracker 无效 - 要启用 opentrackers 或 DHT 吗?"
@@ -425,853 +426,911 @@ msgstr "正在更新"
 msgid "Updating from {0}"
 msgstr "正在从 {0} 获取更新"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:77
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80
 #, java-format
 msgid "Download torrent file from {0}"
 msgstr "正在从 {0} 处下载种子文件"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:99
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "从{0}获得种子失败"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:153
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "从{0}获取种子成功"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:174
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "种子已启动:{0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:176
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "种子排队中:{0}"
 
-#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187
+#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "{0}的种子中有错误"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408
 msgid "Configuration"
 msgstr "设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275
 msgid "Anonymous BitTorrent Client"
 msgstr "匿名的 BitTorrent 客户端"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289
 msgid "Router is down"
 msgstr "路由器已关闭"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
 msgid "Torrents"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:335
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
 msgid "Refresh page"
 msgstr "刷新页面"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
 msgid "Forum"
 msgstr "论坛"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
 msgid "Click \"Add torrent\" button to fetch torrent"
 msgstr "点击 \"添加种子\" 按钮来获取种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:393
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
 msgid "clear messages"
 msgstr "清除消息"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:446
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:448
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2673
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966
 msgid "Status"
 msgstr "状态"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980
+#, java-format
+msgid "Sort by {0}"
+msgstr "排序按 {0}"
+
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461
 msgid "Hide Peers"
 msgstr "隐藏用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:473
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467
 msgid "Show Peers"
 msgstr "显示用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2444
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
 msgid "Torrent"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
-msgid "Estimated time remaining"
-msgstr "预计剩余时间"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
+msgid "File type"
+msgstr "文件类型"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 msgid "ETA"
 msgstr "预计剩余时间"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
-msgid "Downloaded"
-msgstr "已下载"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+msgid "Estimated time remaining"
+msgstr "预计剩余时间"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
 msgid "RX"
 msgstr "已接收"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
-msgid "Uploaded"
-msgstr "已上传"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
+msgid "Downloaded"
+msgstr "已下载"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954
+msgid "Size"
+msgstr "大小"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565
 msgid "TX"
 msgstr "已发送"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
-msgid "Down Rate"
-msgstr "下载速度"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822
+msgid "Upload ratio"
+msgstr "上传率"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568
+msgid "Uploaded"
+msgstr "已上传"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
 msgid "RX Rate"
 msgstr "接收速度"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-msgid "Up Rate"
-msgstr "上传速度"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+msgid "Down Rate"
+msgstr "下载速度"
 
 #. Translators: Please keep short or translate as " "
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
 msgid "TX Rate"
 msgstr "发送速度"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:542
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+msgid "Up Rate"
+msgstr "上传速度"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "停止全部种子及I2P隧道"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
 msgid "Stop All"
 msgstr "停止全部"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628
 msgid "Start all stopped torrents"
 msgstr "启动所有已停止的种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
 msgid "Start All"
 msgstr "启动全部"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642
 msgid "Start all torrents and the I2P tunnel"
 msgstr "启动全部种子及I2P隧道"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667
 msgid "No torrents loaded."
 msgstr "未载入任何种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Totals"
 msgstr "总计"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
 msgstr[0] "{0}个种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
 msgstr[0] "{0}个已连接用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
 #, java-format
 msgid "1 DHT peer"
 msgid_plural "{0} DHT peers"
 msgstr[0] "{0}个DHT节点"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First"
 msgstr "首页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "First page"
 msgstr "第一页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Prev"
 msgstr "前页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
 msgid "Previous page"
 msgstr "上一页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next"
 msgstr "下页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
 msgid "Next page"
 msgstr "下一页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last"
 msgstr "末页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
 msgid "Last page"
 msgstr "最后一页"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948
+msgid "Data directory cannot be created"
+msgstr "无法创建数据目录"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
+#, java-format
+msgid "Cannot add torrent {0} inside another torrent: {1}"
+msgstr "无法添加内含另一个种子的种子 {0}:{1}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
 msgstr "无效链接 - 链接必须以“http://”,“{0}”或“{1}”开头"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
 #, java-format
 msgid "Magnet deleted: {0}"
 msgstr "Magnet 已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "种子文件已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041
 #, java-format
 msgid "Download deleted: {0}"
 msgstr "下载已删除: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "数据文件已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "无法删除数据文件:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
 #, java-format
 msgid "Directory could not be deleted: {0}"
 msgstr "无法删除目录:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091
 #, java-format
 msgid "Directory deleted: {0}"
 msgstr "目录已经删除: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
 #, java-format
 msgid "Cannot add a torrent ending in \".torrent\": {0}"
 msgstr "无法添加一个以 \".torrent\" 结尾的种子: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147
 #, java-format
 msgid "Torrent with this name is already running: {0}"
 msgstr "此名称的种子已在运行:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153
 #, java-format
 msgid "Cannot add a torrent including an I2P directory: {0}"
 msgstr "无法添加包含一个 I2P 目录的种子:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986
-#, java-format
-msgid "Cannot add torrent {0} inside another torrent: {1}"
-msgstr "无法添加内含另一个种子的种子 {0}:{1}"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
 #, java-format
 msgid "Cannot add torrent {0} including another torrent: {1}"
 msgstr "无法添加包含另一个种子的种子 {0}:{1}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
 msgid "Error - Cannot include alternate trackers without a primary tracker"
 msgstr "错误 - 缺少主Tracker则无法添加替换Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207
 msgid "Error - Cannot mix private and public trackers in a torrent"
 msgstr "错误 - PT和公共Tracker无法在同一种子中混用。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "种子创建成功\"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 #, java-format
 msgid ""
 "Many I2P trackers require you to register new torrents before seeding - "
 "please do so before starting \"{0}\""
 msgstr "多数I2PTracker需要用户在做种前注册新种子 - 请在启动 \"{0}\"前到所使用的Tracker进行注册。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "创建种子时发生错误 \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "无法为不存在的数据文件创建种子:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "创建种子时发生错误 - 必须指定文件或文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392
 msgid "Delete selected"
 msgstr "删除选中项目"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394
 msgid "Save tracker configuration"
 msgstr "保存 Tracker 设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1111
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
 msgid "Removed"
 msgstr "已删除"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2191
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393
 msgid "Add tracker"
 msgstr "添加 Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
 msgid "Enter valid tracker name and URLs"
 msgstr "请输入有效的 Tracker 名称与链接"
 
 #. "<input type=\"reset\" class=\"cancel\"
 #. value=\"").append(_("Cancel")).append("\">\n" +
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396
 msgid "Restore defaults"
 msgstr "恢复默认值"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
 msgid "Restored default trackers"
 msgstr "恢复默认 Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460
 msgid "Checking"
 msgstr "正在检查"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463
 msgid "Allocating"
 msgstr "正在分配空间"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486
 msgid "Tracker Error"
 msgstr "Tracker错误"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1357
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0}个用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490
 msgid "Starting"
 msgstr "正在启动"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498
 msgid "Seeding"
 msgstr "正做种"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2731
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033
 msgid "Complete"
 msgstr "完成"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1353
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
 msgid "OK"
 msgstr "确定"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
 msgid "Stalled"
 msgstr "等待"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1379
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548
 msgid "No Peers"
 msgstr "没有用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1383
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551
 msgid "Stopped"
 msgstr "已停用"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580
 msgid "Torrent details"
 msgstr "种子详情"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615
 msgid "View files"
 msgstr "浏览文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1449
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
 msgid "Stop the torrent"
 msgstr "停止种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
 msgid "Stop"
 msgstr "停止"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
 msgid "Start the torrent"
 msgstr "启动种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Start"
 msgstr "启动"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "取消下载任务并删除对应种子文件。"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
 #, java-format
 msgid ""
 "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will "
 "not be deleted) ?"
 msgstr "你确定你要删除文件 \\“{0} \\” (下载的数据不会被删除)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
 msgid "Remove"
 msgstr "移除"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "删除种子及所下载的文件"
 
 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quote must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
 #, java-format
 msgid ""
 "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
 "data?"
 msgstr "您确定要删除种子“{0}”(下载的数据文件会一并被删除)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350
 msgid "Delete"
 msgstr "删除"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1585
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
 msgid "Unknown"
 msgstr "未知"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1597
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778
 msgid "Seed"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "无需要部分"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1622
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "拒绝请求"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "无需要部分"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1644
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "拒绝请求"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Tracker {0} 上的详细信息"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
 msgid "Info"
 msgstr "信息"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031
 msgid "Add Torrent"
 msgstr "添加种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034
 msgid "From URL"
 msgstr "从URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1859
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
 msgid ""
 "Enter the torrent file download URL (I2P only), magnet link, maggot link, or"
 " info hash"
 msgstr "输入种子文件的下载链接(仅支持I2P内网链接),magnet, maggot 链接或信息散列值"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
 msgid "Add torrent"
 msgstr "添加种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046
+msgid "Data dir"
+msgstr "数据目录"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#, java-format
+msgid "Enter the directory to save the data in (default {0})"
+msgstr "请输入保存数据的目录(默认 {0})"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "您也可以将.torrent文件复制到: {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1869
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055
 msgid "Removing a .torrent will cause it to stop."
 msgstr "删除种子文件将导致该下载任务中止。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1886
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
 msgid "Create Torrent"
 msgstr "创建种子"
 
 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
 #. value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071
 msgid "Data to seed"
 msgstr "做种数据"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075
 #, java-format
 msgid "File or directory to seed (full path or within the directory {0} )"
 msgstr "要做种的文件或目录(完整路径或包含在 {0} 目录中)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323
 msgid "Trackers"
 msgstr "Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080
 msgid "Primary"
 msgstr "主 Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1900
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
 msgid "Alternates"
 msgstr "备选 Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085
 msgid "Create torrent"
 msgstr "创建种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103
 msgid "none"
 msgstr "无"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140
 msgid "Data directory"
 msgstr "数据文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144
 msgid "Files readable by all"
 msgstr "文件对所有人可读"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148
 msgid "If checked, other users may access the downloaded files"
 msgstr "选中后,其他用户可以访问您下载的文件。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1970
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152
 msgid "Auto start torrents"
 msgstr "自动开始种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1974
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156
 msgid "If checked, automatically start torrents that are added"
 msgstr "选中后Snark将自动启动已添加的所有种子。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160
 msgid "Theme"
 msgstr "主题"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174
 msgid "Refresh time"
 msgstr "刷新时间"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187
 msgid "Never"
 msgstr "从不"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2010
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193
 msgid "Startup delay"
 msgstr "启动延迟"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195
 msgid "minutes"
 msgstr "分"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199
 msgid "Page size"
 msgstr "页面容量"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201
 msgid "torrents"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225
 msgid "Total uploader limit"
 msgstr "限制总上传种子数为"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2045
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228
 msgid "peers"
 msgstr "用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
 msgid "Up bandwidth limit"
 msgstr "上传带宽限制"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235
 msgid "Half available bandwidth recommended."
 msgstr "推荐设置为可用带宽的一半。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237
 msgid "View or change router bandwidth"
 msgstr "浏览或修改路由器带宽"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241
 msgid "Use open trackers also"
 msgstr "同时使用OpenTracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245
 msgid ""
 "If checked, announce torrents to open trackers as well as the tracker listed"
 " in the torrent file"
 msgstr "选择后在OpenTracker及种子文件中的Tracker上同时发布。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249
 msgid "Enable DHT"
 msgstr "启用 DHT"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253
 msgid "If checked, use DHT"
 msgstr "如果选中,则使用 DHT。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269
 msgid "Inbound Settings"
 msgstr "入站设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2092
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275
 msgid "Outbound Settings"
 msgstr "出站设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283
 msgid "I2CP host"
 msgstr "I2CP主机"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288
 msgid "I2CP port"
 msgstr "I2CP端口"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2120
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303
 msgid "I2CP options"
 msgstr "I2CP选项"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939
 msgid "Name"
 msgstr "名称"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330
 msgid "Website URL"
 msgstr "网站 URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2764
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332
+msgid "Standard"
+msgstr "标准"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066
 msgid "Open"
 msgstr "打开"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2151
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336
 msgid "Private"
 msgstr "私有"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338
 msgid "Announce URL"
 msgstr "发布 URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2183
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382
 msgid "Add"
 msgstr "添加"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "磁性链接 {0} 无效"
 
 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0}跳"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0}隧道"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677
 msgid "Torrent file"
 msgstr "Torrent文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685
 msgid "Data location"
 msgstr "数据位置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694
+msgid "Info hash"
+msgstr "信息哈希"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713
 msgid "Primary Tracker"
 msgstr "主 Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722
 msgid "Tracker List"
 msgstr "Tracker 列表"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747
 msgid "Comment"
 msgstr "评论"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757
 msgid "Created"
 msgstr "已创建"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2551
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768
 msgid "Created By"
 msgstr "创建者"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2564
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780
 msgid "Magnet link"
 msgstr "Magnet磁性链接"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
 msgid "Private torrent"
 msgstr "私有种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2587
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669
-msgid "Size"
-msgstr "大小"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813
 msgid "Completion"
 msgstr "完成"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968
 msgid "Remaining"
 msgstr "剩余"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852
 msgid "Files"
 msgstr "文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859
 msgid "Pieces"
 msgstr "分块数量"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2620
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865
 msgid "Piece size"
 msgstr "分块大小"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919
 msgid "Directory"
 msgstr "文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978
 msgid "Priority"
 msgstr "优先级"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990
 msgid "Up to higher level directory"
 msgstr "上一层文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024
 msgid "Torrent not found?"
 msgstr "种子未找到"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030
 msgid "File not found in torrent?"
 msgstr "种子中没有发现文件?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043
 msgid "complete"
 msgstr "完成"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2742
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044
 msgid "remaining"
 msgstr "剩余"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2788
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090
 msgid "High"
 msgstr "高"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095
 msgid "Normal"
 msgstr "普通"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100
 msgid "Skip"
 msgstr "跳过"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110
+msgid "Set all high"
+msgstr "设置所有为高"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112
+msgid "Set all normal"
+msgstr "设置所有为正常"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114
+msgid "Skip all"
+msgstr "忽略所有"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115
 msgid "Save priorities"
 msgstr "保存优先级"
diff --git a/apps/i2psnark/mime.properties b/apps/i2psnark/mime.properties
index b251fb72ea4d8fb0edfaf5ee678938423d66c58e..6739efc495a14494fd12aad148b43af9cfd60172 100644
--- a/apps/i2psnark/mime.properties
+++ b/apps/i2psnark/mime.properties
@@ -9,6 +9,7 @@ flac	= audio/flac
 flv	= video/x-flv
 iso	= application/x-iso9660-image
 m4a	= audio/mp4a-latm
+m4b	= audio/mp4a-latm
 m4v	= video/x-m4v
 mkv	= video/x-matroska
 mobi	= application/x-mobipocket-ebook
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index c7bd9af9567980f4b04d0ff7542a2fc1c1839654..b4be255ccd0652535feb065fb0434c208e18f0a4 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -62,7 +62,7 @@
     <target name="jar" depends="builddep, compile, bundle-proxy, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.j.tr" value="" />
-        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" excludes="**/EditBean.class **/IndexBean.class" >
+        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" excludes="**/ui/*.class **/EditBean.class **/IndexBean.class" >
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
@@ -73,7 +73,7 @@
                 <attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
             </manifest>
         </jar>
-        <jar destfile="./build/temp-beans.jar" basedir="./build/obj" includes="**/EditBean.class **/IndexBean.class" />
+        <jar destfile="./build/temp-beans.jar" basedir="./build/obj" includes="**/ui/*.class **/EditBean.class **/IndexBean.class" />
     </target>
 
     <target name="jarUpToDate">
@@ -90,6 +90,36 @@
         </condition>
     </target>
 
+    <!-- Separate jar for general UI classes -->
+    <target name="uiJar" depends="jar, uiJarUpToDate, listChangedFiles" unless="uiJar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.j.tr" value="" />
+        <jar destfile="./build/i2ptunnel-ui.jar" basedir="./build/obj" includes="**/ui/*.class" >
+            <manifest>
+                <attribute name="Class-Path" value="i2p.jar mstreaming.jar i2ptunnel.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Built-By" value="${build.built-by}" />
+                <attribute name="Build-Date" value="${build.timestamp}" />
+                <attribute name="Base-Revision" value="${workspace.version}" />
+                <attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="uiJarUpToDate">
+        <uptodate property="uiJar.uptodate" targetfile="build/i2ptunnel-ui.jar" >
+            <srcfiles dir= "build/obj" includes="**/ui/*.class" />
+        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="uiJar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
+    </target>
+
     <!-- servlet translations go in the war, not the jar -->
     <target name="bundle" depends="compile, precompilejsp" unless="no.bundle">
         <!-- Update the messages_*.po files.
@@ -185,6 +215,9 @@
     <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" > 
         <!-- set if unset -->
         <property name="workspace.changes.w.tr" value="" />
+    	<copy todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/ui">
+    		<fileset dir="build/obj/net/i2p/i2ptunnel/ui" />
+    	</copy>
         <copy file="build/obj/net/i2p/i2ptunnel/web/EditBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
         <copy file="build/obj/net/i2p/i2ptunnel/web/IndexBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
index bc1104d83b8d4cb47cac4b4e85491fd9c6a4ff69..7874aa606d6ae9120f1b1999a45083b751c7576b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
@@ -328,9 +328,9 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                 if (compressed > 0 && expanded > 0) {
                     // only update the stats if we did something
                     double ratio = compressed/expanded;
-                    _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), 0);
-                    _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, 0);
-                    _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, 0);
+                    _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio));
+                    _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed);
+                    _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded);
                 }
             }
         }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index 22379244afb2488bfded12414784f86ded6dd821..6fc491e394acb65c4bbb7af19f07fe007e28b03e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -83,7 +83,7 @@ import net.i2p.util.OrderedProperties;
  *  An I2PTunnel tracks one or more I2PTunnelTasks and one or more I2PSessions.
  *  Usually one of each.
  *
- *  Todo: Most events are not listened to elsewhere, so error propagation is poor
+ *  TODO: Most events are not listened to elsewhere, so error propagation is poor
  */
 public class I2PTunnel extends EventDispatcherImpl implements Logging {
     private final Log _log;
@@ -540,6 +540,8 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
      * This DOES update a running TunnelTask, but NOT the session.
      * A more efficient runClientOptions().
      *
+     * Defaults in opts properties are not recommended, they may or may not be honored.
+     *
      * @param opts non-null
      * @since 0.9.1
      */
@@ -1662,6 +1664,12 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
     private void runPing(String allargs, Logging l) {
         if (allargs.length() != 0) {
             _clientOptions.setProperty(I2Ping.PROP_COMMAND, allargs);
+            if (ownDest) {
+                if (!_clientOptions.containsKey("inbound.nickname"))
+                    _clientOptions.setProperty("inbound.nickname", "I2Ping");
+                if (!_clientOptions.containsKey("outbound.nickname"))
+                    _clientOptions.setProperty("outbound.nickname", "I2Ping");
+            }
             I2PTunnelTask task = new I2Ping(l, ownDest, this, this);
             addtask(task);
             notifyEvent("pingTaskId", Integer.valueOf(task.getId()));
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
index 5e8207a26f9728fa99c57d1e675fc2be725d3111..e10cfb55f6d717f1321157aefe9ebb1636e258c5 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
@@ -59,24 +59,22 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
 
     public static final String AUTH_REALM = "I2P SSL Proxy";
 
-    private final static byte[] ERR_BAD_PROTOCOL =
-        ("HTTP/1.1 405 Bad Method\r\n"+
+    private final static String ERR_BAD_PROTOCOL =
+         "HTTP/1.1 405 Bad Method\r\n"+
          "Content-Type: text/html; charset=iso-8859-1\r\n"+
          "Cache-control: no-cache\r\n"+
          "\r\n"+
          "<html><body><H1>I2P ERROR: METHOD NOT ALLOWED</H1>"+
          "The request uses a bad protocol. "+
-         "The Connect Proxy supports CONNECT requests ONLY. Other methods such as GET are not allowed - Maybe you wanted the HTTP Proxy?.<BR>")
-        .getBytes();
+         "The Connect Proxy supports CONNECT requests ONLY. Other methods such as GET are not allowed - Maybe you wanted the HTTP Proxy?.<BR>";
     
-    private final static byte[] ERR_LOCALHOST =
-        ("HTTP/1.1 403 Access Denied\r\n"+
+    private final static String ERR_LOCALHOST =
+         "HTTP/1.1 403 Access Denied\r\n"+
          "Content-Type: text/html; charset=iso-8859-1\r\n"+
          "Cache-control: no-cache\r\n"+
          "\r\n"+
          "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
-         "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>")
-        .getBytes();
+         "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>";
     
     /**
      * @throws IllegalArgumentException if the I2PTunnel does not contain
@@ -273,7 +271,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
 
             Destination clientDest = _context.namingService().lookup(destination);
             if (clientDest == null) {
-                byte[] header;
+                String header;
                 if (usingWWWProxy)
                     header = getErrorPage("dnfp", ERR_DESTINATION_UNKNOWN);
                 else
@@ -289,7 +287,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
             if (usingWWWProxy)
                 data = newRequest.toString().getBytes("ISO-8859-1");
             else
-                response = SUCCESS_RESPONSE;
+                response = SUCCESS_RESPONSE.getBytes("UTF-8");
             OnTimeout onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
             Thread t = new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
             // we are called from an unlimited thread pool, so run inline
@@ -311,10 +309,10 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
         }
     }
 
-    private static void writeErrorMessage(byte[] errMessage, OutputStream out) throws IOException {
+    private static void writeErrorMessage(String errMessage, OutputStream out) throws IOException {
         if (out == null)
             return;
-        out.write(errMessage);
+        out.write(errMessage.getBytes("UTF-8"));
         writeFooter(out);
     }
 }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 4b869243d2616dfd3b4bb964bc9be79684ffb172..e8912cd112be40efb75e2e5260a29e325e98724a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -3,9 +3,12 @@
  */
 package net.i2p.i2ptunnel;
 
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.URI;
@@ -84,13 +87,13 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     /**
      *  These are backups if the xxx.ht error page is missing.
      */
-    private final static byte[] ERR_REQUEST_DENIED =
-                                ("HTTP/1.1 403 Access Denied\r\n" +
+    private final static String ERR_REQUEST_DENIED =
+            "HTTP/1.1 403 Access Denied\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>" +
-            "You attempted to connect to a non-I2P website or location.<BR>").getBytes();
+            "You attempted to connect to a non-I2P website or location.<BR>";
 
     /*****
     private final static byte[] ERR_TIMEOUT =
@@ -105,42 +108,42 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     "the following Destination:<BR><BR>")
     .getBytes();
      *****/
-    private final static byte[] ERR_NO_OUTPROXY =
-                                ("HTTP/1.1 503 Service Unavailable\r\n" +
+    private final static String ERR_NO_OUTPROXY =
+            "HTTP/1.1 503 Service Unavailable\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: No outproxy found</H1>" +
             "Your request was for a site outside of I2P, but you have no " +
-            "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel").getBytes();
+            "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel";
 
-    private final static byte[] ERR_AHELPER_CONFLICT =
-                                ("HTTP/1.1 409 Conflict\r\n" +
+    private final static String ERR_AHELPER_CONFLICT =
+            "HTTP/1.1 409 Conflict\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: Destination key conflict</H1>" +
             "The addresshelper link you followed specifies a different destination key " +
             "than a host entry in your host database. " +
-            "Someone could be trying to impersonate another eepsite, " +
-            "or people have given two eepsites identical names.<p>" +
+            "Someone could be trying to impersonate another website, " +
+            "or people have given two websites identical names.<p>" +
             "You can resolve the conflict by considering which key you trust, " +
             "and either discarding the addresshelper link, " +
             "discarding the host entry from your host database, " +
-            "or naming one of them differently.<p>").getBytes();
+            "or naming one of them differently.<p>";
 
-    private final static byte[] ERR_AHELPER_NOTFOUND =
-                                ("HTTP/1.1 404 Not Found\r\n" +
+    private final static String ERR_AHELPER_NOTFOUND =
+            "HTTP/1.1 404 Not Found\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: Helper key not resolvable.</H1>" +
             "The helper key you put for i2paddresshelper= is not resolvable. " +
             "It seems to be garbage data, or a mistyped b32. Check your URL " +
-            "to try and fix the helper key to be either a b32 or a base64.").getBytes();
+            "to try and fix the helper key to be either a b32 or a base64.";
 
-    private final static byte[] ERR_AHELPER_NEW =
-                                ("HTTP/1.1 409 New Address\r\n" +
+    private final static String ERR_AHELPER_NEW =
+            "HTTP/1.1 409 New Address\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
@@ -148,42 +151,42 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
             "The address helper link you followed is for a new host name that is not in your address book. " +
             "You may either save the destination for this host name to your address book, or remember it only until your router restarts. " +
             "If you save it to your address book, you will not see this message again. " +
-            "If you do not wish to visit this host, click the \"back\" button on your browser.").getBytes();
+            "If you do not wish to visit this host, click the \"back\" button on your browser.";
 
-    private final static byte[] ERR_BAD_PROTOCOL =
-                                ("HTTP/1.1 403 Bad Protocol\r\n" +
+    private final static String ERR_BAD_PROTOCOL =
+            "HTTP/1.1 403 Bad Protocol\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: NON-HTTP PROTOCOL</H1>" +
             "The request uses a bad protocol. " +
-            "The I2P HTTP Proxy supports HTTP and HTTPS requests only. Other protocols such as FTP are not allowed.<BR>").getBytes();
+            "The I2P HTTP Proxy supports HTTP and HTTPS requests only. Other protocols such as FTP are not allowed.<BR>";
 
-    private final static byte[] ERR_BAD_URI =
-                                ("HTTP/1.1 403 Bad URI\r\n" +
+    private final static String ERR_BAD_URI =
+            "HTTP/1.1 403 Bad URI\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: INVALID REQUEST URI</H1>" +
             "The request URI is invalid, and probably contains illegal characters. " +
-            "If you clicked e.g. a forum link, check the end of the URI for any characters the browser has mistakenly added on.<BR>").getBytes();
+            "If you clicked e.g. a forum link, check the end of the URI for any characters the browser has mistakenly added on.<BR>";
 
-    private final static byte[] ERR_LOCALHOST =
-                                ("HTTP/1.1 403 Access Denied\r\n" +
+    private final static String ERR_LOCALHOST =
+            "HTTP/1.1 403 Access Denied\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>" +
-            "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>").getBytes();
+            "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>";
 
-    private final static byte[] ERR_INTERNAL_SSL =
-                                ("HTTP/1.1 403 SSL Rejected\r\n" +
+    private final static String ERR_INTERNAL_SSL =
+            "HTTP/1.1 403 SSL Rejected\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
             "<html><body><H1>I2P ERROR: SSL to I2P address rejected</H1>" +
             "SSL for to .i2p addresses denied by configuration." +
-            "You may change the configuration in I2PTunnel").getBytes();
+            "You may change the configuration in I2PTunnel";
 
     /**
      *  This constructor always starts the tunnel (ignoring the i2cp.delayOpen option).
@@ -464,10 +467,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         if(_log.shouldLog(Log.WARN)) {
                             _log.warn(getPrefix(requestId) + "Bad request [" + request + "]", use);
                         }
-                        out.write(getErrorPage("baduri", ERR_BAD_URI));
-                        writeFooter(out);
-                        reader.drain();
-                        s.close();
+                        try {
+                            out.write(getErrorPage("baduri", ERR_BAD_URI).getBytes("UTF-8"));
+                            writeFooter(out);
+                            reader.drain();
+                        } catch (IOException ioe) {
+                            // ignore
+                        } finally {
+                            closeSocket(s);
+                        }
                         return;
                     }
 
@@ -596,12 +604,19 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                                             if(_log.shouldLog(Log.WARN)) {
                                                 _log.warn(getPrefix(requestId) + "Could not find destination for " + ahelperKey);
                                             }
-                                            byte[] header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
-                                            out.write(header);
-                                            out.write(("<p>" + _("This seems to be a bad destination:") + " " + ahelperKey + " " + _("i2paddresshelper cannot help you with a destination like that!") + "</p>").getBytes("UTF-8"));
-                                            writeFooter(out);
-                                            // XXX: should closeSocket(s) be in a finally block?
-                                            closeSocket(s);
+                                            String header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
+                                            try {
+                                                out.write(header.getBytes("UTF-8"));
+                                                out.write(("<p>" + _("This seems to be a bad destination:") + " " + ahelperKey + " " +
+                                                           _("i2paddresshelper cannot help you with a destination like that!") +
+                                                           "</p>").getBytes("UTF-8"));
+                                                writeFooter(out);
+                                                // XXX: should closeSocket(s) be in a finally block?
+                                            } catch (IOException ioe) {
+                                                // ignore
+                                            } finally {
+                                                closeSocket(s);
+                                            }
                                             return;
                                         }
                                         ahelperKey = _dest.toBase64();
@@ -614,7 +629,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                                         // Store in local HashMap unless there is conflict
                                         String old = addressHelpers.putIfAbsent(destination.toLowerCase(Locale.US), ahelperKey);
                                         ahelperNew = old == null;
-                                        if((!ahelperNew) && !old.equals(ahelperKey)) {
+                                        // inr address helper links without trailing '=', so omit from comparison
+                                        if ((!ahelperNew) && !old.replace("=", "").equals(ahelperKey.replace("=", ""))) {
                                             // Conflict: handle when URL reconstruction done
                                             ahelperConflict = true;
                                             if(_log.shouldLog(Log.WARN)) {
@@ -644,11 +660,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
 
                             // Did addresshelper key conflict?
                             if(ahelperConflict) {
+                               try {
                                     // convert ahelperKey to b32
                                     String alias = getHostName(ahelperKey);
                                     if(alias.equals("i2p")) {
                                         // bad ahelperKey
-                                        byte[] header = getErrorPage("dnfb", ERR_DESTINATION_UNKNOWN);
+                                        String header = getErrorPage("dnfb", ERR_DESTINATION_UNKNOWN);
                                         writeErrorMessage(header, out, targetRequest, false, destination);
                                     } else {
                                         String trustedURL = requestURI.toASCIIString();
@@ -662,14 +679,19 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                                             break;
                                         }
                                         String conflictURL = conflictURI.toASCIIString();
-                                        byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT);
-                                        out.write(header);
-                                        out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, click <a href=\"{1}\">here</a>.", trustedURL, conflictURL).getBytes("UTF-8"));
-                                        out.write(("</p></div>").getBytes());
+                                        String header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT);
+                                        out.write(header.getBytes("UTF-8"));
+                                        out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, click <a href=\"{1}\">here</a>.",
+                                                    trustedURL, conflictURL).getBytes("UTF-8"));
+                                        out.write("</p></div>".getBytes("UTF-8"));
                                         writeFooter(out);
+                                    }
+                                    reader.drain();
+                                } catch (IOException ioe) {
+                                    // ignore
+                                } finally {
+                                    closeSocket(s);
                                 }
-                                reader.drain();
-                                s.close();
                                 return;
                             }
                         }  // end query processing
@@ -699,10 +721,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                     } else if(hostLowerCase.equals("localhost") || host.equals("127.0.0.1") ||
                             host.startsWith("192.168.") || host.equals("[::1]")) {
                         // if somebody is trying to get to 192.168.example.com, oh well
-                        out.write(getErrorPage("localhost", ERR_LOCALHOST));
-                        writeFooter(out);
-                        reader.drain();
-                        s.close();
+                        try {
+                            out.write(getErrorPage("localhost", ERR_LOCALHOST).getBytes("UTF-8"));
+                            writeFooter(out);
+                            reader.drain();
+                            s.close();
+                        } catch (IOException ioe) {
+                            // ignore
+                        } finally {
+                            closeSocket(s);
+                        }
                         return;
                     } else if(host.contains(".") || host.startsWith("[")) {
                         if (Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_USE_OUTPROXY_PLUGIN, "true"))) {
@@ -747,10 +775,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                                     _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
                                 }
                                 l.log("No outproxy found for the request.");
-                                out.write(getErrorPage("noproxy", ERR_NO_OUTPROXY));
-                                writeFooter(out);
-                                reader.drain();
-                                s.close();
+                                try {
+                                    out.write(getErrorPage("noproxy", ERR_NO_OUTPROXY).getBytes("UTF-8"));
+                                    writeFooter(out);
+                                    reader.drain();
+                                } catch (IOException ioe) {
+                                    // ignore
+                                } finally {
+                                    closeSocket(s);
+                                }
                                 return;
                             }
                             destination = currentProxy;
@@ -768,10 +801,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         if(_log.shouldLog(Log.WARN)) {
                             _log.warn("NODOTS, NOI2P: " + request);
                         }
-                        out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
-                        writeFooter(out);
-                        reader.drain();
-                        s.close();
+                        try {
+                            out.write(getErrorPage("denied", ERR_REQUEST_DENIED).getBytes("UTF-8"));
+                            writeFooter(out);
+                            reader.drain();
+                        } catch (IOException ioe) {
+                            // ignore
+                        } finally {
+                            closeSocket(s);
+                        }
                         return;
                     }   // end host name processing
 
@@ -897,7 +935,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                             pw = getTunnel().getClientOptions().getProperty(PROP_OUTPROXY_PW);
                         }
                         if(user != null && pw != null) {
-                            newRequest.append("Proxy-Authorization: Basic ").append(Base64.encode((user + ':' + pw).getBytes(), true)) // true = use standard alphabet
+                            newRequest.append("Proxy-Authorization: Basic ")
+                                    .append(Base64.encode((user + ':' + pw).getBytes("UTF-8"), true)) // true = use standard alphabet
                                     .append("\r\n");
                         }
                     }
@@ -914,13 +953,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
 
             if(method == null || (destination == null && !usingInternalOutproxy)) {
                 //l.log("No HTTP method found in the request.");
-                if (protocol != null && "http".equals(protocol.toLowerCase(Locale.US))) {
-                    out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
-                } else {
-                    out.write(getErrorPage("protocol", ERR_BAD_PROTOCOL));
+                try {
+                    if (protocol != null && "http".equals(protocol.toLowerCase(Locale.US))) {
+                        out.write(getErrorPage("denied", ERR_REQUEST_DENIED).getBytes("UTF-8"));
+                    } else {
+                        out.write(getErrorPage("protocol", ERR_BAD_PROTOCOL).getBytes("UTF-8"));
+                    }
+                    writeFooter(out);
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
                 }
-                writeFooter(out);
-                s.close();
                 return;
             }
 
@@ -938,23 +982,33 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         _log.warn(getPrefix(requestId) + "Auth required, sending 407");
                     }
                 }
-                out.write(getAuthError(result == AuthResult.AUTH_STALE).getBytes());
-                writeFooter(out);
-                s.close();
+                try {
+                    out.write(getAuthError(result == AuthResult.AUTH_STALE).getBytes("UTF-8"));
+                    writeFooter(out);
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
+                }
                 return;
             }
 
             // Serve local proxy files (images, css linked from error pages)
             // Ignore all the headers
-            if(usingInternalServer) {
-                // disable the add form if address helper is disabled
-                if(internalPath.equals("/add") &&
-                        Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER))) {
-                    out.write(ERR_HELPER_DISABLED);
-                } else {
-                    LocalHTTPServer.serveLocalFile(out, method, internalPath, internalRawQuery, _proxyNonce);
+            if (usingInternalServer) {
+                try {
+                    // disable the add form if address helper is disabled
+                    if(internalPath.equals("/add") &&
+                            Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER))) {
+                        out.write(ERR_HELPER_DISABLED.getBytes("UTF-8"));
+                    } else {
+                        LocalHTTPServer.serveLocalFile(out, method, internalPath, internalRawQuery, _proxyNonce);
+                    }
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
                 }
-                s.close();
                 return;
             }
 
@@ -966,7 +1020,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 byte[] response;
                 if (method.toUpperCase(Locale.US).equals("CONNECT")) {
                     data = null;
-                    response = SUCCESS_RESPONSE;
+                    response = SUCCESS_RESPONSE.getBytes("UTF-8");
                 } else {
                     data = newRequest.toString().getBytes("ISO-8859-1");
                     response = null;
@@ -992,9 +1046,14 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                     if(_log.shouldLog(Log.WARN)) {
                         _log.warn(getPrefix(requestId) + "Could not find destination for " + addressHelper);
                     }
-                    byte[] header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
-                    writeErrorMessage(header, out, targetRequest, false, destination);
-                    s.close();
+                    String header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
+                    try {
+                        writeErrorMessage(header, out, targetRequest, false, destination);
+                    } catch (IOException ioe) {
+                        // ignore
+                    } finally {
+                        closeSocket(s);
+                    }
                     return;
                 }
             } else if("i2p".equals(host)) {
@@ -1024,7 +1083,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 if(_log.shouldLog(Log.WARN)) {
                     _log.warn("Unable to resolve " + destination + " (proxy? " + usingWWWProxy + ", request: " + targetRequest);
                 }
-                byte[] header;
+                String header;
                 String jumpServers = null;
                 String extraMessage = null;
                 if(usingWWWProxy) {
@@ -1041,16 +1100,26 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         jumpServers = DEFAULT_JUMP_SERVERS;
                     }
                 }
-                writeErrorMessage(header, extraMessage, out, targetRequest, usingWWWProxy, destination, jumpServers);
-                s.close();
+                try {
+                    writeErrorMessage(header, extraMessage, out, targetRequest, usingWWWProxy, destination, jumpServers);
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
+                }
                 return;
             }
 
             if (method.toUpperCase(Locale.US).equals("CONNECT") &&
                 !usingWWWProxy &&
                 !Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_INTERNAL_SSL))) {
-                writeErrorMessage(ERR_INTERNAL_SSL, out, targetRequest, false, destination);
-                s.close();
+                try {
+                    writeErrorMessage(ERR_INTERNAL_SSL, out, targetRequest, false, destination);
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
+                }
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("SSL to i2p destinations denied by configuration: " + targetRequest);
                 return;
@@ -1062,8 +1131,13 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
             if(ahelperNew && "GET".equals(method) &&
                     (userAgent == null || !userAgent.startsWith("Wget")) &&
                     !Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER))) {
-                writeHelperSaveForm(out, destination, ahelperKey, targetRequest, referer);
-                s.close();
+                try {
+                    writeHelperSaveForm(out, destination, ahelperKey, targetRequest, referer);
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
+                }
                 return;
             }
 
@@ -1076,10 +1150,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 if(_log.shouldLog(Log.DEBUG)) {
                     _log.debug("Auto redirecting to " + uri);
                 }
-                out.write(("HTTP/1.1 301 Address Helper Accepted\r\n" +
+                try {
+                    out.write(("HTTP/1.1 301 Address Helper Accepted\r\n" +
                         "Location: " + uri + "\r\n" +
                         "\r\n").getBytes("UTF-8"));
-                s.close();
+                } catch (IOException ioe) {
+                    // ignore
+                } finally {
+                    closeSocket(s);
+                }
                 return;
             }
 
@@ -1102,7 +1181,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                     response = null;
                 } else {
                     data = null;
-                    response = SUCCESS_RESPONSE;
+                    response = SUCCESS_RESPONSE.getBytes("UTF-8");
                 }
                 t = new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
             } else {
@@ -1145,7 +1224,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         String s = getTunnel().getClientOptions().getProperty(PROP_SSL_OUTPROXIES);
         if (s == null)
             return null;
-        String[] p = s.split(", ");
+        String[] p = s.split("[,; \r\n\t]");
         if (p.length == 0)
             return null;
         // todo doesn't check for ""
@@ -1156,22 +1235,22 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     }
 
     /** @since 0.8.7 */
-    private void writeHelperSaveForm(OutputStream out, String destination, String ahelperKey,
+    private void writeHelperSaveForm(OutputStream outs, String destination, String ahelperKey,
                                      String targetRequest, String referer) throws IOException {
-        if(out == null) {
+        if(outs == null)
             return;
-        }
-        byte[] header = getErrorPage("ahelper-new", ERR_AHELPER_NEW);
+        Writer out = new BufferedWriter(new OutputStreamWriter(outs, "UTF-8"));
+        String header = getErrorPage("ahelper-new", ERR_AHELPER_NEW);
         out.write(header);
-        out.write(("<table><tr><td class=\"mediumtags\" align=\"right\">" + _("Host") +
-                "</td><td class=\"mediumtags\">" + destination + "</td></tr>\n").getBytes());
+        out.write("<table><tr><td class=\"mediumtags\" align=\"right\">" + _("Host") +
+                "</td><td class=\"mediumtags\">" + destination + "</td></tr>\n");
         try {
             String b32 = Base32.encode(SHA256Generator.getInstance().calculateHash(Base64.decode(ahelperKey)).getData());
-            out.write(("<tr><td class=\"mediumtags\" align=\"right\">" + _("Base 32") + "</td>" +
-                    "<td><a href=\"http://" + b32 + ".b32.i2p/\">" + b32 + ".b32.i2p</a></td></tr>").getBytes());
+            out.write("<tr><td class=\"mediumtags\" align=\"right\">" + _("Base 32") + "</td>" +
+                    "<td><a href=\"http://" + b32 + ".b32.i2p/\">" + b32 + ".b32.i2p</a></td></tr>");
         } catch(Exception e) {
         }
-        out.write(("<tr><td class=\"mediumtags\" align=\"right\">" + _("Destination") + "</td><td>" +
+        out.write("<tr><td class=\"mediumtags\" align=\"right\">" + _("Destination") + "</td><td>" +
                 "<textarea rows=\"1\" style=\"height: 4em; min-width: 0; min-height: 0;\" cols=\"70\" wrap=\"off\" readonly=\"readonly\" >" +
                 ahelperKey + "</textarea></td></tr></table>\n" +
                 "<hr><div class=\"formaction\">" +
@@ -1182,18 +1261,19 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 "<input type=\"hidden\" name=\"host\" value=\"" + destination + "\">\n" +
                 "<input type=\"hidden\" name=\"dest\" value=\"" + ahelperKey + "\">\n" +
                 "<input type=\"hidden\" name=\"nonce\" value=\"" + _proxyNonce + "\">\n" +
-                "<button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" + _("Save {0} to router address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
+                "<button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" +
+                _("Save {0} to router address book and continue to website", destination) + "</button><br>\n");
         if(_context.namingService().getName().equals("BlockfileNamingService")) {
             // only blockfile supports multiple books
-            out.write(("<br><button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
-            out.write(("<button type=\"submit\" name=\"private\" value=\"private\">" + _("Save {0} to private address book and continue to eepsite", destination) + "</button>\n").getBytes("UTF-8"));
+            out.write("<br><button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to website", destination) + "</button><br>\n");
+            out.write("<button type=\"submit\" name=\"private\" value=\"private\">" + _("Save {0} to private address book and continue to website", destination) + "</button>\n");
         }
         // Firefox (and others?) don't send referer to meta refresh target, which is
         // what the jump servers use, so this isn't that useful.
         if (referer != null)
-            out.write(("<input type=\"hidden\" name=\"referer\" value=\"" + referer + "\">\n").getBytes("UTF-8"));
-        out.write(("<input type=\"hidden\" name=\"url\" value=\"" + targetRequest + "\">\n" +
-                "</form></div></div>").getBytes());
+            out.write("<input type=\"hidden\" name=\"referer\" value=\"" + referer + "\">\n");
+        out.write("<input type=\"hidden\" name=\"url\" value=\"" + targetRequest + "\">\n" +
+                "</form></div></div>");
         writeFooter(out);
     }
 
@@ -1295,11 +1375,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         return lc.equals("http") || lc.equals("https");
     }
 
-    private final static byte[] ERR_HELPER_DISABLED =
-                                ("HTTP/1.1 403 Disabled\r\n" +
+    private final static String ERR_HELPER_DISABLED =
+            "HTTP/1.1 403 Disabled\r\n" +
             "Content-Type: text/plain\r\n" +
             "\r\n" +
-            "Address helpers disabled").getBytes();
+            "Address helpers disabled";
 
     /**
      *  Change various parts of the URI.
@@ -1388,7 +1468,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 }
                 keystart = i + 1;
                 valstart = -1;
-            } else if(c == '=') {
+            } else if (c == '=' && valstart < 0) {
                 // end of key
                 key = query.substring(keystart, i);
                 valstart = i + 1;
@@ -1398,28 +1478,33 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     }
     /****
     private static String[] tests = {
-    "", "foo", "foo=bar", "&", "&=&", "===", "&&",
-    "i2paddresshelper=foo",
-    "i2paddresshelpe=foo",
-    "2paddresshelper=foo",
-    "i2paddresshelper=%66oo",
-    "%692paddresshelper=foo",
-    "i2paddresshelper=foo&a=b",
-    "a=b&i2paddresshelper=foo",
-    "a=b&i2paddresshelper&c=d",
-    "a=b&i2paddresshelper=foo&c=d",
-    "a=b;i2paddresshelper=foo;c=d",
-    "a=b&i2paddresshelper=foo&c"
+        "", "foo", "foo=bar", "&", "&=&", "===", "&&",
+        "i2paddresshelper=foo",
+        "i2paddresshelpe=foo",
+        "2paddresshelper=foo",
+        "i2paddresshelper=%66oo",
+        "%692paddresshelper=foo",
+        "i2paddresshelper=foo&a=b",
+        "a=b&i2paddresshelper=foo",
+        "a=b&i2paddresshelper&c=d",
+        "a=b&i2paddresshelper=foo&c=d",
+        "a=b;i2paddresshelper=foo;c=d",
+        "a=b&i2paddresshelper=foo&c",
+        "a=b&i2paddresshelper=foo==&c",
+        "a=b&i2paddresshelper=foo%3d%3d&c",
+        "a=b&i2paddresshelper=f%6f%6F==&c",
+        "a=b&i2paddresshelper=foo&i2paddresshelper=bar&c",
+        "a=b&i2paddresshelper=foo&c%3F%3f%26%3b%3B%3d%3Dc=x%3F%3f%26%3b%3B%3d%3Dx"
     };
 
     public static void main(String[] args) {
-    for (int i = 0; i < tests.length; i++) {
-    String[] s = removeHelper(tests[i]);
-    if (s != null)
-    System.out.println("Test \"" + tests[i] + "\" q=\"" + s[0] + "\" h=\"" + s[1] + "\"");
-    else
-    System.out.println("Test \"" + tests[i] + "\" no match");
-    }
+        for (int i = 0; i < tests.length; i++) {
+            String[] s = removeHelper(tests[i]);
+            if (s != null)
+                System.out.println("Test \"" + tests[i] + "\" q=\"" + s[0] + "\" h=\"" + s[1] + "\"");
+            else
+                System.out.println("Test \"" + tests[i] + "\" no match");
+        }
     }
      ****/
 }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 858458e3ffe8516162da4c6e384c41e2eddcfb48..ae2cf1fbd14aa7ebf5ae68a3ee567d156c41a02e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -3,12 +3,15 @@
  */
 package net.i2p.i2ptunnel;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.io.Writer;
 import java.net.Socket;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -71,18 +74,17 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
     protected final List<String> _proxyList;
 
-    protected final static byte[] ERR_NO_OUTPROXY =
-        ("HTTP/1.1 503 Service Unavailable\r\n"+
+    protected final static String ERR_NO_OUTPROXY =
+         "HTTP/1.1 503 Service Unavailable\r\n"+
          "Content-Type: text/html; charset=iso-8859-1\r\n"+
          "Cache-control: no-cache\r\n"+
          "\r\n"+
          "<html><body><H1>I2P ERROR: No outproxy found</H1>"+
          "Your request was for a site outside of I2P, but you have no "+
-         "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel")
-         .getBytes();
+         "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel";
     
-    protected final static byte[] ERR_DESTINATION_UNKNOWN =
-                                ("HTTP/1.1 503 Service Unavailable\r\n" +
+    protected final static String ERR_DESTINATION_UNKNOWN =
+            "HTTP/1.1 503 Service Unavailable\r\n" +
             "Content-Type: text/html; charset=iso-8859-1\r\n" +
             "Cache-control: no-cache\r\n" +
             "\r\n" +
@@ -91,13 +93,12 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
             "wrong BASE64 I2P Destination or the link you are following is " +
             "bad. The host (or the WWW proxy, if you're using one) could also " +
             "be temporarily offline.  You may want to <b>retry</b>.  " +
-            "Could not find the following Destination:<BR><BR><div>").getBytes();
+            "Could not find the following Destination:<BR><BR><div>";
 
-    protected final static byte[] SUCCESS_RESPONSE =
-        ("HTTP/1.1 200 Connection Established\r\n"+
+    protected final static String SUCCESS_RESPONSE =
+        "HTTP/1.1 200 Connection Established\r\n"+
          "Proxy-agent: I2P\r\n"+
-         "\r\n")
-        .getBytes();
+         "\r\n";
 
     private final byte[] _proxyNonce;
     private final ConcurrentHashMap<String, NonceInfo> _nonces;
@@ -214,11 +215,14 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
         // see TunnelController.setSessionOptions()
         String proxies = props.getProperty("proxyList");
         if (proxies != null) {
-            StringTokenizer tok = new StringTokenizer(proxies, ", ");
+            StringTokenizer tok = new StringTokenizer(proxies, ",; \r\n\t");
             synchronized(_proxyList) {
                 _proxyList.clear();
-                while (tok.hasMoreTokens())
-                    _proxyList.add(tok.nextToken().trim());
+                while (tok.hasMoreTokens()) {
+                    String p = tok.nextToken().trim();
+                    if (p.length() > 0)
+                        _proxyList.add(tok.nextToken().trim());
+                }
             }
         } else {
             synchronized(_proxyList) {
@@ -484,7 +488,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      *  @return non-null
      *  @since 0.9.4 moved from I2PTunnelHTTPClient
      */
-    protected byte[] getErrorPage(String base, byte[] backup) {
+    protected String getErrorPage(String base, String backup) {
         return getErrorPage(_context, base, backup);
     }
 
@@ -499,7 +503,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      *  @return non-null
      *  @since 0.9.4 moved from I2PTunnelHTTPClient
      */
-    protected static byte[] getErrorPage(I2PAppContext ctx, String base, byte[] backup) {
+    protected static String getErrorPage(I2PAppContext ctx, String base, String backup) {
         File errorDir = new File(ctx.getBaseDir(), "docs");
         File file = new File(errorDir, base + "-header.ht");
         try {
@@ -515,7 +519,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
     /**
      *  @since 0.9.4 moved from I2PTunnelHTTPClient
      */
-    private static byte[] readFile(I2PAppContext ctx, File file) throws IOException {
+    private static String readFile(I2PAppContext ctx, File file) throws IOException {
         Reader reader = null;
         char[] buf = new char[512];
         StringBuilder out = new StringBuilder(2048);
@@ -525,7 +529,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
             while((len = reader.read(buf)) > 0) {
                 out.append(buf, 0, len);
             }
-            return out.toString().getBytes("UTF-8");
+            return out.toString();
         } finally {
             try {
                 if(reader != null)
@@ -578,7 +582,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
                                          boolean usingWWWProxy, String wwwProxy, long requestId) {
         if (out == null)
             return;
-        byte[] header;
+        String header;
         if (usingWWWProxy)
             header = getErrorPage(I2PAppContext.getGlobalContext(), "dnfp", ERR_DESTINATION_UNKNOWN);
         else
@@ -607,10 +611,12 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
             error = usingWWWProxy ? "nolsp" : "nols";
         } else if (status == MessageStatusMessage.STATUS_SEND_FAILURE_UNSUPPORTED_ENCRYPTION) {
             error = usingWWWProxy ? "encp" : "enc";
+        } else if (status == I2PSocketException.STATUS_CONNECTION_RESET) {
+            error = usingWWWProxy ? "resetp" : "reset";
         } else {
             error = usingWWWProxy ? "dnfp" : "dnf";
         }
-        byte[] header = getErrorPage(error, ERR_DESTINATION_UNKNOWN);
+        String header = getErrorPage(error, ERR_DESTINATION_UNKNOWN);
         String message = ise != null ? ise.getLocalizedMessage() : "unknown error";
         try {
             writeErrorMessage(header, message, out, targetRequest, usingWWWProxy, wwwProxy);
@@ -621,7 +627,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      *  No jump servers or extra message
      *  @since 0.9.14
      */
-    protected void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
+    protected void writeErrorMessage(String errMessage, OutputStream out, String targetRequest,
                                      boolean usingWWWProxy, String wwwProxy) throws IOException {
         writeErrorMessage(errMessage, null, out, targetRequest, usingWWWProxy, wwwProxy, null);
     }
@@ -631,17 +637,17 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      *  @param jumpServers comma- or space-separated list, or null
      *  @since 0.9.14 moved from subclasses
      */
-    protected void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
+    protected void writeErrorMessage(String errMessage, OutputStream out, String targetRequest,
                                      boolean usingWWWProxy, String wwwProxy, String jumpServers) throws IOException {
         writeErrorMessage(errMessage, null, out, targetRequest, usingWWWProxy, wwwProxy, jumpServers);
     }
 
     /**
      *  No jump servers
-     *  @param extraMessage extra message
+     *  @param extraMessage extra message or null, will be HTML-escaped
      *  @since 0.9.14
      */
-    protected void writeErrorMessage(byte[] errMessage, String extraMessage,
+    protected void writeErrorMessage(String errMessage, String extraMessage,
                                      OutputStream out, String targetRequest,
                                      boolean usingWWWProxy, String wwwProxy) throws IOException {
         writeErrorMessage(errMessage, extraMessage, out, targetRequest, usingWWWProxy, wwwProxy, null);
@@ -649,30 +655,34 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
     /**
      *  @param jumpServers comma- or space-separated list, or null
-     *  @param extraMessage extra message
+     *  @param extraMessage extra message or null, will be HTML-escaped
      *  @since 0.9.14
      */
-    protected void writeErrorMessage(byte[] errMessage, String extraMessage,
-                                     OutputStream out, String targetRequest,
+    protected void writeErrorMessage(String errMessage, String extraMessage,
+                                     OutputStream outs, String targetRequest,
                                      boolean usingWWWProxy, String wwwProxy,
                                      String jumpServers) throws IOException {
-        if (out == null)
+        if (outs == null)
             return;
+        Writer out = new BufferedWriter(new OutputStreamWriter(outs, "UTF-8"));
         out.write(errMessage);
         if (targetRequest != null) {
-            String uri = targetRequest.replace("&", "&amp;");
-            out.write("<a href=\"".getBytes());
-            out.write(uri.getBytes());
-            out.write("\">".getBytes());
-            out.write(uri.getBytes());
-            out.write("</a>".getBytes());
+            String uri = DataHelper.escapeHTML(targetRequest);
+            out.write("<a href=\"");
+            out.write(uri);
+            out.write("\">");
+            if (targetRequest.length() > 80)
+                out.write(DataHelper.escapeHTML(targetRequest.substring(0, 75)) + "&hellip;");
+            else
+                out.write(uri);
+            out.write("</a>");
             if (usingWWWProxy) {
-                out.write(("<br><br><b>").getBytes());
-                out.write(_("HTTP Outproxy").getBytes("UTF-8"));
-                out.write((":</b> " + wwwProxy).getBytes());
+                out.write("<br><br><b>");
+                out.write(_("HTTP Outproxy"));
+                out.write(":</b> " + wwwProxy);
             }
             if (extraMessage != null) {
-                out.write(("<br><br><b>" + extraMessage + "</b>").getBytes());
+                out.write("<br><br><b>" + DataHelper.escapeHTML(extraMessage) + "</b>");
             }
             if (jumpServers != null && jumpServers.length() > 0) {
                 boolean first = true;
@@ -706,21 +716,23 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
                     if (first) {
                         first = false;
-                        out.write("<br><br>".getBytes());
-                        out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
-                        out.write("<br>\n".getBytes());
+                        out.write("<br><br><h3>");
+                        out.write(_("Click a link below for an address helper from a jump service"));
+                        out.write("</h3>\n");
+                    } else {
+                        out.write("<br>");
                     }
-                    out.write("<br><a href=\"".getBytes());
-                    out.write(jurl.getBytes());
-                    out.write(uri.getBytes());
-                    out.write("\">".getBytes());
+                    out.write("<a href=\"");
+                    out.write(jurl);
+                    out.write(uri);
+                    out.write("\">");
                     // Translators: parameter is a host name
-                    out.write(_("{0} jump service", jumphost).getBytes());
-                    out.write("</a>\n".getBytes());
+                    out.write(_("{0} jump service", jumphost));
+                    out.write("</a>\n");
                 }
             }
         }
-        out.write("</div>".getBytes());
+        out.write("</div>");
         writeFooter(out);
     }
 
@@ -731,12 +743,29 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      *  @since 0.9.14 moved from I2PTunnelHTTPClient
      */
     public static void writeFooter(OutputStream out) throws IOException {
+        out.write(getFooter().getBytes("UTF-8"));
+        out.flush();
+    }
+
+    /**
+     *  Flushes.
+     *
+     *  Public only for LocalHTTPServer, not for general use
+     *  @since 0.9.19
+     */
+    public static void writeFooter(Writer out) throws IOException {
+        out.write(getFooter());
+        out.flush();
+    }
+
+    private static String getFooter() {
         // The css is hiding this div for now, but we'll keep it here anyway
         // Tag the strings below for translation if we unhide it.
-        out.write("<div class=\"proxyfooter\"><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());
-        out.write(new Date().toString().getBytes());
-        out.write("</i></div></body></html>\n".getBytes());
-        out.flush();
+        StringBuilder buf = new StringBuilder(128);
+        buf.append("<div class=\"proxyfooter\"><p><i>I2P HTTP Proxy Server<br>Generated on: ")
+           .append(new Date().toString())
+           .append("</i></div></body></html>\n");
+        return buf.toString();
     }
 
     /**
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
index d4d06c4240c190a231a38c9489ac07fd0dc6d119..3c8066c568ad5f5911744637ac50e103cd2ca01b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
@@ -78,7 +78,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
          "\r\n"+
          "<html><head><title>503 Service Unavailable</title></head>\n"+
          "<body><h2>503 Service Unavailable</h2>\n" +
-         "<p>This I2P eepsite is unavailable. It may be down or undergoing maintenance.</p>\n" +
+         "<p>This I2P website is unavailable. It may be down or undergoing maintenance.</p>\n" +
          "</body></html>")
          .getBytes();
 
@@ -220,8 +220,20 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 (headers.containsKey("X-Forwarded-For") ||
                  headers.containsKey("X-Forwarded-Server") ||
                  headers.containsKey("X-Forwarded-Host"))) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Refusing inproxy access: " + peerHash.toBase64());
+                if (_log.shouldLog(Log.WARN)) {
+                    StringBuilder buf = new StringBuilder();
+                    buf.append("Refusing inproxy access: ").append(peerHash.toBase64());
+                    List<String> h = headers.get("X-Forwarded-For");
+                    if (h != null)
+                        buf.append(" from: ").append(h.get(0));
+                    h = headers.get("X-Forwarded-Server");
+                    if (h != null)
+                        buf.append(" via: ").append(h.get(0));
+                    h = headers.get("X-Forwarded-Host");
+                    if (h != null)
+                        buf.append(" for: ").append(h.get(0));
+                    _log.warn(buf.toString());
+                }
                 try {
                     // Send a 403, so the user doesn't get an HTTP Proxy error message
                     // and blame his router or the network.
@@ -315,7 +327,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
 
             long afterHandle = getTunnel().getContext().clock().now();
             long timeToHandle = afterHandle - afterAccept;
-            getTunnel().getContext().statManager().addRateData("i2ptunnel.httpserver.blockingHandleTime", timeToHandle, 0);
+            getTunnel().getContext().statManager().addRateData("i2ptunnel.httpserver.blockingHandleTime", timeToHandle);
             if ( (timeToHandle > 1000) && (_log.shouldLog(Log.WARN)) )
                 _log.warn("Took a while to handle the request for " + remoteHost + ':' + remotePort +
                           " [" + timeToHandle +
@@ -684,7 +696,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
             }
         }
         if (trimmed > 0)
-            ctx.statManager().addRateData("i2ptunnel.httpNullWorkaround", trimmed, 0);
+            ctx.statManager().addRateData("i2ptunnel.httpNullWorkaround", trimmed);
         
         int i = 0;
         while (true) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
index f82c154173dba1253dec017a064a34003f5c2c42..2d652861ce30ce255a2d428f388566afd2ff0b69 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
@@ -67,7 +67,7 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
     
     private final static byte[] ERR_UNAVAILABLE =
         (":ircserver.i2p 499 you :" +
-         "This I2P IRC server is unvailable. It may be down or undergoing maintenance. " +
+         "This I2P IRC server is unavailable. It may be down or undergoing maintenance. " +
          "Please try again later." +
          "\r\n")
          .getBytes();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index ad5256fa65b4893ce578d05319d07bb6627bef01..179b54ae7117cda7aea3161b383137871eed3e51 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -42,8 +42,17 @@ public class TunnelController implements Logging {
     private final I2PTunnel _tunnel;
     private final List<String> _messages;
     private List<I2PSession> _sessions;
-    private boolean _running;
-    private boolean _starting;
+    private volatile TunnelState _state;
+
+    private enum TunnelState {
+        START_ON_LOAD,
+        STARTING,
+        RUNNING,
+        STOPPING,
+        STOPPED,
+        DESTROYING,
+        DESTROYED,
+    }
     
     public static final String KEY_BACKUP_DIR = "i2ptunnel-keyBackup";
 
@@ -104,6 +113,8 @@ public class TunnelController implements Logging {
      * the prefix should be used (and, in turn, that prefix should be stripped off
      * before being interpreted by this controller)
      * 
+     * Defaults in config properties are not recommended, they may or may not be honored.
+     * 
      * @param config original key=value mapping non-null
      * @param prefix beginning of key values that are relevant to this tunnel
      */
@@ -112,6 +123,7 @@ public class TunnelController implements Logging {
     }
 
     /**
+     * Defaults in config properties are not recommended, they may or may not be honored.
      * 
      * @param config original key=value mapping non-null
      * @param prefix beginning of key values that are relevant to this tunnel
@@ -124,11 +136,10 @@ public class TunnelController implements Logging {
         _log = I2PAppContext.getGlobalContext().logManager().getLog(TunnelController.class);
         setConfig(config, prefix);
         _messages = new ArrayList<String>(4);
-        _running = false;
         boolean keyOK = true;
         if (createKey && (getType().endsWith("server") || getPersistentClientKey()))
             keyOK = createPrivateKey();
-        _starting = keyOK && getStartOnLoad();
+        _state = keyOK && getStartOnLoad() ? TunnelState.START_ON_LOAD : TunnelState.STOPPED;
     }
     
     /**
@@ -193,8 +204,10 @@ public class TunnelController implements Logging {
     }
     
     public void startTunnelBackground() {
-        if (_running) return;
-        _starting = true;
+        synchronized (this) {
+            if (_state != TunnelState.STOPPED && _state != TunnelState.START_ON_LOAD)
+                return;
+        }
         new I2PAppThread(new Runnable() { public void run() { startTunnel(); } }).start();
     }
     
@@ -203,7 +216,17 @@ public class TunnelController implements Logging {
      *
      */
     public void startTunnel() {
-        _starting = true;
+        synchronized (this) {
+            if (_state != TunnelState.STOPPED && _state != TunnelState.START_ON_LOAD) {
+                if (_state == TunnelState.RUNNING) {
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info("Already running");
+                    log("Tunnel " + getName() + " is already running");
+                }
+                return;
+            }
+            changeState(TunnelState.STARTING);
+        }
         try {
             doStartTunnel();
         } catch (Exception e) {
@@ -213,21 +236,20 @@ public class TunnelController implements Logging {
             acquire();
             stopTunnel();
         }
-        _starting = false;
     }
 
     /**
      *  @throws IllegalArgumentException via methods in I2PTunnel
      */
     private void doStartTunnel() {
-        if (_running) {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Already running");
-            log("Tunnel " + getName() + " is already running");
-            return;
+        synchronized (this) {
+            if (_state != TunnelState.STARTING)
+                return;
         }
+
         String type = getType(); 
         if ( (type == null) || (type.length() <= 0) ) {
+            changeState(TunnelState.STOPPED);
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Cannot start the tunnel - no type specified");
             return;
@@ -237,6 +259,7 @@ public class TunnelController implements Logging {
         if (type.endsWith("server") || getPersistentClientKey()) {
             boolean ok = createPrivateKey();
             if (!ok) {
+                changeState(TunnelState.STOPPED);
                 log("Failed to start tunnel " + getName() + " as the private key file could not be created");
                 return;
             }
@@ -268,12 +291,13 @@ public class TunnelController implements Logging {
         } else if (TYPE_STREAMR_SERVER.equals(type)) {
             startStreamrServer();
         } else {
+            changeState(TunnelState.STOPPED);
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Cannot start tunnel - unknown type [" + type + "]");
             return;
         }
         acquire();
-        _running = true;
+        changeState(TunnelState.RUNNING);
     }
     
     private void startHttpClient() {
@@ -485,6 +509,7 @@ public class TunnelController implements Logging {
     
     /**
      *  These are the ones stored with a prefix of "option."
+     *  Defaults in config properties are not honored.
      *
      *  @return keys with the "option." prefix stripped, non-null
      *  @since 0.9.1 Much better than getClientOptions()
@@ -554,12 +579,17 @@ public class TunnelController implements Logging {
      *  and it may have timer threads that continue running.
      */
     public void stopTunnel() {
+        synchronized (this) {
+            if (_state != TunnelState.RUNNING)
+                return;
+            changeState(TunnelState.STOPPING);
+        }
         // I2PTunnel removes the session in close(),
         // so save the sessions to pass to release() and TCG
         Collection<I2PSession> sessions = getAllSessions();
         _tunnel.runClose(new String[] { "forced", "all" }, this);
         release(sessions);
-        _running = false;
+        changeState(TunnelState.STOPPED);
     }
 
     /**
@@ -569,12 +599,17 @@ public class TunnelController implements Logging {
      *  @since 0.9.17
      */
     public void destroyTunnel() {
+        synchronized (this) {
+            if (_state != TunnelState.RUNNING)
+                return;
+            changeState(TunnelState.DESTROYING);
+        }
         // I2PTunnel removes the session in close(),
         // so save the sessions to pass to release() and TCG
         Collection<I2PSession> sessions = getAllSessions();
         _tunnel.runClose(new String[] { "destroy", "all" }, this);
         release(sessions);
-        _running = false;
+        changeState(TunnelState.DESTROYED);
     }
     
     public void restartTunnel() {
@@ -626,26 +661,29 @@ public class TunnelController implements Logging {
         // tell i2ptunnel, who will tell the TunnelTask, who will tell the SocketManager
         setSessionOptions();
 
-        if (_running) {
-            Collection<I2PSession> sessions = getAllSessions();
-            if (sessions.isEmpty()) {
-                 if (_log.shouldLog(Log.DEBUG))
-                     _log.debug("Running but no sessions to update");
-            }
-            for (I2PSession s : sessions) {
-                // tell the router via the session
-                if (!s.isClosed()) {
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("Session is open, updating: " + s);
-                    s.updateOptions(_tunnel.getClientOptions());
-                } else {
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("Session is closed, not updating: " + s);
+        synchronized (this) {
+            if (_state != TunnelState.RUNNING) {
+                if (_log.shouldLog(Log.DEBUG)) {
+                    _log.debug("Not running, not updating sessions");
                 }
+                return;
             }
-        } else {
-            if (_log.shouldLog(Log.DEBUG)) {
-                _log.debug("Not running, not updating sessions");
+        }
+        // Running, so check sessions
+        Collection<I2PSession> sessions = getAllSessions();
+        if (sessions.isEmpty()) {
+             if (_log.shouldLog(Log.DEBUG))
+                 _log.debug("Running but no sessions to update");
+        }
+        for (I2PSession s : sessions) {
+            // tell the router via the session
+            if (!s.isClosed()) {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Session is open, updating: " + s);
+                s.updateOptions(_tunnel.getClientOptions());
+            } else {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Session is closed, not updating: " + s);
             }
         }
     }
@@ -794,19 +832,26 @@ public class TunnelController implements Logging {
         return null;
     }
     
-    public boolean getIsRunning() { return _running; }
-    public boolean getIsStarting() { return _starting; }
+    public boolean getIsRunning() { return _state == TunnelState.RUNNING; }
+    public boolean getIsStarting() { return _state == TunnelState.START_ON_LOAD || _state == TunnelState.STARTING; }
 
     /** if running but no open sessions, we are in standby */
     public boolean getIsStandby() {
-        if (!_running)
-            return false;
+        synchronized (this) {
+            if (_state != TunnelState.RUNNING)
+                return false;
+        }
+
         for (I2PSession sess : _tunnel.getSessions()) {
             if (!sess.isClosed())
                 return false;
         }
         return true;
     }
+
+    private synchronized void changeState(TunnelState state) {
+        _state = state;
+    }
     
     /**
      *  A text description of the tunnel.
@@ -927,7 +972,7 @@ public class TunnelController implements Logging {
      *
      */
     public void log(String s) {
-        synchronized (this) {
+        synchronized (_messages) {
             _messages.add(s);
             while (_messages.size() > 10)
                 _messages.remove(0);
@@ -942,8 +987,8 @@ public class TunnelController implements Logging {
      * @return list of messages pulled off (each is a String, earliest first)
      */
     public List<String> clearMessages() { 
-        List<String> rv = null;
-        synchronized (this) {
+        List<String> rv;
+        synchronized (_messages) {
             rv = new ArrayList<String>(_messages);
             _messages.clear();
         }
@@ -955,6 +1000,6 @@ public class TunnelController implements Logging {
      */
     @Override
     public String toString() { 
-        return "TC " + getType() + ' ' + getName() + " for " + _tunnel;
+        return "TC " + getType() + ' ' + getName() + " for " + _tunnel + ' ' + _state;
     }
 }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
index 4c28e1b035e66eada4917755a647e6960aa92e06..5d6dbcef3ec88f5c7699acd780df88ae4cb237dc 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
@@ -11,11 +11,12 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.i2p.I2PAppContext;
 import net.i2p.app.*;
@@ -43,6 +44,7 @@ public class TunnelControllerGroup implements ClientApp {
     static final String DEFAULT_CONFIG_FILE = "i2ptunnel.config";
     
     private final List<TunnelController> _controllers;
+    private final ReadWriteLock _controllersLock;
     private final String _configFile;
     
     private static final String REGISTERED_NAME = "i2ptunnel";
@@ -105,6 +107,7 @@ public class TunnelControllerGroup implements ClientApp {
         _mgr = mgr;
         _log = _context.logManager().getLog(TunnelControllerGroup.class);
         _controllers = new ArrayList<TunnelController>();
+        _controllersLock = new ReentrantReadWriteLock(true);
         if (args == null || args.length <= 0)
             _configFile = DEFAULT_CONFIG_FILE;
         else if (args.length == 1)
@@ -243,14 +246,19 @@ public class TunnelControllerGroup implements ClientApp {
     public synchronized void loadControllers(String configFile) {
         changeState(STARTING);
         Properties cfg = loadConfig(configFile);
-        int i = 0; 
-        while (true) {
-            String type = cfg.getProperty("tunnel." + i + ".type");
-            if (type == null) 
-                break;
-            TunnelController controller = new TunnelController(cfg, "tunnel." + i + ".");
-            _controllers.add(controller);
-            i++;
+        int i = 0;
+        _controllersLock.writeLock().lock();
+        try {
+            while (true) {
+                String type = cfg.getProperty("tunnel." + i + ".type");
+                if (type == null) 
+                    break;
+                TunnelController controller = new TunnelController(cfg, "tunnel." + i + ".");
+                _controllers.add(controller);
+                i++;
+            }
+        } finally {
+            _controllersLock.writeLock().unlock();
         }
         I2PAppThread startupThread = new I2PAppThread(new StartControllers(), "Startup tunnels");
         startupThread.start();
@@ -263,10 +271,15 @@ public class TunnelControllerGroup implements ClientApp {
     private class StartControllers implements Runnable {
         public void run() {
             synchronized(TunnelControllerGroup.this) {
-                for (int i = 0; i < _controllers.size(); i++) {
-                    TunnelController controller = _controllers.get(i);
-                    if (controller.getStartOnLoad())
-                        controller.startTunnel();
+                _controllersLock.readLock().lock();
+                try {
+                    for (int i = 0; i < _controllers.size(); i++) {
+                        TunnelController controller = _controllers.get(i);
+                        if (controller.getStartOnLoad())
+                            controller.startTunnel();
+                    }
+                } finally {
+                    _controllersLock.readLock().unlock();
                 }
             }
         }
@@ -289,19 +302,31 @@ public class TunnelControllerGroup implements ClientApp {
      *
      */
     public synchronized void unloadControllers() {
-        destroyAllControllers();
-        _controllers.clear();
+        _controllersLock.writeLock().lock();
+        try {
+            destroyAllControllers();
+            _controllers.clear();
+        } finally {
+            _controllersLock.writeLock().unlock();
+        }
         if (_log.shouldLog(Log.INFO))
             _log.info("All controllers stopped and unloaded");
     }
-    
+
     /**
      * Add the given tunnel to the set of known controllers (but dont add it to
      * a config file or start it or anything)
      *
      */
-    public synchronized void addController(TunnelController controller) { _controllers.add(controller); }
-    
+    public synchronized void addController(TunnelController controller) {
+        _controllersLock.writeLock().lock();
+        try {
+            _controllers.add(controller);
+        } finally {
+            _controllersLock.writeLock().unlock();
+        }
+    }
+
     /**
      * Stop and remove the given tunnel
      *
@@ -311,7 +336,12 @@ public class TunnelControllerGroup implements ClientApp {
         if (controller == null) return new ArrayList<String>();
         controller.stopTunnel();
         List<String> msgs = controller.clearMessages();
-        _controllers.remove(controller);
+        _controllersLock.writeLock().lock();
+        try {
+            _controllers.remove(controller);
+        } finally {
+            _controllersLock.writeLock().unlock();
+        }
         msgs.add("Tunnel " + controller.getName() + " removed");
         return msgs;
     }
@@ -323,13 +353,18 @@ public class TunnelControllerGroup implements ClientApp {
      */
     public synchronized List<String> stopAllControllers() {
         List<String> msgs = new ArrayList<String>();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = _controllers.get(i);
-            controller.stopTunnel();
-            msgs.addAll(controller.clearMessages());
+        _controllersLock.readLock().lock();
+        try {
+            for (int i = 0; i < _controllers.size(); i++) {
+                TunnelController controller = _controllers.get(i);
+                controller.stopTunnel();
+                msgs.addAll(controller.clearMessages());
+            }
+            if (_log.shouldLog(Log.INFO))
+                _log.info(_controllers.size() + " controllers stopped");
+        } finally {
+            _controllersLock.readLock().unlock();
         }
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers stopped");
         return msgs;
     }
     
@@ -355,14 +390,19 @@ public class TunnelControllerGroup implements ClientApp {
      */
     public synchronized List<String> startAllControllers() {
         List<String> msgs = new ArrayList<String>();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = _controllers.get(i);
-            controller.startTunnelBackground();
-            msgs.addAll(controller.clearMessages());
-        }
+        _controllersLock.readLock().lock();
+        try {
+            for (int i = 0; i < _controllers.size(); i++) {
+                TunnelController controller = _controllers.get(i);
+                controller.startTunnelBackground();
+                msgs.addAll(controller.clearMessages());
+            }
 
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers started");
+            if (_log.shouldLog(Log.INFO))
+                _log.info(_controllers.size() + " controllers started");
+        } finally {
+            _controllersLock.readLock().unlock();
+        }
         return msgs;
     }
     
@@ -373,13 +413,18 @@ public class TunnelControllerGroup implements ClientApp {
      */
     public synchronized List<String> restartAllControllers() {
         List<String> msgs = new ArrayList<String>();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = _controllers.get(i);
-            controller.restartTunnel();
-            msgs.addAll(controller.clearMessages());
+        _controllersLock.readLock().lock();
+        try {
+            for (int i = 0; i < _controllers.size(); i++) {
+                TunnelController controller = _controllers.get(i);
+                controller.restartTunnel();
+                msgs.addAll(controller.clearMessages());
+            }
+            if (_log.shouldLog(Log.INFO))
+                _log.info(_controllers.size() + " controllers restarted");
+        } finally {
+            _controllersLock.readLock().unlock();
         }
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers restarted");
         return msgs;
     }
     
@@ -388,11 +433,16 @@ public class TunnelControllerGroup implements ClientApp {
      *
      * @return list of messages the tunnels have generated
      */
-    public synchronized List<String> clearAllMessages() {
+    public List<String> clearAllMessages() {
         List<String> msgs = new ArrayList<String>();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = _controllers.get(i);
-            msgs.addAll(controller.clearMessages());
+        _controllersLock.readLock().lock();
+        try {
+            for (int i = 0; i < _controllers.size(); i++) {
+                TunnelController controller = _controllers.get(i);
+                msgs.addAll(controller.clearMessages());
+            }
+        } finally {
+            _controllersLock.readLock().unlock();
         }
         return msgs;
     }
@@ -419,10 +469,15 @@ public class TunnelControllerGroup implements ClientApp {
             parent.mkdirs();
         
         Properties map = new OrderedProperties();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = _controllers.get(i);
-            Properties cur = controller.getConfig("tunnel." + i + ".");
-            map.putAll(cur);
+        _controllersLock.readLock().lock();
+        try {
+            for (int i = 0; i < _controllers.size(); i++) {
+                TunnelController controller = _controllers.get(i);
+                Properties cur = controller.getConfig("tunnel." + i + ".");
+                map.putAll(cur);
+            }
+        } finally {
+            _controllersLock.readLock().unlock();
         }
         
         DataHelper.storeProps(map, cfgFile);
@@ -460,8 +515,13 @@ public class TunnelControllerGroup implements ClientApp {
      *
      * @return list of TunnelController objects
      */
-    public synchronized List<TunnelController> getControllers() {
-        return new ArrayList<TunnelController>(_controllers);
+    public List<TunnelController> getControllers() {
+        _controllersLock.readLock().lock();
+        try {
+            return new ArrayList<TunnelController>(_controllers);
+        } finally {
+            _controllersLock.readLock().unlock();
+        }
     }
     
     
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..3e40205e4aea22d5823138e822ede75120e5c37e
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Filters for the IRC client tunnel, and DCC handlers.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
index 1368580c777a6b7137f8e1a1f50bebd0c36a8aab..c40d2e0e3cfd31bd9b3c4fc703a480f032fadc44 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -33,19 +33,17 @@ import net.i2p.util.Translate;
  */
 public abstract class LocalHTTPServer {
 
-    private final static byte[] ERR_404 =
-        ("HTTP/1.1 404 Not Found\r\n"+
+    private final static String ERR_404 =
+         "HTTP/1.1 404 Not Found\r\n"+
          "Content-Type: text/plain\r\n"+
          "\r\n"+
-         "HTTP Proxy local file not found")
-        .getBytes();
+         "HTTP Proxy local file not found";
 
-    private final static byte[] ERR_ADD =
-        ("HTTP/1.1 409 Bad\r\n"+
+    private final static String ERR_ADD =
+         "HTTP/1.1 409 Bad\r\n"+
          "Content-Type: text/plain\r\n"+
          "\r\n"+
-         "Add to addressbook failed - bad parameters")
-        .getBytes();
+         "Add to addressbook failed - bad parameters";
 
     /**
      *  Very simple web server.
@@ -69,14 +67,13 @@ public abstract class LocalHTTPServer {
      *  @param targetRequest decoded path only, non-null
      *  @param query raw (encoded), may be null
      */
-    public static void serveLocalFile(OutputStream out, String method, String targetRequest, String query, String proxyNonce) {
+    public static void serveLocalFile(OutputStream out, String method, String targetRequest,
+                                      String query, String proxyNonce) throws IOException {
         //System.err.println("targetRequest: \"" + targetRequest + "\"");
         // a home page message for the curious...
         if (targetRequest.equals("/")) {
-            try {
-                out.write(("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nCache-Control: max-age=86400\r\n\r\nI2P HTTP proxy OK").getBytes());
-                out.flush();
-            } catch (IOException ioe) {}
+            out.write(("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nCache-Control: max-age=86400\r\n\r\nI2P HTTP proxy OK").getBytes("UTF-8"));
+            out.flush();
             return;
         }
         if ((method.equals("GET") || method.equals("HEAD")) &&
@@ -104,12 +101,10 @@ public abstract class LocalHTTPServer {
                 else if (filename.endsWith(".jpg"))
                     type = "image/jpeg";
                 else type = "text/html";
-                try {
-                    out.write("HTTP/1.1 200 OK\r\nContent-Type: ".getBytes());
-                    out.write(type.getBytes());
-                    out.write("\r\nCache-Control: max-age=86400\r\n\r\n".getBytes());
-                    FileUtil.readFile(filename, themesDir.getAbsolutePath(), out);
-                } catch (IOException ioe) {}
+                out.write("HTTP/1.1 200 OK\r\nContent-Type: ".getBytes("UTF-8"));
+                out.write(type.getBytes("UTF-8"));
+                out.write("\r\nCache-Control: max-age=86400\r\n\r\n".getBytes("UTF-8"));
+                FileUtil.readFile(filename, themesDir.getAbsolutePath(), out);
                 return;
             }
         }
@@ -153,31 +148,24 @@ public abstract class LocalHTTPServer {
             //System.err.println("book         : \"" + book          + "\"");
             //System.err.println("nonce        : \"" + nonce         + "\"");
             if (proxyNonce.equals(nonce) && url != null && host != null && dest != null) {
-                try {
-                    NamingService ns = I2PAppContext.getGlobalContext().namingService();
-                    Properties nsOptions = new Properties();
-                    nsOptions.setProperty("list", book);
-                    if (referer != null && referer.startsWith("http")) {
-                        String from = "<a href=\"" + referer + "\">" + referer + "</a>";
-                        nsOptions.setProperty("s", _("Added via address helper from {0}", from));
-                    } else {
-                        nsOptions.setProperty("s", _("Added via address helper"));
-                    }
-                    boolean success = ns.put(host, dest, nsOptions);
-                    writeRedirectPage(out, success, host, book, url);
-                    return;
-                } catch (IOException ioe) {}
+                NamingService ns = I2PAppContext.getGlobalContext().namingService();
+                Properties nsOptions = new Properties();
+                nsOptions.setProperty("list", book);
+                if (referer != null && referer.startsWith("http")) {
+                    String from = "<a href=\"" + referer + "\">" + referer + "</a>";
+                    nsOptions.setProperty("s", _("Added via address helper from {0}", from));
+                } else {
+                    nsOptions.setProperty("s", _("Added via address helper"));
+                }
+                boolean success = ns.put(host, dest, nsOptions);
+                writeRedirectPage(out, success, host, book, url);
+                return;
             }
-            try {
-                out.write(ERR_ADD);
-                out.flush();
-            } catch (IOException ioe) {}
-            return;
+            out.write(ERR_ADD.getBytes("UTF-8"));
+        } else {
+            out.write(ERR_404.getBytes("UTF-8"));
         }
-        try {
-            out.write(ERR_404);
-            out.flush();
-        } catch (IOException ioe) {}
+        out.flush();
     }
 
     /** @since 0.8.7 */
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc8a69bae5f186b529ca857485689c1e12f45d80
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+A very simple HTTP server, used only for css and images on HTTP client proxy error pages.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..de517ffb4974fa6d39590a68730cf3dd7c0a2648
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/package.html
@@ -0,0 +1,14 @@
+<html>
+<body>
+<p>
+Implementation of preconfigured tunnels, both for clients and servers,
+and a UI for adding more and editing the configuration.
+Includes special-purpose tunnels for IRC, SOCKS, HTTP, and more.
+</p><p>
+The entry point is TunnelControllerGroup, which is started from clients.config.
+Individual tunnel configuration is in i2ptunnel.config.
+The primary API is TunnelControllerGroup and TunnelController.
+Other classes may not be maintained as a stable API.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..a16de8b2513954d6d3e1b27f85135cf1a8743542
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+SOCKS 4, 4a, and 5 client tunnels.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..3f3f8173e47e227052a11bebd68d1ba60584a2d6
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+Special-purpose client and server tunnels for streaming UDP clients and servers,
+generally for audio and video streaming.
+Extends the base classes in net.i2p.i2ptunnel.udpTunnel.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..0eb89724e6bf98edd7d4f4d1f066e0040ae6c6f5
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+A small API used by UDP tunnels.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..6405e98d41ae7f87ae364681e7a26eef99e5bf21
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -0,0 +1,720 @@
+package net.i2p.i2ptunnel.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PClient;
+import net.i2p.crypto.SigType;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.data.PrivateKeyFile;
+import net.i2p.i2ptunnel.I2PTunnelClientBase;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
+import net.i2p.i2ptunnel.I2PTunnelHTTPServer;
+import net.i2p.i2ptunnel.I2PTunnelIRCClient;
+import net.i2p.i2ptunnel.I2PTunnelServer;
+import net.i2p.i2ptunnel.SSLClientUtil;
+import net.i2p.i2ptunnel.TunnelController;
+import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.i2ptunnel.web.Messages;
+import net.i2p.util.FileUtil;
+import net.i2p.util.Log;
+import net.i2p.util.SecureFile;
+
+/**
+ * General helper functions used by all UIs.
+ *
+ * @since 0.9.19
+ */
+public class GeneralHelper {
+    public static final int RUNNING = 1;
+    public static final int STARTING = 2;
+    public static final int NOT_RUNNING = 3;
+    public static final int STANDBY = 4;
+
+    protected static final String PROP_ENABLE_ACCESS_LIST = "i2cp.enableAccessList";
+    protected static final String PROP_ENABLE_BLACKLIST = "i2cp.enableBlackList";
+
+    private static final String OPT = TunnelController.PFX_OPTION;
+
+    private I2PAppContext _context;
+    protected TunnelControllerGroup _group;
+
+    public GeneralHelper(TunnelControllerGroup tcg) {
+        this(I2PAppContext.getGlobalContext(), tcg);
+    }
+
+    public GeneralHelper(I2PAppContext context, TunnelControllerGroup tcg) {
+        _context = context;
+        _group = tcg;
+    }
+
+    public TunnelController getController(int tunnel) {
+        return getController(_group, tunnel);
+    }
+    public static TunnelController getController(TunnelControllerGroup tcg, int tunnel) {
+        if (tunnel < 0) return null;
+        if (tcg == null) return null;
+        List<TunnelController> controllers = tcg.getControllers();
+        if (controllers.size() > tunnel)
+            return controllers.get(tunnel); 
+        else
+            return null;
+    }
+
+    public List<String> saveTunnel(int tunnel, TunnelConfig config) {
+        return saveTunnel(_context, _group, tunnel, config);
+    }
+    public static List<String> saveTunnel(
+            I2PAppContext context, TunnelControllerGroup tcg, int tunnel, TunnelConfig config) {
+        List<String> msgs = updateTunnelConfig(tcg, tunnel, config);
+        msgs.addAll(saveConfig(context, tcg));
+        return msgs;
+    }
+
+    protected static List<String> updateTunnelConfig(TunnelControllerGroup tcg, int tunnel, TunnelConfig config) {
+        // Get current tunnel controller
+        TunnelController cur = getController(tcg, tunnel);
+
+        Properties props = config.getConfig();
+
+        List<String> msgs = new ArrayList<String>();
+        String type = props.getProperty(TunnelController.PROP_TYPE);
+        if (TunnelController.TYPE_STD_CLIENT.equals(type) || TunnelController.TYPE_IRC_CLIENT.equals(type)) {
+            //
+            // If we switch to SSL, create the keystore here, so we can store the new properties.
+            // Down in I2PTunnelClientBase it's very hard to save the config.
+            //
+            if (Boolean.parseBoolean(props.getProperty(OPT + I2PTunnelClientBase.PROP_USE_SSL))) {
+                try {
+                    boolean created = SSLClientUtil.verifyKeyStore(props, OPT);
+                    if (created) {
+                        // config now contains new keystore props
+                        msgs.add("Created new self-signed certificate for tunnel " + getTunnelName(tcg, tunnel));
+                    }        
+                } catch (IOException ioe) {       
+                    msgs.add("Failed to create new self-signed certificate for tunnel " +
+                            getTunnelName(tcg, tunnel) + ", check logs: " + ioe);
+                }        
+            }        
+        }        
+        if (cur == null) {
+            // creating new
+            cur = new TunnelController(props, "", true);
+            tcg.addController(cur);
+            if (cur.getStartOnLoad())
+                cur.startTunnelBackground();
+        } else {
+            cur.setConfig(props, "");
+        }
+        // Only modify other shared tunnels
+        // if the current tunnel is shared, and of supported type
+        if (Boolean.parseBoolean(cur.getSharedClient()) && TunnelController.isClient(cur.getType())) {
+            // all clients use the same I2CP session, and as such, use the same I2CP options
+            List<TunnelController> controllers = tcg.getControllers();
+
+            for (int i = 0; i < controllers.size(); i++) {
+                TunnelController c = controllers.get(i);
+
+                // Current tunnel modified by user, skip
+                if (c == cur) continue;
+
+                // Only modify this non-current tunnel
+                // if it belongs to a shared destination, and is of supported type
+                if (Boolean.parseBoolean(c.getSharedClient()) && TunnelController.isClient(c.getType())) {
+                    Properties cOpt = c.getConfig("");
+                    config.updateTunnelQuantities(cOpt);
+                    cOpt.setProperty("option.inbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
+                    cOpt.setProperty("option.outbound.nickname", TunnelConfig.SHARED_CLIENT_NICKNAME);
+
+                    c.setConfig(cOpt, "");
+                }
+            }
+        }
+
+        return msgs;
+    }
+
+    protected static List<String> saveConfig(I2PAppContext context, TunnelControllerGroup tcg) { 
+        List<String> rv = tcg.clearAllMessages();
+        try {
+            tcg.saveConfig();
+            rv.add(0, _("Configuration changes saved", context));
+        } catch (IOException ioe) {
+            Log log = context.logManager().getLog(GeneralHelper.class);
+            log.error("Failed to save config file", ioe);
+            rv.add(0, _("Failed to save configuration", context) + ": " + ioe.toString());
+        }
+        return rv;
+    }
+
+    public List<String> deleteTunnel(int tunnel, String privKeyFile) {
+        return deleteTunnel(_context, _group, tunnel, privKeyFile);
+    }
+    /**
+     * Stop the tunnel, delete from config,
+     * rename the private key file if in the default directory
+     *
+     * @param privKeyFile The priv key file name from the tunnel edit form. Can
+     *                    be null if not known.
+     */
+    public static List<String> deleteTunnel(
+            I2PAppContext context, TunnelControllerGroup tcg, int tunnel, String privKeyFile) {
+        List<String> msgs;
+        TunnelController cur = getController(tcg, tunnel);
+        if (cur == null) {
+            msgs = new ArrayList<String>();
+            msgs.add("Invalid tunnel number");
+            return msgs;
+        }
+
+        msgs = tcg.removeController(cur);
+        msgs.addAll(saveConfig(context, tcg));
+
+        // Rename private key file if it was a default name in
+        // the default directory, so it doesn't get reused when a new
+        // tunnel is created.
+        // Use configured file name if available, not the one from the form.
+        String pk = cur.getPrivKeyFile();
+        if (pk == null)
+            pk = privKeyFile;
+        if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat") &&
+            ((!TunnelController.isClient(cur.getType())) || cur.getPersistentClientKey())) {
+            File pkf = new File(context.getConfigDir(), pk);
+            if (pkf.exists()) {
+                String name = cur.getName();
+                if (name == null) {
+                    name = cur.getDescription();
+                    if (name == null) {
+                        name = cur.getType();
+                        if (name == null)
+                            name = Long.toString(context.clock().now());
+                    }
+                }
+                name = name.replace(' ', '_').replace(':', '_').replace("..", "_").replace('/', '_').replace('\\', '_');
+                name = "i2ptunnel-deleted-" + name + '-' + context.clock().now() + "-privkeys.dat";
+                File backupDir = new SecureFile(context.getConfigDir(), TunnelController.KEY_BACKUP_DIR);
+                File to;
+                if (backupDir.isDirectory() || backupDir.mkdir())
+                    to = new File(backupDir, name);
+                else
+                    to = new File(context.getConfigDir(), name);
+                boolean success = FileUtil.rename(pkf, to);
+                if (success)
+                    msgs.add("Private key file " + pkf.getAbsolutePath() +
+                             " renamed to " + to.getAbsolutePath());
+            }
+        }
+        return msgs;
+    }
+
+    //
+    // Accessors
+    //
+
+    public String getTunnelType(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return (tun != null && tun.getType() != null) ? tun.getType() : "";
+    }
+
+    public String getTunnelName(int tunnel) {
+        return getTunnelName(_group, tunnel);
+    }
+    public static String getTunnelName(TunnelControllerGroup tcg, int tunnel) {
+        TunnelController tun = getController(tcg, tunnel);
+        return tun != null ? tun.getName() : null;
+    }
+
+    public String getTunnelDescription(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return (tun != null && tun.getDescription() != null) ? tun.getDescription() : "";
+    }
+
+    public String getTargetHost(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return (tun != null && tun.getTargetHost() != null) ? tun.getTargetHost() : "127.0.0.1";
+    }
+
+    /**
+     * @param tunnel
+     * @return -1 if unset or invalid
+     */
+    public int getTargetPort(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null && tun.getTargetPort() != null) {
+            try {
+                return Integer.parseInt(tun.getTargetPort());
+            } catch (NumberFormatException e) {
+                return -1;
+            }
+        } else
+            return -1;
+    }
+
+    public String getSpoofedHost(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return (tun != null && tun.getSpoofedHost() != null) ? tun.getSpoofedHost() : "";
+    }
+
+    public String getPrivateKeyFile(int tunnel) {
+        return getPrivateKeyFile(_group, tunnel);
+    }
+    public static String getPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
+        TunnelController tun = getController(tcg, tunnel);
+        if (tun != null && tun.getPrivKeyFile() != null)
+            return tun.getPrivKeyFile();
+        if (tunnel < 0)
+            tunnel = tcg == null ? 999 : tcg.getControllers().size();
+        return "i2ptunnel" + tunnel + "-privKeys.dat";
+    }
+
+    public String getClientInterface(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            if ("streamrclient".equals(tun.getType()))
+                return tun.getTargetHost();
+            else
+                return tun.getListenOnInterface();
+        } else
+            return "127.0.0.1";
+    }
+
+    public int getClientPort(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null && tun.getListenPort() != null) {
+            try {
+                return Integer.parseInt(tun.getListenPort());
+            } catch (NumberFormatException e) {
+                return -1;
+            }
+        } else
+            return -1;
+    }
+
+    public int getTunnelStatus(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun == null) return NOT_RUNNING;
+        if (tun.getIsRunning()) {
+            if (tun.isClient() && tun.getIsStandby())
+                return STANDBY;
+            else
+                return RUNNING;
+        } else if (tun.getIsStarting()) return STARTING;
+        else return NOT_RUNNING;
+    }
+
+    public String getClientDestination(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun == null) return "";
+        String rv;
+        if (TunnelController.TYPE_STD_CLIENT.equals(tun.getType()) ||
+            TunnelController.TYPE_IRC_CLIENT.equals(tun.getType()) ||
+            TunnelController.TYPE_STREAMR_CLIENT.equals(tun.getType()))
+            rv = tun.getTargetDestination();
+        else
+            rv = tun.getProxyList();
+        return rv != null ? rv : "";
+    }
+
+    /**
+     *  Works even if tunnel is not running.
+     *  @return Destination or null
+     */
+    public Destination getDestination(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Destination rv = tun.getDestination();
+            if (rv != null)
+                return rv;
+            // if not running, do this the hard way
+            File keyFile = tun.getPrivateKeyFile();
+            if (keyFile != null) {
+                PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
+                try {
+                    rv = pkf.getDestination();
+                    if (rv != null)
+                        return rv;
+                } catch (Exception e) {}
+            }
+        }
+        return null;
+    }
+
+    public boolean shouldStartAutomatically(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return tun != null ? tun.getStartOnLoad() : false;
+    }
+
+    public boolean isSharedClient(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return tun != null ? Boolean.parseBoolean(tun.getSharedClient()) : false;
+    }
+
+    public boolean shouldDelayConnect(int tunnel) {
+        return getProperty(tunnel, "i2p.streaming.connectDelay", 0) > 0;
+    }
+
+    public boolean isInteractive(int tunnel) {
+        return getProperty(tunnel, "i2p.streaming.maxWindowSize", 128) == 16;
+    }
+
+    public int getTunnelDepth(int tunnel, int defaultLength) {
+        return getProperty(tunnel, "inbound.length", defaultLength);
+    }
+
+    public int getTunnelQuantity(int tunnel, int defaultQuantity) {
+        return getProperty(tunnel, "inbound.quantity", defaultQuantity);
+    }
+
+    public int getTunnelBackupQuantity(int tunnel, int defaultBackupQuantity) {
+        return getProperty(tunnel, "inbound.backupQuantity", defaultBackupQuantity);
+    }
+
+    public int getTunnelVariance(int tunnel, int defaultVariance) {
+        return getProperty(tunnel, "inbound.lengthVariance", defaultVariance);
+    }
+
+    public boolean getReduceOnIdle(int tunnel, boolean def) {
+        return getBooleanProperty(tunnel, "i2cp.reduceOnIdle", def);
+    }
+
+    public int getReduceCount(int tunnel, int def) {
+        return getProperty(tunnel, "i2cp.reduceQuantity", def);
+    }
+
+    /**
+     * @param tunnel
+     * @param def in minutes
+     * @return time in minutes
+     */
+    public int getReduceTime(int tunnel, int def) {
+        return getProperty(tunnel, "i2cp.reduceIdleTime", def*60*1000) / (60*1000);
+    }
+
+    public int getCert(int tunnel) {
+        return 0;
+    }
+
+    public int getEffort(int tunnel) {
+        return 23;
+    }
+
+    public String getSigner(int tunnel) {
+        return "";
+    }
+
+    public boolean getEncrypt(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.encryptLeaseSet");
+    }
+
+    /**
+     *  @param newTunnelType used if tunnel < 0
+     */
+    public int getSigType(int tunnel, String newTunnelType) {
+        SigType type;
+        String ttype;
+        boolean isShared;
+        if (tunnel >= 0) {
+            Destination d = getDestination(tunnel);
+            if (d != null) {
+                type = d.getSigType();
+                if (type != null)
+                    return type.getCode();
+            }
+            String stype = getProperty(tunnel, I2PClient.PROP_SIGTYPE, null);
+            type = stype != null ? SigType.parseSigType(stype) : null;
+            ttype = getTunnelType(tunnel);
+            isShared = isSharedClient(tunnel);
+        } else {
+            type = null;
+            ttype = newTunnelType;
+            isShared = false;
+        }
+        if (type == null) {
+            // same default logic as in TunnelController.setConfig()
+            if ((!TunnelController.isClient(ttype) ||
+                ((TunnelController.TYPE_IRC_CLIENT.equals(ttype) ||
+                  TunnelController.TYPE_SOCKS_IRC.equals(ttype) ||
+                  TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
+                  TunnelController.TYPE_STD_CLIENT.equals(ttype)) &&
+                 !isShared)))
+                type = TunnelController.PREFERRED_SIGTYPE;
+            else
+                type = SigType.DSA_SHA1;
+        }
+        return type.getCode();
+    }
+
+    /**
+     *  Random keys
+     */
+    public String getInboundRandomKey(int tunnel) {
+        return getProperty(tunnel, "inbound.randomKey", "");
+    }
+
+    public String getOutboundRandomKey(int tunnel) {
+        return getProperty(tunnel, "outbound.randomKey", "");
+    }
+
+    public String getLeaseSetSigningPrivateKey(int tunnel) {
+        return getProperty(tunnel, "i2cp.leaseSetSigningPrivateKey", "");
+    }
+
+    public String getLeaseSetPrivateKey(int tunnel) {
+        return getProperty(tunnel, "i2cp.leaseSetPrivateKey", "");
+    }
+
+    public boolean getDCC(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelIRCClient.PROP_DCC);
+    }
+
+    public boolean isSSLEnabled(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelServer.PROP_USE_SSL);
+    }
+
+    public String getEncryptKey(int tunnel) {
+        return getProperty(tunnel, "i2cp.leaseSetKey", "");
+    }
+
+    public int getAccessMode(int tunnel) {
+        if (getBooleanProperty(tunnel, PROP_ENABLE_ACCESS_LIST))
+            return 1;
+        if (getBooleanProperty(tunnel, PROP_ENABLE_BLACKLIST))
+            return 2;
+        return 0;
+    }
+    
+    public String getAccessList(int tunnel) {
+        return getProperty(tunnel, "i2cp.accessList", "").replace(",", "\n");
+    }
+    
+    public String getJumpList(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPClient.PROP_JUMP_SERVERS,
+                           I2PTunnelHTTPClient.DEFAULT_JUMP_SERVERS).replace(",", "\n");
+    }
+    
+    public boolean getCloseOnIdle(int tunnel, boolean def) {
+        return getBooleanProperty(tunnel, "i2cp.closeOnIdle", def);
+    }
+
+    public int getCloseTime(int tunnel, int def) {
+        return getProperty(tunnel, "i2cp.closeIdleTime", def*60*1000) / (60*1000);
+    }
+
+    public boolean getNewDest(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.newDestOnResume") &&
+               getBooleanProperty(tunnel, "i2cp.closeOnIdle") &&
+               !getBooleanProperty(tunnel, "persistentClientKey");
+    }
+
+    public boolean getPersistentClientKey(int tunnel) {
+        return getBooleanProperty(tunnel, "persistentClientKey");
+    }
+
+    public boolean getDelayOpen(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.delayOpen");
+    }
+
+    public boolean getAllowUserAgent(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_USER_AGENT);
+    }
+
+    public boolean getAllowReferer(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_REFERER);
+    }
+
+    public boolean getAllowAccept(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_ACCEPT);
+    }
+
+    public boolean getAllowInternalSSL(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_INTERNAL_SSL);
+    }
+
+    public boolean getMultihome(int tunnel) {
+        return getBooleanProperty(tunnel, "shouldBundleReplyInfo");
+    }
+
+    public String getProxyAuth(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_AUTH, "false");
+    }
+    
+    public boolean getOutproxyAuth(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH);
+    }
+    
+    public String getOutproxyUsername(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, "");
+    }
+    
+    public String getOutproxyPassword(int tunnel) {
+        if (getOutproxyUsername(tunnel).length() <= 0)
+            return "";
+        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, "");
+    }
+
+    public String getSslProxies(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, "");
+    }
+
+    /**
+     *  Default true
+     */
+    public boolean getUseOutproxyPlugin(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN, true);
+    }
+
+    /** all of these are @since 0.8.3 */
+    public int getLimitMinute(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_MIN, 0);
+    }
+
+    public int getLimitHour(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_HOUR, 0);
+    }
+
+    public int getLimitDay(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_CONNS_DAY, 0);
+    }
+
+    public int getTotalMinute(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_MIN, 0);
+    }
+
+    public int getTotalHour(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_HOUR, 0);
+    }
+
+    public int getTotalDay(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_TOTAL_CONNS_DAY, 0);
+    }
+
+    public int getMaxStreams(int tunnel) {
+        return getProperty(tunnel, TunnelConfig.PROP_MAX_STREAMS, 0);
+    }
+
+    /**
+     * POST limits
+     * @since 0.9.9
+     */
+    public int getPostMax(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, 0);
+    }
+
+    public int getPostTotalMax(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, 0);
+    }
+
+    public int getPostCheckTime(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_WINDOW, I2PTunnelHTTPServer.DEFAULT_POST_WINDOW) / 60;
+    }
+
+    public int getPostBanTime(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_BAN_TIME, I2PTunnelHTTPServer.DEFAULT_POST_BAN_TIME) / 60;
+    }
+
+    public int getPostTotalBanTime(int tunnel) {
+        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME, I2PTunnelHTTPServer.DEFAULT_POST_TOTAL_BAN_TIME) / 60;
+    }
+
+    public boolean getRejectInproxy(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelHTTPServer.OPT_REJECT_INPROXY);
+    }
+
+    public boolean getUniqueLocal(int tunnel) {
+        return getBooleanProperty(tunnel, I2PTunnelServer.PROP_UNIQUE_LOCAL);
+    }
+
+    public String getCustomOptionsString(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = tun.getClientOptionProps();
+            if (opts == null) return "";
+            boolean isMD5Proxy = TunnelController.TYPE_HTTP_CLIENT.equals(tun.getType()) ||
+                                 TunnelController.TYPE_CONNECT.equals(tun.getType());
+            Map<String, String> sorted = new TreeMap<String, String>();
+            for (Map.Entry<Object, Object> e : opts.entrySet()) {
+                String key = (String)e.getKey();
+                if (TunnelConfig._noShowSet.contains(key))
+                    continue;
+                // leave in for HTTP and Connect so it can get migrated to MD5
+                // hide for SOCKS until migrated to MD5
+                if ((!isMD5Proxy) &&
+                    TunnelConfig._nonProxyNoShowSet.contains(key))
+                    continue;
+                sorted.put(key, (String)e.getValue());
+            }
+            if (sorted.isEmpty())
+                return "";
+            StringBuilder buf = new StringBuilder(64);
+            boolean space = false;
+            for (Map.Entry<String, String> e : sorted.entrySet()) {
+                if (space)
+                    buf.append(' ');
+                else
+                    space = true;
+                buf.append(e.getKey()).append('=').append(e.getValue());
+            }
+            return DataHelper.escapeHTML(buf.toString());
+        } else {
+            return "";
+        }
+    }
+
+    //
+    // Internal helpers
+    //
+
+    private int getProperty(int tunnel, String prop, int def) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = tun.getClientOptionProps();
+            if (opts != null) {
+                String s = opts.getProperty(prop);
+                if (s == null) return def;
+                try {
+                    return Integer.parseInt(s);
+                } catch (NumberFormatException nfe) {}
+            }
+        }
+        return def;
+    }
+
+    private String getProperty(int tunnel, String prop, String def) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = tun.getClientOptionProps();
+            if (opts != null) {
+                String rv = opts.getProperty(prop);
+                if (rv != null)
+                    return DataHelper.escapeHTML(rv);
+            }
+        }
+        return def;
+    }
+
+    /** default is false */
+    private boolean getBooleanProperty(int tunnel, String prop) {
+        return getBooleanProperty(tunnel, prop, false);
+    }
+    private boolean getBooleanProperty(int tunnel, String prop, boolean def) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = tun.getClientOptionProps();
+            if (opts != null)
+                return Boolean.parseBoolean(opts.getProperty(prop));
+        }
+        return def;
+    }
+
+    protected static String _(String key, I2PAppContext context) {
+        return Messages._(key, context);
+    }
+}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..755fc2719828055dd84c063e6d6c18a3a0237773
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@@ -0,0 +1,813 @@
+package net.i2p.i2ptunnel.ui;
+
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PClient;
+import net.i2p.crypto.KeyGenerator;
+import net.i2p.crypto.SigType;
+import net.i2p.data.Base64;
+import net.i2p.data.Destination;
+import net.i2p.data.SimpleDataStructure;
+import net.i2p.i2ptunnel.I2PTunnelClientBase;
+import net.i2p.i2ptunnel.I2PTunnelConnectClient;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
+import net.i2p.i2ptunnel.I2PTunnelHTTPServer;
+import net.i2p.i2ptunnel.I2PTunnelIRCClient;
+import net.i2p.i2ptunnel.I2PTunnelServer;
+import net.i2p.i2ptunnel.TunnelController;
+import net.i2p.util.ConcurrentHashSet;
+import net.i2p.util.PasswordManager;
+
+/**
+ * Helper class to generate a valid TunnelController configuration from provided
+ * settings.
+ *
+ * @since 0.9.19 logic moved from IndexBean
+ */
+public class TunnelConfig {
+    public static final String SHARED_CLIENT_NICKNAME = "shared clients";
+
+    private static final String OPT = TunnelController.PFX_OPTION;
+
+    protected final I2PAppContext _context;
+
+    private String _type;
+    private String _name;
+    private String _description;
+    private String _i2cpHost;
+    private String _i2cpPort;
+    private int _tunnelDepth = -1;
+    private int _tunnelQuantity = -1;
+    private int _tunnelVariance = -1;
+    private int _tunnelBackupQuantity = -1;
+    private boolean _connectDelay;
+    private String _customOptions;
+    private String _proxyList;
+    private int _port = -1;
+    private String _reachableBy;
+    private String _targetDestination;
+    private String _targetHost;
+    private int _targetPort = -1;
+    private String _spoofedHost;
+    private String _privKeyFile;
+    private String _profile;
+    private boolean _startOnLoad;
+    private boolean _sharedClient;
+    private final Set<String> _booleanOptions;
+    private final Map<String, String> _otherOptions;
+    private String _newProxyUser;
+    private String _newProxyPW;
+    private Destination _dest;
+
+    public TunnelConfig() {
+        _context = I2PAppContext.getGlobalContext();
+        _booleanOptions = new ConcurrentHashSet<String>(4);
+        _otherOptions = new ConcurrentHashMap<String, String>(4);
+    }
+
+    /**
+     * What type of tunnel (httpclient, ircclient, client, or server).  This is 
+     * required when adding a new tunnel.
+     *
+     */
+    public void setType(String type) { 
+        _type = (type != null ? type.trim() : null);   
+    }
+    public String getType() {
+        return _type;
+    }
+
+    /** Short name of the tunnel */
+    public void setName(String name) { 
+        _name = (name != null ? name.trim() : null);
+    }
+    /** one line description */
+    public void setDescription(String description) { 
+        // '#' will blow up DataHelper.storeProps()
+        _description = (description != null ? description.replace('#', ' ').trim() : null);
+    }
+    /** I2CP host the router is on, ignored when in router context */
+    public void setClientHost(String host) {
+        _i2cpHost = (host != null ? host.trim() : null);
+    }
+    /** I2CP port the router is on, ignored when in router context */
+    public void setClientPort(String port) {
+        _i2cpPort = (port != null ? port.trim() : null);
+    }
+    /** how many hops to use for inbound tunnels */
+    public void setTunnelDepth(int tunnelDepth) { 
+        _tunnelDepth = tunnelDepth;
+    }
+    /** how many parallel inbound tunnels to use */
+    public void setTunnelQuantity(int tunnelQuantity) { 
+        _tunnelQuantity = tunnelQuantity;
+    }
+    /** how much randomisation to apply to the depth of tunnels */
+    public void setTunnelVariance(int tunnelVariance) { 
+        _tunnelVariance = tunnelVariance;
+    }
+    /** how many tunnels to hold in reserve to guard against failures */
+    public void setTunnelBackupQuantity(int tunnelBackupQuantity) { 
+        _tunnelBackupQuantity = tunnelBackupQuantity;
+    }
+    /** what I2P session overrides should be used */
+    public void setCustomOptions(String customOptions) { 
+        _customOptions = (customOptions != null ? customOptions.trim() : null);
+    }
+    /** what HTTP outproxies should be used (httpclient specific) */
+    public void setProxyList(String proxyList) { 
+        _proxyList = (proxyList != null ? proxyList.trim() : null);
+    }
+    /** what port should this client/httpclient/ircclient listen on */
+    public void setPort(int port) { 
+        _port = port;
+    }
+    /** 
+     * what interface should this client/httpclient/ircclient listen on
+     */
+    public void setReachableBy(String reachableBy) { 
+        _reachableBy = (reachableBy != null ? reachableBy.trim() : null);
+    }
+    /** What peer does this client tunnel point at */
+    public void setTargetDestination(String dest) { 
+        _targetDestination = (dest != null ? dest.trim() : null);
+    }
+    /** What host does this server tunnel point at */
+    public void setTargetHost(String host) { 
+        _targetHost = (host != null ? host.trim() : null);
+    }
+    /** What port does this server tunnel point at */
+    public void setTargetPort(int port) { 
+        _targetPort = port;
+    }
+    /** What host does this http server tunnel spoof */
+    public void setSpoofedHost(String host) { 
+        _spoofedHost = (host != null ? host.trim() : null);
+    }
+    /** What filename is this server tunnel's private keys stored in */
+    public void setPrivKeyFile(String file) { 
+        _privKeyFile = (file != null ? file.trim() : null);
+    }
+    public String getPrivKeyFile() {
+        return _privKeyFile;
+    }
+    /**
+     * If called with any value, we want this tunnel to start whenever it is
+     * loaded (aka right now and whenever the router is started up)
+     */
+    public void setStartOnLoad(boolean val) {
+        _startOnLoad = val;
+    }
+    public void setShared(boolean val) {
+        _sharedClient = val;
+    }
+    public void setConnectDelay(boolean val) {
+        _connectDelay = val;
+    }
+    public void setProfile(String profile) { 
+        _profile = profile; 
+    }
+
+    public void setReduce(boolean val) {
+        if (val)
+            _booleanOptions.add("i2cp.reduceOnIdle");
+        else
+            _booleanOptions.remove("i2cp.reduceOnIdle");
+    }
+    public void setClose(boolean val) {
+        if (val)
+            _booleanOptions.add("i2cp.closeOnIdle");
+        else
+            _booleanOptions.remove("i2cp.closeOnIdle");
+    }
+    public void setEncrypt(boolean val) {
+        if (val)
+            _booleanOptions.add("i2cp.encryptLeaseSet");
+        else
+            _booleanOptions.remove("i2cp.encryptLeaseSet");
+    }
+    public void setDCC(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelIRCClient.PROP_DCC);
+        else
+            _booleanOptions.remove(I2PTunnelIRCClient.PROP_DCC);
+    }
+    public void setUseSSL(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelServer.PROP_USE_SSL);
+        else
+            _booleanOptions.remove(I2PTunnelServer.PROP_USE_SSL);
+    }
+    public void setRejectInproxy(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPServer.OPT_REJECT_INPROXY);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPServer.OPT_REJECT_INPROXY);
+    }
+    public void setUniqueLocal(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelServer.PROP_UNIQUE_LOCAL);
+        else
+            _booleanOptions.remove(I2PTunnelServer.PROP_UNIQUE_LOCAL);
+    }
+
+    protected static final String PROP_ENABLE_ACCESS_LIST = "i2cp.enableAccessList";
+    protected static final String PROP_ENABLE_BLACKLIST = "i2cp.enableBlackList";
+
+    /**
+     * Controls how other tunnels are checked for access.
+     * <p/>
+     * The list used for whitelisting/blacklisting can be set with
+     * {@link #setAccessList(String)}.
+     *
+     * @param mode 0 for no control, 1 for whitelist, 2 for blacklist 
+     */
+    public void setAccessMode(int mode) {
+        switch (mode) {
+        case 1:
+            _booleanOptions.add(PROP_ENABLE_ACCESS_LIST);
+            _booleanOptions.remove(PROP_ENABLE_BLACKLIST);
+            break;
+        case 2:
+            _booleanOptions.remove(PROP_ENABLE_ACCESS_LIST);
+            _booleanOptions.add(PROP_ENABLE_BLACKLIST);
+            break;
+        default:
+            _booleanOptions.remove(PROP_ENABLE_ACCESS_LIST);
+            _booleanOptions.remove(PROP_ENABLE_BLACKLIST);
+        }
+    }
+
+    public void setDelayOpen(boolean val) {
+        if (val)
+            _booleanOptions.add("i2cp.delayOpen");
+        else
+            _booleanOptions.remove("i2cp.delayOpen");
+    }
+
+    /**
+     * Controls how ephemeral the I2P Destination of a client tunnel is.
+     * <p/>
+     * If {@link #setClose(boolean)} is set to false then mode 1 == mode 0.
+     * 
+     * @param mode 0 for new dest on restart, 1 for new dest on resume from idle, 2 for persistent key
+     */
+    public void setNewDest(int mode) {
+        switch (mode) {
+        case 1:
+            _booleanOptions.add("i2cp.newDestOnResume");
+            _booleanOptions.remove("persistentClientKey");
+            break;
+        case 2:
+            _booleanOptions.remove("i2cp.newDestOnResume");
+            _booleanOptions.add("persistentClientKey");
+            break;
+        default:
+            _booleanOptions.remove("i2cp.newDestOnResume");
+            _booleanOptions.remove("persistentClientKey");
+        }
+    }
+
+    public void setReduceTime(int val) {
+        _otherOptions.put("i2cp.reduceIdleTime", Integer.toString(val * 60*1000));
+    }
+    public void setReduceCount(int val) {
+        _otherOptions.put("i2cp.reduceQuantity", Integer.toString(val));
+    }
+    public void setEncryptKey(String val) {
+        if (val != null)
+            _otherOptions.put("i2cp.leaseSetKey", val.trim());
+    }
+
+    public void setAccessList(String val) {
+        if (val != null)
+            _otherOptions.put("i2cp.accessList", val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
+    }
+
+    public void setJumpList(String val) {
+        if (val != null)
+            _otherOptions.put(I2PTunnelHTTPClient.PROP_JUMP_SERVERS, val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
+    }
+
+    public void setCloseTime(int val) {
+        _otherOptions.put("i2cp.closeIdleTime", Integer.toString(val * 60*1000));
+    }
+
+    public void setAllowUserAgent(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_USER_AGENT);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClient.PROP_USER_AGENT);
+    }
+    public void setAllowReferer(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_REFERER);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClient.PROP_REFERER);
+    }
+    public void setAllowAccept(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT);
+        else
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT);
+    }
+    public void setAllowInternalSSL(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_INTERNAL_SSL);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClient.PROP_INTERNAL_SSL);
+    }
+
+    public void setMultihome(boolean val) {
+        if (val)
+            _booleanOptions.add("shouldBundleReplyInfo");
+        else
+            _booleanOptions.remove("shouldBundleReplyInfo");
+    }
+
+    /**
+     * Sets whether authentication should be used for client proxy tunnels.
+     * Supported authentication types: "basic", "digest".
+     *
+     * @param authType the authentication type, or "false" for no authentication
+     */
+    public void setProxyAuth(String authType) {
+        if (authType != null)
+            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_AUTH, authType.trim());
+    }
+    
+    public void setProxyUsername(String s) {
+        if (s != null)
+            _newProxyUser = s.trim();
+    }
+
+    public void setProxyPassword(String s) {
+        if (s != null)
+            _newProxyPW = s.trim();
+    }
+
+    /**
+     * Sets whether authentication is required for any of the configured
+     * outproxies.
+     *
+     * @param val true if authentication is required, false otherwise
+     */
+    public void setOutproxyAuth(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH);
+    }
+
+    public void setOutproxyUsername(String s) {
+        if (s != null)
+            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, s.trim());
+    }
+    
+    public void setOutproxyPassword(String s) {
+        if (s != null)
+            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, s.trim());
+    }
+
+    public void setSslProxies(String s) {
+        if (s != null)
+            _otherOptions.put(I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, s.trim().replace(" ", ","));
+    }
+
+    public void setUseOutproxyPlugin(boolean val) {
+        if (val)
+            _booleanOptions.add(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN);
+    }
+    
+    /**
+     * all of these are @since 0.8.3 (moved from IndexBean)
+     */
+    public static final String PROP_MAX_CONNS_MIN = "i2p.streaming.maxConnsPerMinute";
+    public static final String PROP_MAX_CONNS_HOUR = "i2p.streaming.maxConnsPerHour";
+    public static final String PROP_MAX_CONNS_DAY = "i2p.streaming.maxConnsPerDay";
+    public static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
+    public static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
+    public static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
+    public static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
+
+    public void setLimitMinute(int val) {
+        _otherOptions.put(PROP_MAX_CONNS_MIN, Integer.toString(val));
+    }
+
+    public void setLimitHour(int val) {
+        _otherOptions.put(PROP_MAX_CONNS_HOUR, Integer.toString(val));
+    }
+
+    public void setLimitDay(int val) {
+        _otherOptions.put(PROP_MAX_CONNS_DAY, Integer.toString(val));
+    }
+
+    public void setTotalMinute(int val) {
+        _otherOptions.put(PROP_MAX_TOTAL_CONNS_MIN, Integer.toString(val));
+    }
+
+    public void setTotalHour(int val) {
+        _otherOptions.put(PROP_MAX_TOTAL_CONNS_HOUR, Integer.toString(val));
+    }
+
+    public void setTotalDay(int val) {
+        _otherOptions.put(PROP_MAX_TOTAL_CONNS_DAY, Integer.toString(val));
+    }
+
+    public void setMaxStreams(int val) {
+        _otherOptions.put(PROP_MAX_STREAMS, Integer.toString(val));
+    }
+
+    /**
+     * POST limits
+     */
+    public void setPostMax(int val) {
+        _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_MAX, Integer.toString(val));
+    }
+
+    public void setPostTotalMax(int val) {
+        _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, Integer.toString(val));
+    }
+
+    public void setPostCheckTime(int val) {
+        _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_WINDOW, Integer.toString(val * 60));
+    }
+
+    public void setPostBanTime(int val) {
+        _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_BAN_TIME, Integer.toString(val * 60));
+    }
+
+    public void setPostTotalBanTime(int val) {
+        _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME, Integer.toString(val * 60));
+    }
+
+    public void setSigType(String val) {
+        if (val != null)
+            _otherOptions.put(I2PClient.PROP_SIGTYPE, val.trim());
+    }
+
+    /**
+     * Random keys
+     */
+    public void setInboundRandomKey(String s) {
+        if (s != null)
+            _otherOptions.put("inbound.randomKey", s.trim());
+    }
+
+    public void setOutboundRandomKey(String s) {
+        if (s != null)
+            _otherOptions.put("outbound.randomKey", s.trim());
+    }
+
+    public void setLeaseSetSigningPrivateKey(String s) {
+        if (s != null)
+            _otherOptions.put("i2cp.leaseSetSigningPrivateKey", s.trim());
+    }
+
+    public void setLeaseSetPrivateKey(String s) {
+        if (s != null)
+            _otherOptions.put("i2cp.leaseSetPrivateKey", s.trim());
+    }
+
+    /**
+     * This is easier than requiring TunnelConfig to talk to
+     * TunnelControllerGroup and TunnelController.
+     *
+     * @param dest the current Destination for this tunnel.
+     */
+    public void setDestination(Destination dest) {
+        _dest = dest;
+    }
+
+    /**
+     * Based on all provided data, create a set of configuration parameters 
+     * suitable for use in a TunnelController.  This will replace (not add to)
+     * any existing parameters, so this should return a comprehensive mapping.
+     *
+     */
+    public Properties getConfig() {
+        Properties config = new Properties();
+        updateConfigGeneric(config);
+        
+        if ((TunnelController.isClient(_type) && !TunnelController.TYPE_STREAMR_CLIENT.equals(_type)) ||
+            TunnelController.TYPE_STREAMR_SERVER.equals(_type)) {
+            // streamrserver uses interface
+            if (_reachableBy != null)
+                config.setProperty(TunnelController.PROP_INTFC, _reachableBy);
+            else
+                config.setProperty(TunnelController.PROP_INTFC, "");
+        } else {
+            // streamrclient uses targetHost
+            if (_targetHost != null)
+                config.setProperty(TunnelController.PROP_TARGET_HOST, _targetHost);
+        }
+
+        if (TunnelController.isClient(_type)) {
+            // generic client stuff
+            if (_port >= 0)
+                config.setProperty(TunnelController.PROP_LISTEN_PORT, Integer.toString(_port));
+            config.setProperty(TunnelController.PROP_SHARED, _sharedClient + "");
+            for (String p : _booleanClientOpts)
+                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+            for (String p : _otherClientOpts) {
+                if (_otherOptions.containsKey(p))
+                    config.setProperty(OPT + p, _otherOptions.get(p));
+            }
+        } else {
+            // generic server stuff
+            if (_targetPort >= 0)
+                config.setProperty(TunnelController.PROP_TARGET_PORT, Integer.toString(_targetPort));
+            for (String p : _booleanServerOpts)
+                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+            for (String p : _otherServerOpts) {
+                if (_otherOptions.containsKey(p))
+                    config.setProperty(OPT + p, _otherOptions.get(p));
+            }
+        }
+
+        // generic proxy stuff
+        if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type) || 
+            TunnelController.TYPE_SOCKS.equals(_type) ||TunnelController.TYPE_SOCKS_IRC.equals(_type)) {
+            for (String p : _booleanProxyOpts)
+                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+            if (_proxyList != null)
+                config.setProperty(TunnelController.PROP_PROXIES, _proxyList);
+        }
+
+        // Proxy auth including migration to MD5
+        if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type)) {
+            // Migrate even if auth is disabled
+            // go get the old from custom options that updateConfigGeneric() put in there
+            String puser = OPT + I2PTunnelHTTPClientBase.PROP_USER;
+            String user = config.getProperty(puser);
+            String ppw = OPT + I2PTunnelHTTPClientBase.PROP_PW;
+            String pw = config.getProperty(ppw);
+            if (user != null && pw != null && user.length() > 0 && pw.length() > 0) {
+                String pmd5 = OPT + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
+                              user + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
+                if (config.getProperty(pmd5) == null) {
+                    // not in there, migrate
+                    String realm = _type.equals(TunnelController.TYPE_HTTP_CLIENT) ? I2PTunnelHTTPClient.AUTH_REALM
+                                                              : I2PTunnelConnectClient.AUTH_REALM;
+                    String hex = PasswordManager.md5Hex(realm, user, pw);
+                    if (hex != null) {
+                        config.setProperty(pmd5, hex);
+                        config.remove(puser);
+                        config.remove(ppw);
+                    }
+                }
+            }
+            // New user/password
+            String auth = _otherOptions.get(I2PTunnelHTTPClientBase.PROP_AUTH);
+            if (auth != null && !auth.equals("false")) {
+                if (_newProxyUser != null && _newProxyPW != null &&
+                    _newProxyUser.length() > 0 && _newProxyPW.length() > 0) {
+                    String pmd5 = OPT + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
+                                  _newProxyUser + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
+                    String realm = _type.equals(TunnelController.TYPE_HTTP_CLIENT) ? I2PTunnelHTTPClient.AUTH_REALM
+                                                              : I2PTunnelConnectClient.AUTH_REALM;
+                    String hex = PasswordManager.md5Hex(realm, _newProxyUser, _newProxyPW);
+                    if (hex != null)
+                        config.setProperty(pmd5, hex);
+                }
+            }
+        }
+
+        if (TunnelController.TYPE_IRC_CLIENT.equals(_type) ||
+            TunnelController.TYPE_STD_CLIENT.equals(_type) ||
+            TunnelController.TYPE_STREAMR_CLIENT.equals(_type)) {
+            if (_targetDestination != null)
+                config.setProperty(TunnelController.PROP_DEST, _targetDestination);
+        } else if (TunnelController.TYPE_HTTP_SERVER.equals(_type) ||
+                   TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(_type)) {
+            if (_spoofedHost != null)
+                config.setProperty(TunnelController.PROP_SPOOFED_HOST, _spoofedHost);
+            for (String p : _httpServerOpts)
+                if (_otherOptions.containsKey(p))
+                    config.setProperty(OPT + p, _otherOptions.get(p));
+        }
+        if (TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(_type)) {
+            if (_port >= 0)
+                config.setProperty(TunnelController.PROP_LISTEN_PORT, Integer.toString(_port));
+            if (_reachableBy != null)
+                config.setProperty(TunnelController.PROP_INTFC, _reachableBy);
+            else if (_targetHost != null)
+                config.setProperty(TunnelController.PROP_INTFC, _targetHost);
+            else
+                config.setProperty(TunnelController.PROP_INTFC, "");
+        }
+
+        if (TunnelController.TYPE_IRC_CLIENT.equals(_type)) {
+            boolean dcc = _booleanOptions.contains(I2PTunnelIRCClient.PROP_DCC);
+            config.setProperty(OPT + I2PTunnelIRCClient.PROP_DCC,
+                               "" + dcc);
+            // add some sane server options since they aren't in the GUI (yet)
+            if (dcc) {
+                config.setProperty(OPT + PROP_MAX_CONNS_MIN, "3");
+                config.setProperty(OPT + PROP_MAX_CONNS_HOUR, "10");
+                config.setProperty(OPT + PROP_MAX_TOTAL_CONNS_MIN, "5");
+                config.setProperty(OPT + PROP_MAX_TOTAL_CONNS_HOUR, "25");
+            }
+        }
+
+        if (!TunnelController.isClient(_type) || _booleanOptions.contains("persistentClientKey")) {
+            // As of 0.9.17, add a persistent random key if not present
+            String p = OPT + "inbound.randomKey";
+            if (!config.containsKey(p)) {
+                byte[] rk = new byte[32];
+                _context.random().nextBytes(rk);
+                config.setProperty(p, Base64.encode(rk));
+                p = OPT + "outbound.randomKey";
+                _context.random().nextBytes(rk);
+                config.setProperty(p, Base64.encode(rk));
+            }
+            // As of 0.9.18, add persistent leaseset keys if not present
+            // but only if we know the sigtype
+            p = OPT + "i2cp.leaseSetSigningPrivateKey";
+            if (_dest != null && !config.containsKey(p)) {
+                try {
+                    SigType type = _dest.getSigType();
+                    SimpleDataStructure keys[] = KeyGenerator.getInstance().generateSigningKeys(type);
+                    config.setProperty(p, type.name() + ':' + keys[1].toBase64());
+                    p = OPT + "i2cp.leaseSetPrivateKey";
+                    keys = KeyGenerator.getInstance().generatePKIKeys();
+                    config.setProperty(p, "ELGAMAL_2048:" + keys[1].toBase64());
+                } catch (GeneralSecurityException gse) {
+                    // so much for that
+                }
+            }
+        }
+
+        return config;
+    }
+    
+    private static final String _noShowOpts[] = {
+        "inbound.length", "outbound.length", "inbound.lengthVariance", "outbound.lengthVariance",
+        "inbound.backupQuantity", "outbound.backupQuantity", "inbound.quantity", "outbound.quantity",
+        "inbound.nickname", "outbound.nickname", "i2p.streaming.connectDelay", "i2p.streaming.maxWindowSize",
+        I2PTunnelIRCClient.PROP_DCC
+        };
+    private static final String _booleanClientOpts[] = {
+        "i2cp.reduceOnIdle", "i2cp.closeOnIdle", "i2cp.newDestOnResume", "persistentClientKey", "i2cp.delayOpen",
+        I2PTunnelClientBase.PROP_USE_SSL,
+        };
+    private static final String _booleanProxyOpts[] = {
+        I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH,
+        I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN,
+        I2PTunnelHTTPClient.PROP_USER_AGENT,
+        I2PTunnelHTTPClient.PROP_REFERER,
+        I2PTunnelHTTPClient.PROP_ACCEPT,
+        I2PTunnelHTTPClient.PROP_INTERNAL_SSL
+        };
+    private static final String _booleanServerOpts[] = {
+        "i2cp.reduceOnIdle", "i2cp.encryptLeaseSet", PROP_ENABLE_ACCESS_LIST, PROP_ENABLE_BLACKLIST,
+        I2PTunnelServer.PROP_USE_SSL,
+        I2PTunnelHTTPServer.OPT_REJECT_INPROXY,
+        I2PTunnelServer.PROP_UNIQUE_LOCAL,
+        "shouldBundleReplyInfo"
+        };
+    private static final String _otherClientOpts[] = {
+        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime",
+        "outproxyUsername", "outproxyPassword",
+        I2PTunnelHTTPClient.PROP_JUMP_SERVERS,
+        I2PTunnelHTTPClientBase.PROP_AUTH,
+        I2PClient.PROP_SIGTYPE,
+        I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES,
+        // following are mostly server but could also be persistent client
+        "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey"
+        };
+    private static final String _otherServerOpts[] = {
+        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList",
+         PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY,
+         PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
+         PROP_MAX_STREAMS, I2PClient.PROP_SIGTYPE,
+        "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey"
+        };
+    private static final String _httpServerOpts[] = {
+        I2PTunnelHTTPServer.OPT_POST_WINDOW,
+        I2PTunnelHTTPServer.OPT_POST_BAN_TIME,
+        I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME,
+        I2PTunnelHTTPServer.OPT_POST_MAX,
+        I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX
+        };
+
+    /**
+     *  do NOT add these to noShoOpts, we must leave them in for HTTPClient and ConnectCLient
+     *  so they will get migrated to MD5
+     *  TODO migrate socks to MD5
+     */
+    private static final String _otherProxyOpts[] = {
+        "proxyUsername", "proxyPassword"
+        };
+
+    public static final Set<String> _noShowSet = new HashSet<String>(128);
+    public static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
+    static {
+        _noShowSet.addAll(Arrays.asList(_noShowOpts));
+        _noShowSet.addAll(Arrays.asList(_booleanClientOpts));
+        _noShowSet.addAll(Arrays.asList(_booleanProxyOpts));
+        _noShowSet.addAll(Arrays.asList(_booleanServerOpts));
+        _noShowSet.addAll(Arrays.asList(_otherClientOpts));
+        _noShowSet.addAll(Arrays.asList(_otherServerOpts));
+        _noShowSet.addAll(Arrays.asList(_httpServerOpts));
+        _nonProxyNoShowSet.addAll(Arrays.asList(_otherProxyOpts));
+    }
+
+    private void updateConfigGeneric(Properties config) {
+        config.setProperty(TunnelController.PROP_TYPE, _type);
+        if (_name != null)
+            config.setProperty(TunnelController.PROP_NAME, _name);
+        if (_description != null)
+            config.setProperty(TunnelController.PROP_DESCR, _description);
+        if (!_context.isRouterContext()) {
+            if (_i2cpHost != null)
+                config.setProperty(TunnelController.PROP_I2CP_HOST, _i2cpHost);
+            if ( (_i2cpPort != null) && (_i2cpPort.trim().length() > 0) ) {
+                config.setProperty(TunnelController.PROP_I2CP_PORT, _i2cpPort);
+            } else {
+                config.setProperty(TunnelController.PROP_I2CP_PORT, "7654");
+            }
+        }
+        if (_privKeyFile != null)
+            config.setProperty(TunnelController.PROP_FILE, _privKeyFile);
+        
+        if (_customOptions != null) {
+            StringTokenizer tok = new StringTokenizer(_customOptions);
+            while (tok.hasMoreTokens()) {
+                String pair = tok.nextToken();
+                int eq = pair.indexOf('=');
+                if ( (eq <= 0) || (eq >= pair.length()) )
+                    continue;
+                String key = pair.substring(0, eq);
+                if (_noShowSet.contains(key))
+                    continue;
+                // leave in for HTTP and Connect so it can get migrated to MD5
+                // hide for SOCKS until migrated to MD5
+                if ((!TunnelController.TYPE_HTTP_CLIENT.equals(_type)) &&
+                    (!TunnelController.TYPE_CONNECT.equals(_type)) &&
+                    _nonProxyNoShowSet.contains(key))
+                    continue;
+                String val = pair.substring(eq+1);
+                config.setProperty(OPT + key, val);
+            }
+        }
+
+        config.setProperty(TunnelController.PROP_START, _startOnLoad + "");
+
+        updateTunnelQuantities(config);
+        if (_connectDelay)
+            config.setProperty("option.i2p.streaming.connectDelay", "1000");
+        else
+            config.setProperty("option.i2p.streaming.connectDelay", "0");
+        if (TunnelController.isClient(_type) && _sharedClient) {
+            config.setProperty("option.inbound.nickname", SHARED_CLIENT_NICKNAME);
+            config.setProperty("option.outbound.nickname", SHARED_CLIENT_NICKNAME);
+        } else if (_name != null) {
+            config.setProperty("option.inbound.nickname", _name);
+            config.setProperty("option.outbound.nickname", _name);
+        }
+        if ("interactive".equals(_profile))
+            // This was 1 which doesn't make much sense
+            // The real way to make it interactive is to make the streaming lib
+            // MessageInputStream flush faster but there's no option for that yet,
+            // Setting it to 16 instead of the default but not sure what good that is either.
+            config.setProperty("option.i2p.streaming.maxWindowSize", "16");
+        else
+            config.remove("option.i2p.streaming.maxWindowSize");
+    }
+
+    /**
+     * Update tunnel quantities for the provided config from this TunnelConfig.
+     *
+     * @param config the config to update.
+     */
+    public void updateTunnelQuantities(Properties config) {
+        if (_tunnelQuantity >= 0) {
+            config.setProperty("option.inbound.quantity", Integer.toString(_tunnelQuantity));
+            config.setProperty("option.outbound.quantity", Integer.toString(_tunnelQuantity));
+        }
+        if (_tunnelDepth >= 0) {
+            config.setProperty("option.inbound.length", Integer.toString(_tunnelDepth));
+            config.setProperty("option.outbound.length", Integer.toString(_tunnelDepth));
+        }
+        if (_tunnelVariance >= 0) {
+            config.setProperty("option.inbound.lengthVariance", Integer.toString(_tunnelVariance));
+            config.setProperty("option.outbound.lengthVariance", Integer.toString(_tunnelVariance));
+        }
+        if (_tunnelBackupQuantity >= 0) {
+            config.setProperty("option.inbound.backupQuantity", Integer.toString(_tunnelBackupQuantity));
+            config.setProperty("option.outbound.backupQuantity", Integer.toString(_tunnelBackupQuantity));
+        }
+    }
+}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..93f5dc19c2a5032072012c90a5d3b943601a5bf2
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+Classes for configuring tunnels, used externally by Android.
+Separated out of net.i2p.i2ptunnel.web as a publicly supported API in 0.9.19.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index bc0748e8375d42f7a29a4a807bf173dd47d2da77..ebc4950981bd07735da6707ac06be43010c375af 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -9,12 +9,7 @@ package net.i2p.i2ptunnel.web;
  */
 
 import java.util.List;
-import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
-import java.util.TreeMap;
-
-import net.i2p.client.I2PClient;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
@@ -22,11 +17,6 @@ import net.i2p.data.Destination;
 import net.i2p.data.PrivateKeyFile;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
-import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
-import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
-import net.i2p.i2ptunnel.I2PTunnelHTTPServer;
-import net.i2p.i2ptunnel.I2PTunnelIRCClient;
-import net.i2p.i2ptunnel.I2PTunnelServer;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.util.Addresses;
@@ -61,36 +51,20 @@ public class EditBean extends IndexBean {
     }
     
     public String getTargetHost(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getTargetHost() != null)
-            return DataHelper.escapeHTML(tun.getTargetHost());
-        else
-            return "127.0.0.1";
+        return DataHelper.escapeHTML(_helper.getTargetHost(tunnel));
     }
 
     public String getTargetPort(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getTargetPort() != null)
-            return DataHelper.escapeHTML(tun.getTargetPort());
-        else
-            return "";
+        int port = _helper.getTargetPort(tunnel);
+        return port > 0 ? "" + port : "";
     }
 
     public String getSpoofedHost(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getSpoofedHost() != null)
-            return DataHelper.escapeHTML(tun.getSpoofedHost());
-        else
-            return "";
+        return DataHelper.escapeHTML(_helper.getSpoofedHost(tunnel));
     }
 
     public String getPrivateKeyFile(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getPrivKeyFile() != null)
-            return tun.getPrivKeyFile();
-        if (tunnel < 0)
-            tunnel = _group == null ? 999 : _group.getControllers().size();
-        return "i2ptunnel" + tunnel + "-privKeys.dat";
+        return _helper.getPrivateKeyFile(tunnel);
     }
     
     public String getNameSignature(int tunnel) {
@@ -119,71 +93,63 @@ public class EditBean extends IndexBean {
     }
     
     public boolean startAutomatically(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null)
-            return tun.getStartOnLoad();
-        else
-            return false;
+        return _helper.shouldStartAutomatically(tunnel);
     }
     
     public boolean isSharedClient(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null)
-            return Boolean.parseBoolean(tun.getSharedClient());
-        else
-            return false;
+        return _helper.isSharedClient(tunnel);
     }
     
     public boolean shouldDelay(int tunnel) {
-        return getProperty(tunnel, "i2p.streaming.connectDelay", 0) > 0;
+        return _helper.shouldDelayConnect(tunnel);
     }
     
     public boolean isInteractive(int tunnel) {
-        return getProperty(tunnel, "i2p.streaming.maxWindowSize", 128) == 16;
+        return _helper.isInteractive(tunnel);
     }
     
     public int getTunnelDepth(int tunnel, int defaultLength) {
-        return getProperty(tunnel, "inbound.length", defaultLength);
+        return _helper.getTunnelDepth(tunnel, defaultLength);
     }
     
     public int getTunnelQuantity(int tunnel, int defaultQuantity) {
-        return getProperty(tunnel, "inbound.quantity", defaultQuantity);
+        return _helper.getTunnelQuantity(tunnel, defaultQuantity);
     }
    
     public int getTunnelBackupQuantity(int tunnel, int defaultBackupQuantity) {
-        return getProperty(tunnel, "inbound.backupQuantity", defaultBackupQuantity);
+        return _helper.getTunnelBackupQuantity(tunnel, defaultBackupQuantity);
     }
   
     public int getTunnelVariance(int tunnel, int defaultVariance) {
-        return getProperty(tunnel, "inbound.lengthVariance", defaultVariance);
+        return _helper.getTunnelVariance(tunnel, defaultVariance);
     }
     
     public boolean getReduce(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.reduceOnIdle");
+        return _helper.getReduceOnIdle(tunnel, false);
     }
     
     public int getReduceCount(int tunnel) {
-        return getProperty(tunnel, "i2cp.reduceQuantity", 1);
+        return _helper.getReduceCount(tunnel, 1);
     }
     
     public int getReduceTime(int tunnel) {
-        return getProperty(tunnel, "i2cp.reduceIdleTime", 20*60*1000) / (60*1000);
+        return _helper.getReduceTime(tunnel, 20);
     }
     
     public int getCert(int tunnel) {
-        return 0;
+        return _helper.getCert(tunnel);
     }
     
     public int getEffort(int tunnel) {
-        return 23;
+        return _helper.getEffort(tunnel);
     }
     
     public String getSigner(int tunnel) {
-        return "";
+        return _helper.getSigner(tunnel);
     }
     
     public boolean getEncrypt(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.encryptLeaseSet");
+        return _helper.getEncrypt(tunnel);
     }
     
     /**
@@ -191,38 +157,7 @@ public class EditBean extends IndexBean {
      *  @since 0.9.12
      */
     public int getSigType(int tunnel, String newTunnelType) {
-        SigType type;
-        String ttype;
-        boolean isShared;
-        if (tunnel >= 0) {
-            Destination d = getDestination(tunnel);
-            if (d != null) {
-                type = d.getSigType();
-                if (type != null)
-                    return type.getCode();
-            }
-            String stype = getProperty(tunnel, I2PClient.PROP_SIGTYPE, null);
-            type = stype != null ? SigType.parseSigType(stype) : null;
-            ttype = getTunnelType(tunnel);
-            isShared = isSharedClient(tunnel);
-        } else {
-            type = null;
-            ttype = newTunnelType;
-            isShared = false;
-        }
-        if (type == null) {
-            // same default logic as in TunnelController.setConfig()
-            if ((!TunnelController.isClient(ttype) ||
-                ((TunnelController.TYPE_IRC_CLIENT.equals(ttype) ||
-                  TunnelController.TYPE_SOCKS_IRC.equals(ttype) ||
-                  TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
-                  TunnelController.TYPE_STD_CLIENT.equals(ttype)) &&
-                 !isShared)))
-                type = TunnelController.PREFERRED_SIGTYPE;
-            else
-                type = SigType.DSA_SHA1;
-        }
-        return type.getCode();
+        return _helper.getSigType(tunnel, newTunnelType);
     }
     
     /** @since 0.9.12 */
@@ -230,98 +165,114 @@ public class EditBean extends IndexBean {
         return SigType.isAvailable(code);
     }
     
+    /**
+     *  Random keys, hidden in forms
+     *  @since 0.9.18
+     */
+    public String getKey1(int tunnel) {
+        return _helper.getInboundRandomKey(tunnel);
+    }
+
+    public String getKey2(int tunnel) {
+        return _helper.getOutboundRandomKey(tunnel);
+    }
+
+    public String getKey3(int tunnel) {
+        return _helper.getLeaseSetSigningPrivateKey(tunnel);
+    }
+
+    public String getKey4(int tunnel) {
+        return _helper.getLeaseSetPrivateKey(tunnel);
+    }
+
     /** @since 0.8.9 */
     public boolean getDCC(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelIRCClient.PROP_DCC);
+        return _helper.getDCC(tunnel);
     }
 
     public String getEncryptKey(int tunnel) {
-        return getProperty(tunnel, "i2cp.leaseSetKey", "");
+        return _helper.getEncryptKey(tunnel);
     }
     
     public String getAccessMode(int tunnel) {
-        if (getBooleanProperty(tunnel, PROP_ENABLE_ACCESS_LIST))
-            return "1";
-        if (getBooleanProperty(tunnel, PROP_ENABLE_BLACKLIST))
-            return "2";
-        return "0";
+        return Integer.toString(_helper.getAccessMode(tunnel));
     }
     
     public String getAccessList(int tunnel) {
-        return getProperty(tunnel, "i2cp.accessList", "").replace(",", "\n");
+        return _helper.getAccessList(tunnel);
     }
     
     public String getJumpList(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPClient.PROP_JUMP_SERVERS,
-                           I2PTunnelHTTPClient.DEFAULT_JUMP_SERVERS).replace(",", "\n");
+        return _helper.getJumpList(tunnel);
     }
     
     public boolean getClose(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.closeOnIdle");
+        return _helper.getCloseOnIdle(tunnel, false);
     }
     
     public int getCloseTime(int tunnel) {
-        return getProperty(tunnel, "i2cp.closeIdleTime", 30*60*1000) / (60*1000);
+        return _helper.getCloseTime(tunnel, 30);
     }
     
     public boolean getNewDest(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.newDestOnResume") &&
-               getBooleanProperty(tunnel, "i2cp.closeOnIdle") &&
-               !getBooleanProperty(tunnel, "persistentClientKey");
+        return _helper.getNewDest(tunnel);
     }
     
     public boolean getPersistentClientKey(int tunnel) {
-        return getBooleanProperty(tunnel, "persistentClientKey");
+        return _helper.getPersistentClientKey(tunnel);
     }
     
     public boolean getDelayOpen(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.delayOpen");
+        return _helper.getDelayOpen(tunnel);
     }
 
     /** @since 0.9.14 */
     public boolean getAllowUserAgent(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_USER_AGENT);
+        return _helper.getAllowUserAgent(tunnel);
     }
 
     /** @since 0.9.14 */
     public boolean getAllowReferer(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_REFERER);
+        return _helper.getAllowReferer(tunnel);
     }
 
     /** @since 0.9.14 */
     public boolean getAllowAccept(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_ACCEPT);
+        return _helper.getAllowAccept(tunnel);
     }
 
     /** @since 0.9.14 */
     public boolean getAllowInternalSSL(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_INTERNAL_SSL);
+        return _helper.getAllowInternalSSL(tunnel);
+    }
+
+    /** @since 0.9.18 */
+    public boolean getMultihome(int tunnel) {
+        return _helper.getMultihome(tunnel);
     }
 
     /** all proxy auth @since 0.8.2 */
     public boolean getProxyAuth(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_AUTH, "false") != "false";
+        return _helper.getProxyAuth(tunnel) != "false";
     }
-    
+    // TODO think
     public boolean getOutproxyAuth(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH) &&
+        return _helper.getOutproxyAuth(tunnel) &&
                getOutproxyUsername(tunnel).length() > 0 &&
                getOutproxyPassword(tunnel).length() > 0;
     }
     
     public String getOutproxyUsername(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, "");
+        return _helper.getOutproxyUsername(tunnel);
     }
     
     public String getOutproxyPassword(int tunnel) {
-        if (getOutproxyUsername(tunnel).length() <= 0)
-            return "";
-        return getProperty(tunnel, I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, "");
+        return _helper.getOutproxyPassword(tunnel);
     }
 
     /** @since 0.9.11 */
     public String getSslProxies(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, "");
+        return _helper.getSslProxies(tunnel);
     }
     
     /**
@@ -329,36 +280,36 @@ public class EditBean extends IndexBean {
      *  @since 0.9.11
      */
     public boolean getUseOutproxyPlugin(int tunnel) {
-        return Boolean.parseBoolean(getProperty(tunnel, I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN, "true"));
+        return _helper.getUseOutproxyPlugin(tunnel);
     }
 
     /** all of these are @since 0.8.3 */
     public int getLimitMinute(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_CONNS_MIN, 0);
+        return _helper.getLimitMinute(tunnel);
     }
 
     public int getLimitHour(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_CONNS_HOUR, 0);
+        return _helper.getLimitHour(tunnel);
     }
 
     public int getLimitDay(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_CONNS_DAY, 0);
+        return _helper.getLimitDay(tunnel);
     }
 
     public int getTotalMinute(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_MIN, 0);
+        return _helper.getTotalMinute(tunnel);
     }
 
     public int getTotalHour(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_HOUR, 0);
+        return _helper.getTotalHour(tunnel);
     }
 
     public int getTotalDay(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_DAY, 0);
+        return _helper.getTotalDay(tunnel);
     }
 
     public int getMaxStreams(int tunnel) {
-        return getProperty(tunnel, PROP_MAX_STREAMS, 0);
+        return _helper.getMaxStreams(tunnel);
     }
 
     /**
@@ -366,67 +317,28 @@ public class EditBean extends IndexBean {
      * @since 0.9.9
      */
     public int getPostMax(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, 0);
+        return _helper.getPostMax(tunnel);
     }
 
     public int getPostTotalMax(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, 0);
+        return _helper.getPostTotalMax(tunnel);
     }
 
     public int getPostCheckTime(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_WINDOW, I2PTunnelHTTPServer.DEFAULT_POST_WINDOW) / 60;
+        return _helper.getPostCheckTime(tunnel);
     }
 
     public int getPostBanTime(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_BAN_TIME, I2PTunnelHTTPServer.DEFAULT_POST_BAN_TIME) / 60;
+        return _helper.getPostBanTime(tunnel);
     }
 
     public int getPostTotalBanTime(int tunnel) {
-        return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME, I2PTunnelHTTPServer.DEFAULT_POST_TOTAL_BAN_TIME) / 60;
+        return _helper.getPostTotalBanTime(tunnel);
     }
     
     /** @since 0.9.13 */
     public boolean getUniqueLocal(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelServer.PROP_UNIQUE_LOCAL);
-    }
-
-    private int getProperty(int tunnel, String prop, int def) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String s = opts.getProperty(prop);
-                if (s == null) return def;
-                try {
-                    return Integer.parseInt(s);
-                } catch (NumberFormatException nfe) {}
-            }
-        }
-        return def;
-    }
-    
-    private String getProperty(int tunnel, String prop, String def) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String rv = opts.getProperty(prop);
-                if (rv != null)
-                    return DataHelper.escapeHTML(rv);
-            }
-        }
-        return def;
-    }
-    
-    /** default is false */
-    private boolean getBooleanProperty(int tunnel, String prop) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null)
-                return Boolean.parseBoolean(opts.getProperty(prop));
-        }
-        return false;
+        return _helper.getUniqueLocal(tunnel);
     }
     
     /** @since 0.8.3 */
@@ -465,49 +377,7 @@ public class EditBean extends IndexBean {
     }
 
     public String getCustomOptions(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts == null) return "";
-            boolean isMD5Proxy = TunnelController.TYPE_HTTP_CLIENT.equals(tun.getType()) ||
-                                 TunnelController.TYPE_CONNECT.equals(tun.getType());
-            Map<String, String> sorted = new TreeMap<String, String>();
-            for (Map.Entry<Object, Object> e : opts.entrySet()) {
-                String key = (String)e.getKey();
-                if (_noShowSet.contains(key))
-                    continue;
-                // leave in for HTTP and Connect so it can get migrated to MD5
-                // hide for SOCKS until migrated to MD5
-                if ((!isMD5Proxy) &&
-                    _nonProxyNoShowSet.contains(key))
-                    continue;
-                sorted.put(key, (String)e.getValue());
-            }
-            if (sorted.isEmpty())
-                return "";
-            StringBuilder buf = new StringBuilder(64);
-            boolean space = false;
-            for (Map.Entry<String, String> e : sorted.entrySet()) {
-                if (space)
-                    buf.append(' ');
-                else
-                    space = true;
-                buf.append(e.getKey()).append('=').append(e.getValue());
-            }
-            return DataHelper.escapeHTML(buf.toString());
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Retrieve the client options from the tunnel
-     *
-     * @return map of name=val to be used as I2P session options
-     */
-    private static Properties getOptions(TunnelController controller) {
-        if (controller == null) return null;
-        return controller.getClientOptionProps();
+        return _helper.getCustomOptionsString(tunnel);
     }
 
     private static final String PROP_ADVANCED = "routerconsole.advanced";
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index a1a8490b2dc76d5b7bd71570dcb5f1d0a59a7341..0480527f4a7a0056a7abdfda2f979689604747e2 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -9,44 +9,29 @@ package net.i2p.i2ptunnel.web;
  */
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
 
 import net.i2p.I2PAppContext;
 import net.i2p.app.ClientAppManager;
 import net.i2p.app.Outproxy;
-import net.i2p.client.I2PClient;
-import net.i2p.data.Base64;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.PrivateKeyFile;
 import net.i2p.data.SessionKey;
-import net.i2p.i2ptunnel.I2PTunnelClientBase;
-import net.i2p.i2ptunnel.I2PTunnelConnectClient;
 import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
 import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
 import net.i2p.i2ptunnel.I2PTunnelHTTPServer;
-import net.i2p.i2ptunnel.I2PTunnelIRCClient;
 import net.i2p.i2ptunnel.I2PTunnelServer;
-import net.i2p.i2ptunnel.SSLClientUtil;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.i2ptunnel.ui.GeneralHelper;
+import net.i2p.i2ptunnel.ui.TunnelConfig;
 import net.i2p.util.Addresses;
-import net.i2p.util.ConcurrentHashSet;
-import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
-import net.i2p.util.PasswordManager;
-import net.i2p.util.SecureFile;
 
 /**
  * Simple accessor for exposing tunnel info, but also an ugly form handler
@@ -59,6 +44,7 @@ public class IndexBean {
     protected final I2PAppContext _context;
     protected final Log _log;
     protected final TunnelControllerGroup _group;
+    protected final GeneralHelper _helper;
     private final String _fatalError;
     private String _action;
     private int _tunnel;
@@ -67,41 +53,16 @@ public class IndexBean {
     private String _curNonce;
     //private long _nextNonce;
 
-    private String _type;
-    private String _name;
-    private String _description;
-    private String _i2cpHost;
-    private String _i2cpPort;
-    private String _tunnelDepth;
-    private String _tunnelQuantity;
-    private String _tunnelVariance;
-    private String _tunnelBackupQuantity;
-    private boolean _connectDelay;
-    private String _customOptions;
-    private String _proxyList;
-    private String _port;
-    private String _reachableBy;
-    private String _targetDestination;
-    private String _targetHost;
-    private String _targetPort;
-    private String _spoofedHost;
-    private String _privKeyFile;
-    private String _profile;
-    private boolean _startOnLoad;
-    private boolean _sharedClient;
+    private TunnelConfig _config;
     private boolean _removeConfirmed;
-    private final Set<String> _booleanOptions;
-    private final Map<String, String> _otherOptions;
     private int _hashCashValue;
     private int _certType;
     private String _certSigner;
-    private String _newProxyUser;
-    private String _newProxyPW;
     
-    public static final int RUNNING = 1;
-    public static final int STARTING = 2;
-    public static final int NOT_RUNNING = 3;
-    public static final int STANDBY = 4;
+    public static final int RUNNING = GeneralHelper.RUNNING;
+    public static final int STARTING = GeneralHelper.STARTING;
+    public static final int NOT_RUNNING = GeneralHelper.NOT_RUNNING;
+    public static final int STANDBY = GeneralHelper.STANDBY;
     
     //static final String PROP_NONCE = IndexBean.class.getName() + ".nonce";
     //static final String PROP_NONCE_OLD = PROP_NONCE + '2';
@@ -110,13 +71,11 @@ public class IndexBean {
     /** store nonces in a static FIFO instead of in System Properties @since 0.8.1 */
     private static final List<String> _nonces = new ArrayList<String>(MAX_NONCES + 1);
 
-    static final String CLIENT_NICKNAME = "shared clients";
     public static final String PROP_THEME_NAME = "routerconsole.theme";
     public static final String DEFAULT_THEME = "light";
     public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled";
     public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled";
     private static final String PROP_PW_ENABLE = "routerconsole.auth.enable";
-    private static final String OPT = TunnelController.PFX_OPTION;
     
     public IndexBean() {
         _context = I2PAppContext.getGlobalContext();
@@ -132,12 +91,12 @@ public class IndexBean {
             error = iae.toString();
         }
         _group = tcg;
+        _helper = new GeneralHelper(_context, _group);
         _fatalError = error;
         _tunnel = -1;
         _curNonce = "-1";
         addNonce();
-        _booleanOptions = new ConcurrentHashSet<String>(4);
-        _otherOptions = new ConcurrentHashMap<String, String>(4);
+        _config = new TunnelConfig();
     }
     
     /**
@@ -278,99 +237,10 @@ public class IndexBean {
     }
     
     private String saveChanges() {
-        // Get current tunnel controller
-        TunnelController cur = getController(_tunnel);
-        
-        Properties config = getConfig();
-
-        String ksMsg = null;
-        String type = config.getProperty(TunnelController.PROP_TYPE);
-        if (TunnelController.TYPE_STD_CLIENT.equals(type) || TunnelController.TYPE_IRC_CLIENT.equals(type)) {
-            //
-            // If we switch to SSL, create the keystore here, so we can store the new properties.
-            // Down in I2PTunnelClientBase it's very hard to save the config.
-            //
-            if (Boolean.parseBoolean(config.getProperty(OPT + I2PTunnelClientBase.PROP_USE_SSL))) {
-                try {
-                    boolean created = SSLClientUtil.verifyKeyStore(config, OPT);
-                    if (created) {
-                        // config now contains new keystore props
-                        ksMsg = "Created new self-signed certificate for tunnel " + getTunnelName(_tunnel);
-                    }        
-                } catch (IOException ioe) {       
-                    ksMsg = "Failed to create new self-signed certificate for tunnel " +
-                            getTunnelName(_tunnel) + ", check logs: " + ioe;
-                }        
-            }        
-        }        
-        if (cur == null) {
-            // creating new
-            cur = new TunnelController(config, "", true);
-            _group.addController(cur);
-            if (cur.getStartOnLoad())
-                cur.startTunnelBackground();
-        } else {
-            cur.setConfig(config, "");
-        }
-        // Only modify other shared tunnels
-        // if the current tunnel is shared, and of supported type
-        if (Boolean.parseBoolean(cur.getSharedClient()) && isClient(cur.getType())) {
-            // all clients use the same I2CP session, and as such, use the same I2CP options
-            List<TunnelController> controllers = _group.getControllers();
-
-            for (int i = 0; i < controllers.size(); i++) {
-                TunnelController c = controllers.get(i);
-
-                // Current tunnel modified by user, skip
-                if (c == cur) continue;
-
-                // Only modify this non-current tunnel
-                // if it belongs to a shared destination, and is of supported type
-                if (Boolean.parseBoolean(c.getSharedClient()) && isClient(c.getType())) {
-                    Properties cOpt = c.getConfig("");
-                    if (_tunnelQuantity != null) {
-                        cOpt.setProperty("option.inbound.quantity", _tunnelQuantity);
-                        cOpt.setProperty("option.outbound.quantity", _tunnelQuantity);
-                    }
-                    if (_tunnelDepth != null) {
-                        cOpt.setProperty("option.inbound.length", _tunnelDepth);
-                        cOpt.setProperty("option.outbound.length", _tunnelDepth);
-                    }
-                    if (_tunnelVariance != null) {
-                        cOpt.setProperty("option.inbound.lengthVariance", _tunnelVariance);
-                        cOpt.setProperty("option.outbound.lengthVariance", _tunnelVariance);
-                    }
-                    if (_tunnelBackupQuantity != null) {
-                        cOpt.setProperty("option.inbound.backupQuantity", _tunnelBackupQuantity);
-                        cOpt.setProperty("option.outbound.backupQuantity", _tunnelBackupQuantity);
-                    }
-                    cOpt.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-                    cOpt.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
-                    
-                    c.setConfig(cOpt, "");
-                }
-            }
-        }
-        
-        List<String> msgs = doSave();
-        if (ksMsg != null)
-            msgs.add(ksMsg);
         // FIXME name will be HTML escaped twice
-        return getMessages(msgs);
+        return getMessages(_helper.saveTunnel(_tunnel, _config));
     }
 
-    private List<String> doSave() { 
-        List<String> rv = _group.clearAllMessages();
-        try {
-            _group.saveConfig();
-            rv.add(0, _("Configuration changes saved"));
-        } catch (IOException ioe) {
-            _log.error("Failed to save config file", ioe);
-            rv.add(0, _("Failed to save configuration") + ": " + ioe.toString());
-        }
-        return rv;
-    } 
-
     /**
      *  Stop the tunnel, delete from config,
      *  rename the private key file if in the default directory
@@ -378,49 +248,8 @@ public class IndexBean {
     private String deleteTunnel() {
         if (!_removeConfirmed)
             return "Please confirm removal";
-        
-        TunnelController cur = getController(_tunnel);
-        if (cur == null)
-            return "Invalid tunnel number";
-        
-        List<String> msgs = _group.removeController(cur);
-        msgs.addAll(doSave());
-
-        // Rename private key file if it was a default name in
-        // the default directory, so it doesn't get reused when a new
-        // tunnel is created.
-        // Use configured file name if available, not the one from the form.
-        String pk = cur.getPrivKeyFile();
-        if (pk == null)
-            pk = _privKeyFile;
-        if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat") &&
-            ((!isClient(cur.getType())) || cur.getPersistentClientKey())) {
-            File pkf = new File(_context.getConfigDir(), pk);
-            if (pkf.exists()) {
-                String name = cur.getName();
-                if (name == null) {
-                    name = cur.getDescription();
-                    if (name == null) {
-                        name = cur.getType();
-                        if (name == null)
-                            name = Long.toString(_context.clock().now());
-                    }
-                }
-                name = name.replace(' ', '_').replace(':', '_').replace("..", "_").replace('/', '_').replace('\\', '_');
-                name = "i2ptunnel-deleted-" + name + '-' + _context.clock().now() + "-privkeys.dat";
-                File backupDir = new SecureFile(_context.getConfigDir(), TunnelController.KEY_BACKUP_DIR);
-                File to;
-                if (backupDir.isDirectory() || backupDir.mkdir())
-                    to = new File(backupDir, name);
-                else
-                    to = new File(_context.getConfigDir(), name);
-                boolean success = FileUtil.rename(pkf, to);
-                if (success)
-                    msgs.add("Private key file " + pkf.getAbsolutePath() +
-                             " renamed to " + to.getAbsolutePath());
-            }
-        }
-        return getMessages(msgs);
+
+        return getMessages(_helper.deleteTunnel(_tunnel, _config.getPrivKeyFile()));
     }
     
     /**
@@ -489,9 +318,9 @@ public class IndexBean {
     }
     
     public String getTunnelName(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getName() != null)
-            return DataHelper.escapeHTML(tun.getName());
+        String name = _helper.getTunnelName(tunnel);
+        if (name != null)
+            return DataHelper.escapeHTML(name);
         else
             return _("New Tunnel");
     }
@@ -500,11 +329,8 @@ public class IndexBean {
      *  No validation
      */
     public String getClientPort(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getListenPort() != null)
-            return tun.getListenPort();
-        else
-            return "";
+        int port = _helper.getClientPort(tunnel);
+        return port > 0 ? Integer.toString(port) : "";
     }
     
     /**
@@ -564,42 +390,19 @@ public class IndexBean {
     }
     
     public String getInternalType(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null)
-            return tun.getType();
-        else
-            return "";
+        return _helper.getTunnelType(tunnel);
     }
     
     public String getClientInterface(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            if ("streamrclient".equals(tun.getType()))
-                return tun.getTargetHost();
-            else
-                return tun.getListenOnInterface();
-        } else
-            return "127.0.0.1";
+        return _helper.getClientInterface(tunnel);
     }
     
     public int getTunnelStatus(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun == null) return NOT_RUNNING;
-        if (tun.getIsRunning()) {
-            if (isClient(tunnel) && tun.getIsStandby())
-                return STANDBY;
-            else
-                return RUNNING;
-        } else if (tun.getIsStarting()) return STARTING;
-        else return NOT_RUNNING;
+        return _helper.getTunnelStatus(tunnel);
     }
     
     public String getTunnelDescription(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null && tun.getDescription() != null)
-            return DataHelper.escapeHTML(tun.getDescription());
-        else
-            return "";
+        return DataHelper.escapeHTML(_helper.getTunnelDescription(tunnel));
     }
     
     public String getSharedClient(int tunnel) {
@@ -611,16 +414,7 @@ public class IndexBean {
     }
     
     public String getClientDestination(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun == null) return "";
-        String rv;
-        if (TunnelController.TYPE_STD_CLIENT.equals(tun.getType()) ||
-            TunnelController.TYPE_IRC_CLIENT.equals(tun.getType()) ||
-            TunnelController.TYPE_STREAMR_CLIENT.equals(tun.getType()))
-            rv = tun.getTargetDestination();
-        else
-            rv = tun.getProxyList();
-        return rv != null ? rv : "";
+        return _helper.getClientDestination(tunnel);
     }
     
     /**
@@ -668,23 +462,7 @@ public class IndexBean {
      *  @since 0.9.17
      */
     protected Destination getDestination(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Destination rv = tun.getDestination();
-            if (rv != null)
-                return rv;
-            // if not running, do this the hard way
-            File keyFile = tun.getPrivateKeyFile();
-            if (keyFile != null) {
-                PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
-                try {
-                    rv = pkf.getDestination();
-                    if (rv != null)
-                        return rv;
-                } catch (Exception e) {}
-            }
-        }
-        return null;
+        return _helper.getDestination(tunnel);
     }
     
     /**
@@ -739,80 +517,103 @@ public class IndexBean {
      *
      */
     public void setType(String type) { 
-        _type = (type != null ? type.trim() : null);   
+        _config.setType(type);
     }
-    String getType() { return _type; }
+    String getType() { return _config.getType(); }
     
     /** Short name of the tunnel */
     public void setName(String name) { 
-        _name = (name != null ? name.trim() : null);
+        _config.setName(name);
     }
     /** one line description */
     public void setNofilter_description(String description) { 
-        // '#' will blow up DataHelper.storeProps()
-        _description = (description != null ? description.replace('#', ' ').trim() : null);
+        _config.setDescription(description);
     }
     /** I2CP host the router is on, ignored when in router context */
     public void setClientHost(String host) {
-        _i2cpHost = (host != null ? host.trim() : null);
+        _config.setClientHost(host);
     }
     /** I2CP port the router is on, ignored when in router context */
     public void setClientport(String port) {
-        _i2cpPort = (port != null ? port.trim() : null);
+        _config.setClientPort(port);
     }
     /** how many hops to use for inbound tunnels */
-    public void setTunnelDepth(String tunnelDepth) { 
-        _tunnelDepth = (tunnelDepth != null ? tunnelDepth.trim() : null);
+    public void setTunnelDepth(String tunnelDepth) {
+        if (tunnelDepth != null) {
+            try {
+                _config.setTunnelDepth(Integer.parseInt(tunnelDepth.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** how many parallel inbound tunnels to use */
-    public void setTunnelQuantity(String tunnelQuantity) { 
-        _tunnelQuantity = (tunnelQuantity != null ? tunnelQuantity.trim() : null);
+    public void setTunnelQuantity(String tunnelQuantity) {
+        if (tunnelQuantity != null) {
+            try {
+                _config.setTunnelQuantity(Integer.parseInt(tunnelQuantity.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** how much randomisation to apply to the depth of tunnels */
-    public void setTunnelVariance(String tunnelVariance) { 
-        _tunnelVariance = (tunnelVariance != null ? tunnelVariance.trim() : null);
+    public void setTunnelVariance(String tunnelVariance) {
+        if (tunnelVariance != null) {
+            try {
+                _config.setTunnelVariance(Integer.parseInt(tunnelVariance.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** how many tunnels to hold in reserve to guard against failures */
-    public void setTunnelBackupQuantity(String tunnelBackupQuantity) { 
-        _tunnelBackupQuantity = (tunnelBackupQuantity != null ? tunnelBackupQuantity.trim() : null);
+    public void setTunnelBackupQuantity(String tunnelBackupQuantity) {
+        if (tunnelBackupQuantity != null) {
+            try {
+                _config.setTunnelBackupQuantity(Integer.parseInt(tunnelBackupQuantity.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** what I2P session overrides should be used */
     public void setNofilter_customOptions(String customOptions) { 
-        _customOptions = (customOptions != null ? customOptions.trim() : null);
+        _config.setCustomOptions(customOptions);
     }
     /** what HTTP outproxies should be used (httpclient specific) */
     public void setProxyList(String proxyList) { 
-        _proxyList = (proxyList != null ? proxyList.trim() : null);
+        _config.setProxyList(proxyList);
     }
     /** what port should this client/httpclient/ircclient listen on */
     public void setPort(String port) { 
-        _port = (port != null ? port.trim() : null);
+        if (port != null) {
+            try {
+                _config.setPort(Integer.parseInt(port.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** 
      * what interface should this client/httpclient/ircclient listen on
      */
     public void setReachableBy(String reachableBy) { 
-        _reachableBy = (reachableBy != null ? reachableBy.trim() : null);
+        _config.setReachableBy(reachableBy);
     }
     /** What peer does this client tunnel point at */
     public void setTargetDestination(String dest) { 
-        _targetDestination = (dest != null ? dest.trim() : null);
+        _config.setTargetDestination(dest);
     }
     /** What host does this server tunnel point at */
     public void setTargetHost(String host) { 
-        _targetHost = (host != null ? host.trim() : null);
+        _config.setTargetHost(host);
     }
     /** What port does this server tunnel point at */
-    public void setTargetPort(String port) { 
-        _targetPort = (port != null ? port.trim() : null);
+    public void setTargetPort(String port) {
+        if (port != null) {
+            try {
+                _config.setTargetPort(Integer.parseInt(port.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     /** What host does this http server tunnel spoof */
     public void setSpoofedHost(String host) { 
-        _spoofedHost = (host != null ? host.trim() : null);
+        _config.setSpoofedHost(host);
     }
     /** What filename is this server tunnel's private keys stored in */
     public void setPrivKeyFile(String file) { 
-        _privKeyFile = (file != null ? file.trim() : null);
+        _config.setPrivKeyFile(file);
     }
     /**
      * If called with any value (and the form submitted with action=Remove),
@@ -826,228 +627,228 @@ public class IndexBean {
      * loaded (aka right now and whenever the router is started up)
      */
     public void setStartOnLoad(String moo) {
-        _startOnLoad = true;
+        _config.setStartOnLoad(true);
     }
     public void setShared(String moo) {
-    	_sharedClient=true;
+    	_config.setShared(true);
     }
     public void setShared(boolean val) {
-    	_sharedClient=val;
+    	_config.setShared(val);
     }
     public void setConnectDelay(String moo) {
-        _connectDelay = true;
+        _config.setConnectDelay(true);
     }
     public void setProfile(String profile) { 
-        _profile = profile; 
+        _config.setProfile(profile);
     }
 
     public void setReduce(String moo) {
-        _booleanOptions.add("i2cp.reduceOnIdle");
+        _config.setReduce(true);
     }
     public void setClose(String moo) {
-        _booleanOptions.add("i2cp.closeOnIdle");
+        _config.setClose(true);
     }
     public void setEncrypt(String moo) {
-        _booleanOptions.add("i2cp.encryptLeaseSet");
+        _config.setEncrypt(true);
     }
 
     /** @since 0.8.9 */
     public void setDCC(String moo) {
-        _booleanOptions.add(I2PTunnelIRCClient.PROP_DCC);
+        _config.setDCC(true);
     }
 
     /** @since 0.9.9 */
     public void setUseSSL(String moo) {
-        _booleanOptions.add(I2PTunnelServer.PROP_USE_SSL);
+        _config.setUseSSL(true);
     }
 
     /** @since 0.9.9 */
     public boolean isSSLEnabled(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = tun.getClientOptionProps();
-            return Boolean.parseBoolean(opts.getProperty(I2PTunnelServer.PROP_USE_SSL));
-        }
-        return false;
+        return _helper.isSSLEnabled(tunnel);
     }
 
     /** @since 0.9.12 */
     public void setRejectInproxy(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPServer.OPT_REJECT_INPROXY);
+        _config.setRejectInproxy(true);
     }
 
     /** @since 0.9.12 */
     public boolean isRejectInproxy(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = tun.getClientOptionProps();
-            return Boolean.parseBoolean(opts.getProperty(I2PTunnelHTTPServer.OPT_REJECT_INPROXY));
-        }
-        return false;
+        return _helper.getRejectInproxy(tunnel);
     }
 
     /** @since 0.9.13 */
     public void setUniqueLocal(String moo) {
-        _booleanOptions.add(I2PTunnelServer.PROP_UNIQUE_LOCAL);
+        _config.setUniqueLocal(true);
     }
 
-    protected static final String PROP_ENABLE_ACCESS_LIST = "i2cp.enableAccessList";
-    protected static final String PROP_ENABLE_BLACKLIST = "i2cp.enableBlackList";
-
     public void setAccessMode(String val) {
-        if ("1".equals(val))
-            _booleanOptions.add(PROP_ENABLE_ACCESS_LIST);
-        else if ("2".equals(val))
-            _booleanOptions.add(PROP_ENABLE_BLACKLIST);
+        if (val != null) {
+            try {
+                _config.setAccessMode(Integer.parseInt(val.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setDelayOpen(String moo) {
-        _booleanOptions.add("i2cp.delayOpen");
+        _config.setDelayOpen(true);
     }
     public void setNewDest(String val) {
-        if ("1".equals(val))
-            _booleanOptions.add("i2cp.newDestOnResume");
-        else if ("2".equals(val))
-            _booleanOptions.add("persistentClientKey");
+        if (val != null) {
+            try {
+                _config.setNewDest(Integer.parseInt(val.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setReduceTime(String val) {
         if (val != null) {
             try {
-                _otherOptions.put("i2cp.reduceIdleTime", Integer.toString(Integer.parseInt(val.trim()) * 60*1000));
+                _config.setReduceTime(Integer.parseInt(val.trim()));
             } catch (NumberFormatException nfe) {}
         }
     }
     public void setReduceCount(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.reduceQuantity", val.trim());
+        if (val != null) {
+            try {
+                _config.setReduceCount(Integer.parseInt(val.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
     public void setEncryptKey(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.leaseSetKey", val.trim());
+        _config.setEncryptKey(val);
     }
 
     public void setAccessList(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.accessList", val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
+        _config.setAccessList(val);
     }
 
     public void setJumpList(String val) {
-        if (val != null)
-            _otherOptions.put(I2PTunnelHTTPClient.PROP_JUMP_SERVERS, val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
+        _config.setJumpList(val);
     }
 
     public void setCloseTime(String val) {
         if (val != null) {
             try {
-                _otherOptions.put("i2cp.closeIdleTime", Integer.toString(Integer.parseInt(val.trim()) * 60*1000));
+                _config.setCloseTime(Integer.parseInt(val.trim()));
             } catch (NumberFormatException nfe) {}
         }
     }
 
     /** @since 0.9.14 */
     public void setAllowUserAgent(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPClient.PROP_USER_AGENT);
+        _config.setAllowUserAgent(true);
     }
 
     /** @since 0.9.14 */
     public void setAllowReferer(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPClient.PROP_REFERER);
+        _config.setAllowReferer(true);
     }
 
     /** @since 0.9.14 */
     public void setAllowAccept(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT);
+        _config.setAllowAccept(true);
     }
 
     /** @since 0.9.14 */
     public void setAllowInternalSSL(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPClient.PROP_INTERNAL_SSL);
+        _config.setAllowInternalSSL(true);
+    }
+
+    /** @since 0.9.18 */
+    public void setMultihome(String moo) {
+        _config.setMultihome(true);
     }
 
     /** all proxy auth @since 0.8.2 */
     public void setProxyAuth(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_AUTH, I2PTunnelHTTPClientBase.DIGEST_AUTH);
+        _config.setProxyAuth(I2PTunnelHTTPClientBase.DIGEST_AUTH);
     }
     
     public void setProxyUsername(String s) {
-        if (s != null)
-            _newProxyUser = s.trim();
+        _config.setProxyUsername(s);
     }
     
     public void setNofilter_proxyPassword(String s) {
-        if (s != null)
-            _newProxyPW = s.trim();
+        _config.setProxyPassword(s);
     }
     
     public void setOutproxyAuth(String s) {
-        _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH, I2PTunnelHTTPClientBase.DIGEST_AUTH);
+        _config.setOutproxyAuth(true);
     }
     
     public void setOutproxyUsername(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, s.trim());
+        _config.setOutproxyUsername(s);
     }
     
     public void setNofilter_outproxyPassword(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, s.trim());
+        _config.setOutproxyPassword(s);
     }
 
     /** @since 0.9.11 */
     public void setSslProxies(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, s.trim().replace(" ", ","));
+        _config.setSslProxies(s);
     }
 
     /** @since 0.9.11 */
     public void setUseOutproxyPlugin(String moo) {
-        _booleanOptions.add(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN);
+        _config.setUseOutproxyPlugin(true);
     }
-    
-    /** all of these are @since 0.8.3 */
-    protected static final String PROP_MAX_CONNS_MIN = "i2p.streaming.maxConnsPerMinute";
-    protected static final String PROP_MAX_CONNS_HOUR = "i2p.streaming.maxConnsPerHour";
-    protected static final String PROP_MAX_CONNS_DAY = "i2p.streaming.maxConnsPerDay";
-    protected static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
-    protected static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
-    protected static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
-    protected static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
 
     public void setLimitMinute(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_MIN, s.trim());
+        if (s != null) {
+            try {
+                _config.setLimitMinute(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setLimitHour(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_HOUR, s.trim());
+        if (s != null) {
+            try {
+                _config.setLimitHour(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setLimitDay(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_DAY, s.trim());
+        if (s != null) {
+            try {
+                _config.setLimitDay(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setTotalMinute(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_MIN, s.trim());
+        if (s != null) {
+            try {
+                _config.setTotalMinute(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setTotalHour(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_HOUR, s.trim());
+        if (s != null) {
+            try {
+                _config.setTotalHour(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setTotalDay(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_DAY, s.trim());
+        if (s != null) {
+            try {
+                _config.setTotalDay(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setMaxStreams(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_STREAMS, s.trim());
+        if (s != null) {
+            try {
+                _config.setMaxStreams(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     /**
@@ -1055,28 +856,43 @@ public class IndexBean {
      * @since 0.9.9
      */
     public void setPostMax(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_MAX, s.trim());
+        if (s != null) {
+            try {
+                _config.setPostMax(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setPostTotalMax(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, s.trim());
+        if (s != null) {
+            try {
+                _config.setPostTotalMax(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setPostCheckTime(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_WINDOW, Integer.toString(Integer.parseInt(s.trim()) * 60));
+        if (s != null) {
+            try {
+                _config.setPostCheckTime(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setPostBanTime(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_BAN_TIME, Integer.toString(Integer.parseInt(s.trim()) * 60));
+        if (s != null) {
+            try {
+                _config.setPostBanTime(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     public void setPostTotalBanTime(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME, Integer.toString(Integer.parseInt(s.trim()) * 60));
+        if (s != null) {
+            try {
+                _config.setPostTotalBanTime(Integer.parseInt(s.trim()));
+            } catch (NumberFormatException nfe) {}
+        }
     }
 
     /** params needed for hashcash and dest modification */
@@ -1103,7 +919,7 @@ public class IndexBean {
     /** @since 0.9.12 */
     public void setSigType(String val) {
         if (val != null) {
-            _otherOptions.put(I2PClient.PROP_SIGTYPE, val);
+            _config.setSigType(val);
             if (val.equals("0"))
                 _certType = 0;
             else
@@ -1113,9 +929,30 @@ public class IndexBean {
         // Otherwise this only works on a new tunnel...
     }
 
+    /**
+     *  Random keys, hidden in forms
+     *  @since 0.9.18
+     */
+    public void setKey1(String s) {
+        _config.setInboundRandomKey(s);
+    }
+
+    public void setKey2(String s) {
+        _config.setOutboundRandomKey(s);
+    }
+
+    public void setKey3(String s) {
+        _config.setLeaseSetSigningPrivateKey(s);
+    }
+
+    public void setKey4(String s) {
+        _config.setLeaseSetPrivateKey(s);
+    }
+
     /** Modify or create a destination */
     private String modifyDestination() {
-        if (_privKeyFile == null || _privKeyFile.trim().length() <= 0)
+        String privKeyFile = _config.getPrivKeyFile();
+        if (privKeyFile == null)
             return "Private Key File not specified";
 
         TunnelController tun = getController(_tunnel);
@@ -1129,9 +966,9 @@ public class IndexBean {
             return "Tunnel must be stopped before modifying destination";
         }
 
-        File keyFile = new File(_privKeyFile);
+        File keyFile = new File(privKeyFile);
         if (!keyFile.isAbsolute())
-            keyFile = new File(_context.getConfigDir(), _privKeyFile);
+            keyFile = new File(_context.getConfigDir(), privKeyFile);
         PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
         try {
             pkf.createIfAbsent();
@@ -1161,7 +998,7 @@ public class IndexBean {
                 }
                 if (signerPKF == null || signerPKF.length() <= 0)
                     return "Signing destination " + _certSigner + " not found";
-                if (_privKeyFile.equals(signerPKF))
+                if (privKeyFile.equals(signerPKF))
                     return "Self-signed destinations not allowed";
                 Certificate c = pkf.setSignedCert(new PrivateKeyFile(signerPKF));
                 if (c == null)
@@ -1210,289 +1047,10 @@ public class IndexBean {
      *
      */
     private Properties getConfig() {
-        Properties config = new Properties();
-        updateConfigGeneric(config);
-        
-        if ((isClient(_type) && !TunnelController.TYPE_STREAMR_CLIENT.equals(_type)) ||
-            TunnelController.TYPE_STREAMR_SERVER.equals(_type)) {
-            // streamrserver uses interface
-            if (_reachableBy != null)
-                config.setProperty(TunnelController.PROP_INTFC, _reachableBy);
-            else
-                config.setProperty(TunnelController.PROP_INTFC, "");
-        } else {
-            // streamrclient uses targetHost
-            if (_targetHost != null)
-                config.setProperty(TunnelController.PROP_TARGET_HOST, _targetHost);
-        }
-
-        if (isClient(_type)) {
-            // generic client stuff
-            if (_port != null)
-                config.setProperty(TunnelController.PROP_LISTEN_PORT, _port);
-            config.setProperty(TunnelController.PROP_SHARED, _sharedClient + "");
-            for (String p : _booleanClientOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
-            for (String p : _otherClientOpts)
-                if (_otherOptions.containsKey(p))
-                    config.setProperty(OPT + p, _otherOptions.get(p));
-        } else {
-            // generic server stuff
-            if (_targetPort != null)
-                config.setProperty(TunnelController.PROP_TARGET_PORT, _targetPort);
-            for (String p : _booleanServerOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
-            for (String p : _otherServerOpts)
-                if (_otherOptions.containsKey(p))
-                    config.setProperty(OPT + p, _otherOptions.get(p));
-        }
-
-        // generic proxy stuff
-        if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type) || 
-            TunnelController.TYPE_SOCKS.equals(_type) ||TunnelController.TYPE_SOCKS_IRC.equals(_type)) {
-            for (String p : _booleanProxyOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
-            if (_proxyList != null)
-                config.setProperty(TunnelController.PROP_PROXIES, _proxyList);
-        }
-
-        // Proxy auth including migration to MD5
-        if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type)) {
-            // Migrate even if auth is disabled
-            // go get the old from custom options that updateConfigGeneric() put in there
-            String puser = OPT + I2PTunnelHTTPClientBase.PROP_USER;
-            String user = config.getProperty(puser);
-            String ppw = OPT + I2PTunnelHTTPClientBase.PROP_PW;
-            String pw = config.getProperty(ppw);
-            if (user != null && pw != null && user.length() > 0 && pw.length() > 0) {
-                String pmd5 = OPT + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
-                              user + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
-                if (config.getProperty(pmd5) == null) {
-                    // not in there, migrate
-                    String realm = _type.equals(TunnelController.TYPE_HTTP_CLIENT) ? I2PTunnelHTTPClient.AUTH_REALM
-                                                              : I2PTunnelConnectClient.AUTH_REALM;
-                    String hex = PasswordManager.md5Hex(realm, user, pw);
-                    if (hex != null) {
-                        config.setProperty(pmd5, hex);
-                        config.remove(puser);
-                        config.remove(ppw);
-                    }
-                }
-            }
-            // New user/password
-            String auth = _otherOptions.get(I2PTunnelHTTPClientBase.PROP_AUTH);
-            if (auth != null && !auth.equals("false")) {
-                if (_newProxyUser != null && _newProxyPW != null &&
-                    _newProxyUser.length() > 0 && _newProxyPW.length() > 0) {
-                    String pmd5 = OPT + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
-                                  _newProxyUser + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
-                    String realm = _type.equals(TunnelController.TYPE_HTTP_CLIENT) ? I2PTunnelHTTPClient.AUTH_REALM
-                                                              : I2PTunnelConnectClient.AUTH_REALM;
-                    String hex = PasswordManager.md5Hex(realm, _newProxyUser, _newProxyPW);
-                    if (hex != null)
-                        config.setProperty(pmd5, hex);
-                }
-            }
-        }
-
-        if (TunnelController.TYPE_IRC_CLIENT.equals(_type) ||
-            TunnelController.TYPE_STD_CLIENT.equals(_type) ||
-            TunnelController.TYPE_STREAMR_CLIENT.equals(_type)) {
-            if (_targetDestination != null)
-                config.setProperty(TunnelController.PROP_DEST, _targetDestination);
-        } else if (TunnelController.TYPE_HTTP_SERVER.equals(_type) ||
-                   TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(_type)) {
-            if (_spoofedHost != null)
-                config.setProperty(TunnelController.PROP_SPOOFED_HOST, _spoofedHost);
-            for (String p : _httpServerOpts)
-                if (_otherOptions.containsKey(p))
-                    config.setProperty(OPT + p, _otherOptions.get(p));
-        }
-        if (TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(_type)) {
-            if (_port != null)
-                config.setProperty(TunnelController.PROP_LISTEN_PORT, _port);
-            if (_reachableBy != null)
-                config.setProperty(TunnelController.PROP_INTFC, _reachableBy);
-            else if (_targetHost != null)
-                config.setProperty(TunnelController.PROP_INTFC, _targetHost);
-            else
-                config.setProperty(TunnelController.PROP_INTFC, "");
-        }
-
-        if (TunnelController.TYPE_IRC_CLIENT.equals(_type)) {
-            boolean dcc = _booleanOptions.contains(I2PTunnelIRCClient.PROP_DCC);
-            config.setProperty(OPT + I2PTunnelIRCClient.PROP_DCC,
-                               "" + dcc);
-            // add some sane server options since they aren't in the GUI (yet)
-            if (dcc) {
-                config.setProperty(OPT + PROP_MAX_CONNS_MIN, "3");
-                config.setProperty(OPT + PROP_MAX_CONNS_HOUR, "10");
-                config.setProperty(OPT + PROP_MAX_TOTAL_CONNS_MIN, "5");
-                config.setProperty(OPT + PROP_MAX_TOTAL_CONNS_HOUR, "25");
-            }
-        }
-
-        // As of 0.9.17, add a persistent random key if not present
-        if (!isClient(_type) || _booleanOptions.contains("persistentClientKey")) {
-            String p = OPT + "inbound.randomKey";
-            if (!config.containsKey(p)) {
-                // as of 0.9.17, add a random key if not previously present
-                byte[] rk = new byte[32];
-                _context.random().nextBytes(rk);
-                config.setProperty(p, Base64.encode(rk));
-                p = OPT + "outbound.randomKey";
-                _context.random().nextBytes(rk);
-                config.setProperty(p, Base64.encode(rk));
-            }
-        }
-
-        return config;
-    }
-    
-    private static final String _noShowOpts[] = {
-        "inbound.length", "outbound.length", "inbound.lengthVariance", "outbound.lengthVariance",
-        "inbound.backupQuantity", "outbound.backupQuantity", "inbound.quantity", "outbound.quantity",
-        "inbound.nickname", "outbound.nickname", "i2p.streaming.connectDelay", "i2p.streaming.maxWindowSize",
-        I2PTunnelIRCClient.PROP_DCC
-        };
-    private static final String _booleanClientOpts[] = {
-        "i2cp.reduceOnIdle", "i2cp.closeOnIdle", "i2cp.newDestOnResume", "persistentClientKey", "i2cp.delayOpen",
-        I2PTunnelClientBase.PROP_USE_SSL,
-        };
-    private static final String _booleanProxyOpts[] = {
-        I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH,
-        I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN,
-        I2PTunnelHTTPClient.PROP_USER_AGENT,
-        I2PTunnelHTTPClient.PROP_REFERER,
-        I2PTunnelHTTPClient.PROP_ACCEPT,
-        I2PTunnelHTTPClient.PROP_INTERNAL_SSL
-        };
-    private static final String _booleanServerOpts[] = {
-        "i2cp.reduceOnIdle", "i2cp.encryptLeaseSet", PROP_ENABLE_ACCESS_LIST, PROP_ENABLE_BLACKLIST,
-        I2PTunnelServer.PROP_USE_SSL,
-        I2PTunnelHTTPServer.OPT_REJECT_INPROXY,
-        I2PTunnelServer.PROP_UNIQUE_LOCAL
-        };
-    private static final String _otherClientOpts[] = {
-        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime",
-        "outproxyUsername", "outproxyPassword",
-        I2PTunnelHTTPClient.PROP_JUMP_SERVERS,
-        I2PTunnelHTTPClientBase.PROP_AUTH,
-        I2PClient.PROP_SIGTYPE,
-        I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES
-        };
-    private static final String _otherServerOpts[] = {
-        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList",
-         PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY,
-         PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
-         PROP_MAX_STREAMS, I2PClient.PROP_SIGTYPE
-        };
-    private static final String _httpServerOpts[] = {
-        I2PTunnelHTTPServer.OPT_POST_WINDOW,
-        I2PTunnelHTTPServer.OPT_POST_BAN_TIME,
-        I2PTunnelHTTPServer.OPT_POST_TOTAL_BAN_TIME,
-        I2PTunnelHTTPServer.OPT_POST_MAX,
-        I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX
-        };
-
-    /**
-     *  do NOT add these to noShoOpts, we must leave them in for HTTPClient and ConnectCLient
-     *  so they will get migrated to MD5
-     *  TODO migrate socks to MD5
-     */
-    private static final String _otherProxyOpts[] = {
-        "proxyUsername", "proxyPassword"
-        };
-
-    protected static final Set<String> _noShowSet = new HashSet<String>(128);
-    protected static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
-    static {
-        _noShowSet.addAll(Arrays.asList(_noShowOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanClientOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanProxyOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanServerOpts));
-        _noShowSet.addAll(Arrays.asList(_otherClientOpts));
-        _noShowSet.addAll(Arrays.asList(_otherServerOpts));
-        _noShowSet.addAll(Arrays.asList(_httpServerOpts));
-        _nonProxyNoShowSet.addAll(Arrays.asList(_otherProxyOpts));
-    }
-
-    private void updateConfigGeneric(Properties config) {
-        config.setProperty(TunnelController.PROP_TYPE, _type);
-        if (_name != null)
-            config.setProperty(TunnelController.PROP_NAME, _name);
-        if (_description != null)
-            config.setProperty(TunnelController.PROP_DESCR, _description);
-        if (!_context.isRouterContext()) {
-            if (_i2cpHost != null)
-                config.setProperty(TunnelController.PROP_I2CP_HOST, _i2cpHost);
-            if ( (_i2cpPort != null) && (_i2cpPort.trim().length() > 0) ) {
-                config.setProperty(TunnelController.PROP_I2CP_PORT, _i2cpPort);
-            } else {
-                config.setProperty(TunnelController.PROP_I2CP_PORT, "7654");
-            }
-        }
-        if (_privKeyFile != null)
-            config.setProperty(TunnelController.PROP_FILE, _privKeyFile);
-        
-        if (_customOptions != null) {
-            StringTokenizer tok = new StringTokenizer(_customOptions);
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int eq = pair.indexOf('=');
-                if ( (eq <= 0) || (eq >= pair.length()) )
-                    continue;
-                String key = pair.substring(0, eq);
-                if (_noShowSet.contains(key))
-                    continue;
-                // leave in for HTTP and Connect so it can get migrated to MD5
-                // hide for SOCKS until migrated to MD5
-                if ((!TunnelController.TYPE_HTTP_CLIENT.equals(_type)) &&
-                    (!TunnelController.TYPE_CONNECT.equals(_type)) &&
-                    _nonProxyNoShowSet.contains(key))
-                    continue;
-                String val = pair.substring(eq+1);
-                config.setProperty(OPT + key, val);
-            }
-        }
-
-        config.setProperty(TunnelController.PROP_START, _startOnLoad + "");
-
-        if (_tunnelQuantity != null) {
-            config.setProperty("option.inbound.quantity", _tunnelQuantity);
-            config.setProperty("option.outbound.quantity", _tunnelQuantity);
-        }
-        if (_tunnelDepth != null) {
-            config.setProperty("option.inbound.length", _tunnelDepth);
-            config.setProperty("option.outbound.length", _tunnelDepth);
-        }
-        if (_tunnelVariance != null) {
-            config.setProperty("option.inbound.lengthVariance", _tunnelVariance);
-            config.setProperty("option.outbound.lengthVariance", _tunnelVariance);
-        }
-        if (_tunnelBackupQuantity != null) {
-            config.setProperty("option.inbound.backupQuantity", _tunnelBackupQuantity);
-            config.setProperty("option.outbound.backupQuantity", _tunnelBackupQuantity);
-        }
-        if (_connectDelay)
-            config.setProperty("option.i2p.streaming.connectDelay", "1000");
-        else
-            config.setProperty("option.i2p.streaming.connectDelay", "0");
-        if (isClient(_type) && _sharedClient) {
-            config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-            config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
-        } else if (_name != null) {
-            config.setProperty("option.inbound.nickname", _name);
-            config.setProperty("option.outbound.nickname", _name);
-        }
-        if ("interactive".equals(_profile))
-            // This was 1 which doesn't make much sense
-            // The real way to make it interactive is to make the streaming lib
-            // MessageInputStream flush faster but there's no option for that yet,
-            // Setting it to 16 instead of the default but not sure what good that is either.
-            config.setProperty("option.i2p.streaming.maxWindowSize", "16");
-        else
-            config.remove("option.i2p.streaming.maxWindowSize");
+        // This is easier than requiring TunnelConfig to talk to
+        // TunnelControllerGroup and TunnelController
+        _config.setDestination(getDestination(_tunnel));
+        return _config.getConfig();
     }
 
     ///
@@ -1500,13 +1058,7 @@ public class IndexBean {
     ///
     
     protected TunnelController getController(int tunnel) {
-        if (tunnel < 0) return null;
-        if (_group == null) return null;
-        List<TunnelController> controllers = _group.getControllers();
-        if (controllers.size() > tunnel)
-            return controllers.get(tunnel); 
-        else
-            return null;
+        return _helper.getController(tunnel);
     }
     
     private static String getMessages(List<String> msgs) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/package.html b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..61d2d3b567d9505f62d666be8e881c53ce461d68
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+The UI for adding tunnels and editing their configurations,
+implemented as a webapp packaged in i2ptunnel.war.
+Not be maintained as a stable API.
+</p>
+</body>
+</html>
diff --git a/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java b/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
index 8cd7cf3227ea3c866ae8d6b2888e89225452157a..19302a624851d9aad90894b9e1a58a24a42eba75 100644
--- a/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
+++ b/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
@@ -9,6 +9,7 @@ import java.io.OutputStreamWriter;
 import java.util.Map;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import junit.framework.TestCase;
 
 public class I2PTunnelHTTPServerTest extends TestCase {
@@ -27,7 +28,7 @@ public class I2PTunnelHTTPServerTest extends TestCase {
 		headerString += "BLAH: something\r\n";
 		headerString += "\r\n";
 		InputStream in = fillInputStream(headerString);
-		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], null);
+		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext());
 		assertEquals(headers.size(), 1); //One header
 	}
 	
@@ -37,7 +38,7 @@ public class I2PTunnelHTTPServerTest extends TestCase {
 		headerString += "someHeader: oh my, duplication!\r\n";
 		headerString += "\r\n";
 		InputStream in = fillInputStream(headerString);
-		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], null);
+		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext());
 		assertEquals(headers.size(), 1);
 		assertEquals(headers.get("someHeader").size(), 2);
 	}
@@ -50,7 +51,7 @@ public class I2PTunnelHTTPServerTest extends TestCase {
 		headerString += "\r\n";
 		InputStream in = fillInputStream(headerString);
 		StringBuilder builder = new StringBuilder(128);
-		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, builder, new String[0], null);
+		Map<String, List<String>> headers = I2PTunnelHTTPServer.readHeaders(in, builder, new String[0], I2PAppContext.getGlobalContext());
 		String result = I2PTunnelHTTPServer.formatHeaders(headers, builder);
 		int first = result.indexOf("abc");
 		assertTrue(first >= 0);
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 3d9456d551ef2f6fb09d4946f62d5c1e0acd34f9..c0dd04cf47b8718984004c456f950e3c72028b8c 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -16,7 +16,7 @@
 %>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - Edit Client Tunnel")%></title>
+    <title><%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Client Tunnel")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
@@ -58,6 +58,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <input type="hidden" name="tunnel" value="<%=curTunnel%>" />
                 <input type="hidden" name="nonce" value="<%=editBean.getNextNonce()%>" />
                 <input type="hidden" name="type" value="<%=tunnelType%>" />
+                <%
+                // these are four keys that are generated automatically on first save,
+                // and we want to persist in i2ptunnel.config, but don't want to
+                // show clogging up the custom options form.
+                String key = editBean.getKey1(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key1" value="<%=key%>" />
+                <% }
+                key = editBean.getKey2(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key2" value="<%=key%>" />
+                <% }
+                key = editBean.getKey3(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key3" value="<%=key%>" />
+                <% }
+                key = editBean.getKey4(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key4" value="<%=key%>" />
+                <% } %>
                 <input type="submit" class="default" name="action" value="Save changes" />
             </div>
       
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index c1f75fc1a0f041937dfe6414c8e0a4eac7ecd91e..0d7c050937b112045bf2e97dfb2a03f233290918 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -16,7 +16,7 @@
 %>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - Edit Server Tunnel")%></title>
+    <title><%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Hidden Service")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
@@ -58,6 +58,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <input type="hidden" name="tunnel" value="<%=curTunnel%>" />
                 <input type="hidden" name="nonce" value="<%=editBean.getNextNonce()%>" />
                 <input type="hidden" name="type" value="<%=tunnelType%>" />
+                <%
+                // these are four keys that are generated automatically on first save,
+                // and we want to persist in i2ptunnel.config, but don't want to
+                // show clogging up the custom options form.
+                String key = editBean.getKey1(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key1" value="<%=key%>" />
+                <% }
+                key = editBean.getKey2(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key2" value="<%=key%>" />
+                <% }
+                key = editBean.getKey3(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key3" value="<%=key%>" />
+                <% }
+                key = editBean.getKey4(curTunnel);
+                if (key != null && key.length() > 0) { %>
+                    <input type="hidden" name="key4" value="<%=key%>" />
+                <% } %>
                 <input type="submit" class="default" name="action" value="Save changes" />
             </div>
       
@@ -415,6 +435,19 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     <input value="1" type="checkbox" id="startOnLoad" name="uniqueLocal" title="Use unique IP addresses for each connecting client (local non-SSL servers only)"<%=(editBean.getUniqueLocal(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
                 </div>
             </div>
+            <div class="rowItem">
+                <div id="optionsField" class="rowItem">
+                    <label>
+                        <%=intl._("Optimize for Multihoming")%>:
+                    </label>
+                </div>
+                <div id="portField" class="rowItem">
+                    <label for="access" accesskey="d">
+                        <%=intl._("Enable")%>:
+                    </label>
+                    <input value="1" type="checkbox" id="startOnLoad" name="multihome" title="Only enable if you are hosting this service on multiple routers"<%=(editBean.getMultihome(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                </div>
+            </div>
             <div class="subdivider">
                 <hr />
             </div>
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 0b63e98f31257f070bc8c43817b7b86811c7aa08..feff5539cb91b45f6364f437009378739ec8eb6f 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -19,7 +19,7 @@
 <jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - List")%></title>
+    <title><%=intl._("Hidden Services Manager")%></title>
     
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
@@ -83,7 +83,7 @@
     <div id="localServerTunnelList" class="panel">
         <div class="header">
             
-    <h4><%=intl._("I2P Server Tunnels")%></h4>
+    <h4><%=intl._("I2P Hidden Services")%></h4>
         </div>
 
         
@@ -187,10 +187,10 @@
             <form id="addNewServerTunnelForm" action="edit"> 
             <div class="toolbox">
                     
-        <label><%=intl._("New server tunnel")%>:</label>
+        <label><%=intl._("New hidden service")%>:</label>
                     <select name="type">
-                        <option value="server"><%=intl._("Standard")%></option>
                         <option value="httpserver">HTTP</option>
+                        <option value="server"><%=intl._("Standard")%></option>
                         <option value="httpbidirserver">HTTP bidir</option>
                         <option value="ircserver">IRC</option>
                         <option value="streamrserver">Streamr</option>
diff --git a/apps/i2ptunnel/locale-proxy/messages_ar.po b/apps/i2ptunnel/locale-proxy/messages_ar.po
index 5bef8cf5c2e3645033748108ac40aa3d2186cb2c..a6bb8edc552242c6839506c8756b73b07142a218 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ar.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ar.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,9 +27,10 @@ msgstr ""
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr ""
@@ -38,9 +39,10 @@ msgstr ""
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr ""
 
@@ -48,9 +50,10 @@ msgstr ""
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "تم حفظ تغيرات الاعدادات"
@@ -59,9 +62,10 @@ msgstr "تم حفظ تغيرات الاعدادات"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr ""
@@ -70,9 +74,10 @@ msgstr ""
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "أضف الى دفتر العناوين"
@@ -120,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -159,217 +164,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "اسم او اتجاه"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr ""
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr ""
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "وجهة محلية"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "تحديث بروكسي الى"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "اعدادات البروكسي الخارجي"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "اعدادات البروكسي الخارجي"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -385,7 +413,7 @@ msgstr "اسم او اتجاه"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -393,41 +421,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "اتجاه"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_cs.po b/apps/i2ptunnel/locale-proxy/messages_cs.po
index 3a5e3551365ff62ae51573947bb365827abef717..102b73dc0242b61d65e8f3c341736a0b700d96ce 100644
--- a/apps/i2ptunnel/locale-proxy/messages_cs.po
+++ b/apps/i2ptunnel/locale-proxy/messages_cs.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-13 16:17+0000\n"
-"Last-Translator: A5h8d0wf0x <littleslyfoxie28@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,10 @@ msgstr "Informace: Nové jméno hostitele"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Konzole routeru"
@@ -39,9 +40,10 @@ msgstr "Konzole routeru"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "I2P konzole routeru"
 
@@ -49,9 +51,10 @@ msgstr "I2P konzole routeru"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Konfigurace"
@@ -60,9 +63,10 @@ msgstr "Konfigurace"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Pomoc"
@@ -71,9 +75,10 @@ msgstr "Pomoc"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Adresář"
@@ -121,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -160,217 +165,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "jméno nebo cíl"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr ""
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr ""
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Cíl tunelu"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr ""
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr ""
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -386,7 +414,7 @@ msgstr "jméno nebo cíl"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -394,41 +422,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_de.po b/apps/i2ptunnel/locale-proxy/messages_de.po
index 31914810be9ba77c8f14d3a94817ec1dc2e2a985..5ad98e56884334b2501818c6a146707eb0a322c8 100644
--- a/apps/i2ptunnel/locale-proxy/messages_de.po
+++ b/apps/i2ptunnel/locale-proxy/messages_de.po
@@ -10,7 +10,8 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 # foo <foo@bar>, 2009
-# Lars Schimmer <echelon@i2pmail.org>, 2014
+# Lars Schimmer <echelon@i2pmail.org>, 2014-2015
+# Max Muster <scr53875@soisz.com>, 2014
 # mixxy, 2011
 # nextloop <ga25day@mytum.de>, 2013
 # pirr <pirr@tormail.org>, 2012
@@ -19,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-23 09:21+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-10 14:53+0000\n"
 "Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -37,9 +38,10 @@ msgstr "Information: Neuer Hostname"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Routerkonsole"
@@ -48,9 +50,10 @@ msgstr "Routerkonsole"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "I2P Routerkonsole"
 
@@ -58,9 +61,10 @@ msgstr "I2P Routerkonsole"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Einstellungen"
@@ -69,9 +73,10 @@ msgstr "Einstellungen"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Hilfe"
@@ -80,9 +85,10 @@ msgstr "Hilfe"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Adressbuch"
@@ -130,9 +136,9 @@ msgstr "Der von Ihnen gefolgte Adresshelfer Link definiert einen anderen Destina
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Jemand kann versuchen Ihnen eine gefälschte Eepsite darzubieten oder zwei Eepsites haben zufäälig den selben Namen."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Jemand kann versuchen als fremde Webseite aufzuscheinen, oder 2 Personen haben ihrer Webseite den selben Namen gegeben."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -169,217 +175,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Sie haben versucht eine Webseite oder Adresse ausserhalb von I2P zu erreichen,"
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Warnung: Eepsite unerreichbar"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "Webseite unerreichbar"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "Die Eepsite wurde nicht erreicht, da deren Leaseset nicht gefunden wurde."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "Die Webseite ist nicht erreichbar da das Leaseset nicht gefunden wurde."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "Die Eepsite ist wahrscheinlich nicht aktiv, aber es kann auch ein Problem im Netzwerk sein"
+"The website is probably down, but there could also be network congestion."
+msgstr "Die Webseite ist wahrscheinlich nicht aktiv, es kann aber auch Überlastung im I2P Netzwerk sein."
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Sie sollten es noch einmal {0}probieren{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Tunnel Ziel"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "Die Webseite ist nicht erreichbar da diese Verschlüsselungsoptionen nutzt, die nicht mit Ihrer I2P oder Java Version kompatibel ist. "
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "Es konnte keine Verbindung zu dem folgenden Ziel aufgebaut werden:"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Fehler: Anfrage abgelehnt"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Fehler: Lokaler Zugriff"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Dein Browser unterstützt keine iFrames."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "Benutzen Sie den Proxy nicht um auf Ihre Router Konsole, Localhost Adressen oder lokale LAN Ziele zuzugreifen."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Warnung: Kein Outproxy eingerichtet"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Dieser Seitenaufruf ist nach außerhalb von I2P adressiert aber es ist kein Ausgangsproxy eingestellt."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Bitte stelle einen Ausgangsproxy in I2PTunnel ein"
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "Die Eepsite ist nicht erreichbar."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "Die Webseite ist nicht erreichbar."
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Die Eepsite ist offline, das Netzwerk ist überlastet oder ihr Router ist nicht gut ins Netzwerk integriert. "
+msgstr "Die Webseite ist nicht aktiv, das I2P Netz ist überlastet oder Ihr I2P Router ist noch nicht gut genug ins I2P Netz integriert. "
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "lokales Ziel"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "Die genannte Eepsite Adresse ist nicht gültig, oder andersweitig unerreichbar."
+msgstr "Die Adresse der Webseite ist nicht gültig oder aus einem unbekanntem Grund unerreichbar."
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Möglicherweise haben Sie einen falschen Base 64 String eingetragen oder der gefolgte Link ist ungültig."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "Der I2P Server kann auch offline sein."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Warnung: Kein HTTP Protokoll"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "Die Anfrage nutzt ein ungültiges Protokoll."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr "Der I2P HTTP-Proxy unterstützt nur HTTP- und HTTPS-Anfragen."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr "Andere Protokolle wie FTP sind nicht erlaubt."
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Warnung: Eepsite unbekannt"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "Outproxy ist unerreichbar."
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Warnung: Eepsite Adresse nicht im Adressbuch gefunden"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "Der HTTP-Outproxy war nicht erreichbar, da die verwendeten Verschlüsselungseinstellungen nicht von deiner I2P- oder Java-Version unterstützt werden."
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Die Eepsite wurde nicht im Adressbuch ihres Routers gefunden."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Sie können es {0}noch einmal versuchen{1}, dieses verwendet einen zufällig aus dem {2}hier definierten{3} Pool Outproxy (falls Sie mehr als einen eingerichtet haben)."
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Falls Sie weiterhin Probleme haben, können Sie {0}hier{1} Ihre Liste der Outproxies ändern."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "Webseite ist unbekannt"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "Webseite wurde nicht im Adressbuch gefunden"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr "Die Webseite wurde nicht im Adressbuch ihres I2P Routers gefunden."
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Kontrollieren Sie den Link oder finden Sie eine Base 32, bzw. eine Base 64 Adresse."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Haben Sie eine Base 64 Adresse, {0}fügen Sie diese ihrem Adressbuch hinzu{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "Finden Sie alternativ eine Base 32 Adresse, einen Adress-Hilfs-Link oder nutzen Sie einen der Jump-Service Links unten."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "Ist diese Seite oft offline? Schauen Sie in der {0}FAQ{1} nach Hilfe zum {2}Eintragen einger Subscriptionen{3} zu Ihrem Adressbuch. "
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Warnung: Ungültige Anfrage URI"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "Die angefragte URI ist ungültig und enthält möglicherweise nicht erlaubte Zeichen."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Falls Sie einen Link angeklickt hatten, kontrollieren Sie das Ende der URI nach ungültigen Zeichen, die ihr Browser fälschlicherweise angehangen hat."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Warnung: Outproxy nicht gefunden"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "Outproxy wurde nicht gefunden."
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr "Der HTTP Outproxy wurde nicht erreicht, da dessen Leaseset nicht gefunden wurde."
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr "Der Outproxy ist wahrscheinlich nicht aktiv, aber es kann auch ein Problem im Netzwerk sein."
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Sie können es {0}noch einmal versuchen{1}, dieses verwendet einen zufällig aus dem {2}hier definierten{3} Pool Outproxy (falls Sie mehr als einen eingerichtet haben)."
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Falls Sie weiterhin Probleme haben, können Sie {0}hier{1} Ihre Liste der Outproxies ändern."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "Der HTTP-Proxy ist nicht bereit"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Er ist Offline, das Netzwerk ist überlastet oder Ihr Router ist nicht gut ins Netzwerk integriert."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Anmeldung erforderlich"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Anmeldung für den I2P-HTTP-Proxy vonnöten"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Dieser Proxy kann nur mit Benutzername und Passwort erreicht werde."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Bitte Benutzername und Passwort eingeben, oder überprüfe die {0}Router-Einstellungen{1} oder die {2}I2P-Tunnel Einstellungen{3}"
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -395,7 +424,7 @@ msgstr "Dies scheint kein gültiges Ziel zu sein:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "Der I2P-Adresshelfer kann dir bei solch einem Ziel nicht helfen."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -403,42 +432,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Um das Ziel in Ihrer Host-Datenbank zu besuchen, klicken Sie <a href=\"{0}\">hier</a>, und um das Ziel aus der kollidierenden Adresshelfer-Anfrage zu besuchen, <a href=\"{1}\">hier</a>!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr "Leaseset des Servers nicht gefunden."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Ziel"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Weiter zu {0}, ohne zu speichern"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "{0} im Router-Adressbuch speichern und auf die Eepseite weiterleiten"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Speichern Sie {0} in das I2P Router Adressbuch und besuchen sie diese Webseite."
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "{0} im Master-Adressbuch speichern und auf die Eepseite weiterleiten"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Speichern Sie {0} ins I2P Master Adressbuch und besuchen Sie diese Webseite."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "{0} im privaten Adressbuch speichern und auf die Eepseite weiterleiten"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Speichern Sie {0} in das private I2P Adressbuch und besuchen Sie diese Webseite."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_en.po b/apps/i2ptunnel/locale-proxy/messages_en.po
index d02b11d87eb3b042f740c8237475bf5dbb321df0..583fe6c2cf217d0be221be8eb46735a2c8881696 100644
--- a/apps/i2ptunnel/locale-proxy/messages_en.po
+++ b/apps/i2ptunnel/locale-proxy/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-30 20:10+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+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"
@@ -124,8 +124,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given "
-"two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given "
+"two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -165,16 +165,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -191,7 +191,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -232,12 +232,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -278,7 +278,7 @@ msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
 #: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
-msgid "Warning: Outproxy Unreachable"
+msgid "Outproxy Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:123
@@ -304,15 +304,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -353,7 +353,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
 #: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
-msgid "Warning: Outproxy Not Found"
+msgid "Outproxy Not Found"
 msgstr ""
 
 #: ../java/build/Proxy.java:156
@@ -410,7 +410,7 @@ msgstr ""
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a href=\"{0}\">here</"
@@ -418,41 +418,41 @@ msgid ""
 "\"{1}\">here</a>."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_es.po b/apps/i2ptunnel/locale-proxy/messages_es.po
index 8afdd6ea30281846998d3e3c0de88cf6c6145ce0..9329a2bb6e03fab4fa286df12e58eb827b2d363f 100644
--- a/apps/i2ptunnel/locale-proxy/messages_es.po
+++ b/apps/i2ptunnel/locale-proxy/messages_es.po
@@ -10,15 +10,15 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
 # punkibastardo <punkibastardo@gmail.com>, 2011-2012
-# strel, 2013-2014
+# strel, 2013-2015
 # Trolly, 2013
 # Trolly, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 17:45+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 11:48+0000\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -35,9 +35,10 @@ msgstr "Información: Nuevo nombre de host"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Consola del Ruter"
@@ -46,9 +47,10 @@ msgstr "Consola del Ruter"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Consola del Ruter I2P"
 
@@ -56,9 +58,10 @@ msgstr "Consola del Ruter I2P"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Ajustes"
@@ -67,9 +70,10 @@ msgstr "Ajustes"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Ayuda"
@@ -78,9 +82,10 @@ msgstr "Ayuda"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
@@ -128,9 +133,9 @@ msgstr "El enlace de ayuda que ha pulsado tienen una clave de destino diferente
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Alguien podría estar intentando hacerse pasar por otra eepsite, o la gente ha puesto nombres idénticos a varias eepsites."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Alguien podría estar intentando suplantar otro sitio web, o la gente le ha dado nombres idénticos a dos sitios web."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -167,217 +172,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Ha intentado conectarse a una localización o una web no I2P."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Advertencia: Eepsite no accesible"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "Sitio web inalcanzable"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "El eepsite no estaba accesible porque no se encontró su LeaseSet (grupo de túneles a un destino)"
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "El sitio web no fue alcanzable, porque no se encontró su lease set (túneles para ese destino)."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "El eepsite probablemente estaba caído, pero también puedo haber congestión en la red."
+"The website is probably down, but there could also be network congestion."
+msgstr "El sitio web probablemente está caído, pero también podría haber congestión en la red."
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Quizás quiera {0}reintentarlo{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "No se pudo encontrar el siguiente destino:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "El sitio web no fue alcanzable, porque utiliza opciones de cifrado que no están soportadas por su versión de I2P o de Java."
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "No se pudo conectar con el siguiente destino:"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Error: solicitud denegada"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Error: acceso local"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Su navegador no soporta iFrames."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "No use el proxy para acceder a la consola del ruter, localhost o destinaciones en su LAN local."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Advertencia: no se ha configurado ningún proxy de salida"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Su petición es para una web fuera de I2P, pero no tiene configurado el proxy de salida HTTP."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configure un proxy de salida en el I2PTunnel."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "No se ha podido acceder a la eepsite."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "El sitio web no fue alcanzable."
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "La eepsite está pagada, o hay congestión en la red, o su ruter no está aún bien integrado con los otros pares."
+msgstr "El sitio web está fuera de línea, hay congestión en la red, o su router I2P aún no está bien integrado con los pares (peers)."
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Aviso: Destinación no válida."
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "La destinación de eepsite especificada no es válida, o quizás no se ha podido acceder a ella."
+msgstr "El destino del sitio web especificado no era válido, o de cualquier modo era inalcanzable."
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Quizás pegó la destinación Base 64 equivocada o el enlace que ha pulsado estaba mal."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "También podría ser que ese servidor I2P esté apagado."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Advertencia: Protocolo no HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "La petición usa un protocolo incorrecto."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr "El Proxy HTTP de I2P sólo soporta peticiones HTTP y HTTPS."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr "Otros protocolos tales como FTP no están permitidos."
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Advertencia: Eepsite desconocida."
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "Proxy de salida no alcanzable"
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Advertencia: Eepsite no encontrada en la libreta de direcciones"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "El proxy HTTP de salida no se pudo alcanzar, porque usa opciones de cifrado que no están soportadas por su versión de I2P o de Java."
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "LA eepsite no se encontró en su libreta de direcciones."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Puede ser que desee {0}reintentarlo{1} ya uqe esto seleccionará aleatoriamente un outproxy del grupo que haya definido {2}aquí{3} (si tiene configurado más de uno)"
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Si aún sigue teniendo problemas puede ser que desee editar si lista de outproxies {0}aquí{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "Sitio web desconocido"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "El sitio web no se encontró en la libreta de direcciones"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr "El sitio web no se encontró en la libreta de direcciones de su router I2P."
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Compruebe el enlace o busque una dirección Base 32 o Base 64."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Si tiene una dirección Base 64, {0}añádala a su libreta de direcciones{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "Si no, encuentre una dirección Base 32 o un enlace de ayuda, o use un servicio de salto de más abajo."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "¿Entra a esta web a menudo? Vea {0}el FAQ{1} para obtener ayuda de como {2}añadir suscripciones{3} a su libreta de direcciones."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Advertencia: URI solicitado no válida"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "La URI solicitada no es válida y probablemente tenga caracteres no válidos."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Si ha pulsado en un enlace, compruebe el final de la URI por caracteres que haya podido añadir el navegador por error."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Advertencia: Outproxy no encontrado"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "Proxy de salida no encontrado"
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr "El proxy HTTP de salida a Internet (outproxy) no estaba accesible porque no se encontró su LeaseSet (túneles al mismo destino)."
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr "El proxy de salida a Internet (outproxy) probablemente estaba caído, pero también pudo haber congestión en la red."
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Puede ser que desee {0}reintentarlo{1} ya uqe esto seleccionará aleatoriamente un outproxy del grupo que haya definido {2}aquí{3} (si tiene configurado más de uno)"
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Si aún sigue teniendo problemas puede ser que desee editar si lista de outproxies {0}aquí{1}."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "El proxy HTTP no está activo"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Está apagado, o hay congestión en la red, o su ruter aún no está bien integrado con los otros pares."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Se necesita Autorización para el Proxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Se necesita Autorización para el proxy I2P HTTP"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Este proxy está configurado para requerir un usuario y contraseña para acceder."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Por favor, escriba su usuario y contraseña, o compruebe su configuración{1} del {0}ruter o su configuración{3} de {2}I2PTunnel."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -393,7 +421,7 @@ msgstr "Éste parece ser un destino falso:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "El ayudante de direcciones no te puede ayudar con un destino así."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -401,42 +429,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Para visitar el destino en la base de datos de hosts, ¡pincha <a href=\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en conflicto, ¡pincha <a href=\"{1}\">aquí</a>!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr "No se encontró el LeaseSet (túneles) del destino"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Acceder a {0} sin guardar"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
+msgid "Save {0} to router address book and continue to website"
+msgstr "Guardar {0} en la libreta de direcciones del router I2P y continuar hacia el sitio web"
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
+msgid "Save {0} to master address book and continue to website"
+msgstr "Guardar {0} en la libreta de direcciones maestra y continuar hacia el sitio web"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
+msgid "Save {0} to private address book and continue to website"
+msgstr "Guardar {0} en la libreta de direcciones personal y continuar hacia el sitio web"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_fr.po b/apps/i2ptunnel/locale-proxy/messages_fr.po
index 464fd5f3551d1331b27684664eda75ffc6ad574d..415fb34ac5826a39fc71c4adb0bca559ada20c91 100644
--- a/apps/i2ptunnel/locale-proxy/messages_fr.po
+++ b/apps/i2ptunnel/locale-proxy/messages_fr.po
@@ -8,13 +8,13 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
 # Boxoa590, 2013
-# Towinet, 2013-2014
+# Towinet, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 16:32+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 13:29+0000\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -31,9 +31,10 @@ msgstr "Information : nouveau nom d'hôte"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Console du routeur"
@@ -42,9 +43,10 @@ msgstr "Console du routeur"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Console du routeur I2P"
 
@@ -52,9 +54,10 @@ msgstr "Console du routeur I2P"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configuration"
@@ -63,9 +66,10 @@ msgstr "Configuration"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Aide"
@@ -74,9 +78,10 @@ msgstr "Aide"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
@@ -124,9 +129,9 @@ msgstr "Le lien d'assistant d'adresse que vous avez suivi spécifie une clé de
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Quelqu'un pourrait essayer de se faire passer pour un autre eepsite, ou des gens ont donné des noms identiques à deux eepsites."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Quelqu'un pourrait essayer d'interpréter le rôle d'un autre site Web, ou des gens ayant donné des noms identiques à deux sites Web."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -163,217 +168,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Vous avez tenté de vous connecter à un site ou emplacement non-I2P."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Avertissement : Eepsite inaccessible"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "Site web inaccessible"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "L'eepsite n'était pas accessible, parce que son jeu de bail n'a pas été trouvé."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "Ce site web n'était pas accessible, parce que le jeu de bail n'a pas été trouvé."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "L'eepsite est probablement hors ligne, mais il pourrait également y avoir congestion du réseau."
+"The website is probably down, but there could also be network congestion."
+msgstr "Le site web est probablement hors service, mais il pourrait également y avoir congestion du réseau."
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Vous pouvez vouloir {0}réessayer{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Destination du tunnel"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "Le site web n'était pas accessible, parce qu'il utilise les options de chiffrement qui ne sont pas supportées par votre version d'I2P ou de Java."
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "Ne pouvait pas vous connecter à la destination suivante :"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Erreur : demande refusée"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Erreur : accès local"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Votre navigateur n'est pas compatible iFrames."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "Ne pas utiliser le proxy pour accéder à la console du routeur, ni au localhost, ni vers des destinations de votre LAN local."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Avertissement : pas de proxy sortant configuré"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Votre demande était pour un site en dehors de I2P, mais vous n'avez aucun outproxy HTTP de configuré."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Veuillez configurer un outproxy dans I2PTunnel."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "Le eepsite n'était pas joignable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "Le site web n'était pas accessible."
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Le eepsite est hors ligne, ou il y a congestion du réseau, ou votre routeur n'est pas encore bien intégré avec les pairs."
+msgstr "Le site web est hors service, ou il y a congestion du réseau, ou votre routeur n'est pas encore bien intégré aux autres pairs."
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Avertissement : destination invalide"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "La destination vers l'eepsite spécifié n'était pas valide, ou autrement était inaccessible."
+msgstr "La destination du site Web indiqué n'était pas valable, ou autrement était inaccessible."
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Peut-être que vous avez collé dans la mauvaise chaîne base 64, ou le lien que vous suivez est mauvais."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "L'hôte I2P pourrait également être déconnecté."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Avertissement : protocole non HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "La requête utilise un mauvais protocole."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr "Le proxy HTTP d'I2P soutient les requêtes HTTP et HTTPS seulement."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr "Les autres protocoles tel que le FTP ne sont pas permis."
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Avertissement : Eepsite inconnu"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "Outproxy (proxy sortant) inaccessible"
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Avertissement : Eepsite pas trouvé dans le carnet d'adresses"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "Le proxy sortant HTTP n'était pas accessible, parce qu'il utilise les options de chiffrement qui ne sont pas supportées par votre version d'I2P ou de Java."
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Le eepsite n'a pas été trouvé dans le carnet d'adresses de votre routeur."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Vous pouvez vouloir {0}réessayer{1} car cela va re-sélectionner au hasard un outproxy parmi le pool que vous avez défini {2}ici{3} (si vous en avez plus d'un de configuré)."
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Si vous continuez à avoir des dérangements vous pourriez vouloir modifier votre liste de outproxy {0}ici{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "Site web inconnu"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "Site web non trouvé dans le carnet d'adresses"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr "Le site web n'a pas été trouvé dans le carnet d'adresses de votre routeur."
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Cliquez le lien ou trouvez une adresse base 32 ou base 64."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Si vous avez l''adresse Base 64, {0}ajoutez-là à votre carnet d''adresse{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "Sinon, trouver un lien d'assistant d'adresse ou un lien Base 32, ou utiliser ci-dessous un lien service de saut."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "Voyez-vous cette page souvent ? Voyez {0}la FAQ{1} pour de l'aide afin d'{2}ajouter quelques abonnements{3} à votre carnet d'adresses."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Avertissement : demande invalide d'URI"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "L'URI de la requête n'est pas valide, et contient probablement des caractères illégaux."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Si vous avez cliqué sur un lien, vérifiez la fin de l'URI pour d'éventuels caractères que le navigateur aurait ajourté à tort."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Avertissement : outproxy non trouvé"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "Outproxy non trouvé"
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr "L'outproxy HTTP n'était pas accessible, parce que son jeu de bail n'a pas été trouvé."
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr "L'outproxy est probablement hors ligne, mais il pourrait également y avoir congestion du réseau."
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Vous pouvez vouloir {0}réessayer{1} car cela va re-sélectionner au hasard un outproxy parmi le pool que vous avez défini {2}ici{3} (si vous en avez plus d'un de configuré)."
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Si vous continuez à avoir des dérangements vous pourriez vouloir modifier votre liste de outproxy {0}ici{1}."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "Le proxy HTTP n'est pas en place"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Il est hors ligne, ou il y a congestion du réseau, ou votre routeur n'est pas encore bien intégré avec les pairs."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Autorisation requise par le proxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Autorisation requise par le proxy HTTP de I2P"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Ce proxy est configuré pour exiger un nom d''utilisateur et un mot de passe pour y accéder."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Veuillez saisir votre nom d''utilisateur et mot de passe, ou vérifier votre {0}configuration de routeur{1} ou {2}configuration de I2PTunnel{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -389,7 +417,7 @@ msgstr "Cela semble être une mauvaise destination"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "L'assistant d'adresse ne peut pas vous aider avec une destination comme cela !"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -397,42 +425,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Pour aller à la destination de votre base de données d''hôtes, cliquez <a href=\"{0}\">ici</a>. Pour aller à la destination de l''assistant d''adresse en conflit, cliquez <a href=\"{1}\">ici</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr "Le jeu de bail de la destination n'a pas été trouvé"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Hôte"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destination"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Aller sur le site i2p {0} sans enregistrer dans un carnet d''adresses. "
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse du routeur {0} et aller sur le site i2p"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Sauvegarder {0} dans le carnet d'adresses de votre routeur puis continuer vers le site web"
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse principal {0} et aller sur le site i2p"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Sauvegarder {0} dans le carnet d'adresses principal de votre routeur puis continuer vers le site web"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse privé {0} et aller sur le site i2p"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Sauvegarder {0} dans le carnet d'adresses privé de votre routeur puis continuer vers le site web"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_hu.po b/apps/i2ptunnel/locale-proxy/messages_hu.po
index 57c78afd92c39caec0782d4202d70725f0e37991..850ce566a11dc539fadac13c067d7aa0ab240606 100644
--- a/apps/i2ptunnel/locale-proxy/messages_hu.po
+++ b/apps/i2ptunnel/locale-proxy/messages_hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -26,9 +26,10 @@ msgstr ""
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Router Konzol"
@@ -37,9 +38,10 @@ msgstr "Router Konzol"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Router Konzol"
 
@@ -47,9 +49,10 @@ msgstr "Router Konzol"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Beállítások"
@@ -58,9 +61,10 @@ msgstr "Beállítások"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Segítség"
@@ -69,9 +73,10 @@ msgstr "Segítség"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Címjegyzék"
@@ -119,8 +124,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -158,217 +163,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Alagút célállomása"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr ""
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr ""
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Helyi célállomást"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "A HTTP proxy nincs bekapcsolva"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Kimenő proxy Hitelesítés"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Kimenő proxy Hitelesítés"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -384,7 +412,7 @@ msgstr "Ez rossz célállomásnak tűnik:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2pcímsegítő nem tud segíteni ilyen célállomással!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -392,42 +420,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "A hoszt adatbázisodban lévő célállomás megtekintéséhez kattints <a href=\"{0}\">ide</a>. Az ütközésben lévő címsegítő célállomás megtekintéséhez kattints <a href=\"{1}\">ide</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Hoszt"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Bázis 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Célállomás"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Mentés nélkül tovább ide: {0}"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "{0} mentése a router címjegyzékbe és tovább az eep oldalra"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "{0} mentése a mester címjegyzékbe és tovább az eep oldalra"
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "{0} mentése a privát címjegyzékbe és tovább az eep oldalra"
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_id.po b/apps/i2ptunnel/locale-proxy/messages_id.po
new file mode 100644
index 0000000000000000000000000000000000000000..d7c1db6edf8684ecf1047dd595e9d1991801da49
--- /dev/null
+++ b/apps/i2ptunnel/locale-proxy/messages_id.po
@@ -0,0 +1,499 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Information: New Host Name"
+msgstr "Informasi: Nama Host Baru"
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
+#: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
+msgid "Router Console"
+msgstr "Konsol Router"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
+#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
+#: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
+msgid "I2P Router Console"
+msgstr "I2P Konsol Router"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Help"
+msgstr "Bantuan"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Addressbook"
+msgstr "Buku alamat"
+
+#: ../java/build/Proxy.java:11
+msgid "Information: New Host Name with Address Helper"
+msgstr "Informasi: Nama Host Baru dengan Alamat Pembantu"
+
+#: ../java/build/Proxy.java:12
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr "Tautan alamat pembantu yang Anda ikuti adalah untuk host baru yang tidak dalam buku alamat Anda."
+
+#: ../java/build/Proxy.java:13
+msgid "You may save this host name to your local address book."
+msgstr "Anda dapat menyimpan nama host ini ke buku alamat lokal Anda."
+
+#: ../java/build/Proxy.java:14
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr "Jika Anda menyimpannya ke buku alamat Anda, Anda tidak akan melihat pesan ini lagi."
+
+#: ../java/build/Proxy.java:15
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
+msgstr "Jika Anda tidak menyimpannya, nama host akan dilupakan setelah router memulai ulang berikutnya."
+
+#: ../java/build/Proxy.java:16
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr "Jika Anda tidak ingin mengunjungi host ini, klik tombol \"kembali\" pada peramban Anda."
+
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+msgid "Warning: Destination Key Conflict"
+msgstr "Peringatan: Kunci Tujuan Bermasalah"
+
+#: ../java/build/Proxy.java:24
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr "Tautan alamat pembantu yang Anda ikuti menspesifikasikan kunci tujuan berbeda dibandingkan masukan host dalam database host Anda."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr "Anda dapat menyelesaikan konflik dengan mempertimbangkan kunci mana yang Anda percayai, dan baik membuang tautan alamat pembantu, membuang masukan host dari database host Anda, ataupun menamai salah satu diantara mereka dengan nama yang berbeda."
+
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33
+msgid "Warning: Bad Address Helper"
+msgstr "Peringatan: Alamat Pembantu Buruk"
+
+#: ../java/build/Proxy.java:34
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr "Kunci pembantu dalam URL ({0}i2paddresshelper={1}) tidak dapat diatasi."
+
+#: ../java/build/Proxy.java:35
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr "Sepertinya data tidak berguna, atau kesalahan pengetikan alamat Base 32."
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr "Periksa URL Anda untuk mencoba dan memperbaiki kunci pembantu untuk menjadi hostname Base 32 valid atau kunci Base 64."
+
+#: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
+msgid "Warning: Request Denied"
+msgstr "Peringatan: Permintaan Ditolak"
+
+#: ../java/build/Proxy.java:44
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Anda mencoba untuk terhubung ke website atau lokasi non-I2P."
+
+#: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:52
+msgid "The website was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:53
+msgid ""
+"The website is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Anda mungkin ingin {0}mengulang{1}."
+
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
+msgid "Could not find the following destination:"
+msgstr "Tidak dapat menemukan tujuan berikut:"
+
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
+msgid "Error: Request Denied"
+msgstr "Kesalahan: Permintaan Ditolak"
+
+#: ../java/build/Proxy.java:71
+msgid "Error: Local Access"
+msgstr "Kesalahan: Akses Lokal"
+
+#: ../java/build/Proxy.java:72
+msgid "Your browser is misconfigured."
+msgstr "Peramban Anda terkonfigurasi dengan buruk."
+
+#: ../java/build/Proxy.java:73
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr "Jangan menggunakan proxy untuk mengakses konsol router, localhost, atau tujuan LAN lokal."
+
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
+msgid "Warning: No Outproxy Configured"
+msgstr "Peringatan: Tidak Ada Outproxy yang Dikonfigurasikan"
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr "Permintaan Anda adalah untuk situs diluar I2P, tetapi Anda belum memiliki outproxy HTTP yang dikonfigurasikan."
+
+#: ../java/build/Proxy.java:82
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr "Silahkan mengkonfigurasikan outproxy dalam I2PTunnel."
+
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+msgid ""
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+msgid "Warning: Invalid Destination"
+msgstr "Peringatan: Tujuan Tidak Valid"
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"The website destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:102
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following"
+" is bad."
+msgstr "Mungkin Anda menempelkan string Base 64 yang salah atau tautan yang Anda ikuti buruk."
+
+#: ../java/build/Proxy.java:103
+msgid "The I2P host could also be offline."
+msgstr "Host I2P mungkin juga sedang offline."
+
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Peringatan: Protokol Non-HTTP"
+
+#: ../java/build/Proxy.java:113
+msgid "The request uses a bad protocol."
+msgstr "Permintaan menggunakan protokol yang buruk."
+
+#: ../java/build/Proxy.java:114
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+msgstr "Proxy HTTP I2P mendukung hanya permintaan HTTP dan HTTPS."
+
+#: ../java/build/Proxy.java:115
+msgid "Other protocols such as FTP are not allowed."
+msgstr "Protokol lainnya seperti FTP tidak diizinkan."
+
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Anda mungkin ingin {0}mengulang{1} karena ini akan secara acak memilih ulang sebuah outproxy dari pool yang telah Anda tetapkan {2}disini{3} (jika Anda memiliki lebih dari satu yang dikonfigurasikan)."
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Jika Anda terus mengalami kesulitan Anda mungkin ingin mengedit daftar outproxy Anda {0}disini{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Periksa tautan atau temukan alamat Base 32 atau Base 64."
+
+#: ../java/build/Proxy.java:136
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Jika Anda memiliki alamat Base 64, {0}tambahkan alamat itu ke buku alamat Anda{1}."
+
+#: ../java/build/Proxy.java:137
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
+msgstr "Jika tidak, temukan Base 32 atau tautan alamat pembantu, atau gunakan tautan layanan lompatan dibawah."
+
+#: ../java/build/Proxy.java:138
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr "Sering melihat laman ini? Lihat {0}FAQ{1} untuk bantuan dalam {2}menambahkan beberapa langganan{3} ke buku alamat Anda."
+
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
+msgid "Warning: Invalid Request URI"
+msgstr "Peringatan: Permintaan URI Tidak Valid"
+
+#: ../java/build/Proxy.java:147
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr "Permintaan URI tidak valid, dan mungkin mengandung karakter ilegal."
+
+#: ../java/build/Proxy.java:148
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr "Jika Anda mengklik sebuah tautan, periksa akhiran URI atas segala karakter yang secara keliru ditambahkan oleh peramban."
+
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:156
+msgid ""
+"The HTTP outproxy was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:157
+msgid ""
+"The outproxy is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:168
+msgid "The HTTP Outproxy was not found."
+msgstr "Outproxy HTTP tidak ditemukan."
+
+#: ../java/build/Proxy.java:169
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr "Sedang offline, ada kemacetan pada jaringan, atau router Anda belum terintegrasi dengan baik dengan peer."
+
+#: ../java/build/Proxy.java:173
+msgid "Proxy Authorization Required"
+msgstr "Otorisasi Proxy Diperlukan"
+
+#: ../java/build/Proxy.java:174
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Otorisasi Proxy HTTP I2P Diperlukan"
+
+#: ../java/build/Proxy.java:175
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr "Proxy ini dikonfigurasikan untuk memerlukan nama pengguna dan kata sandi ketika mengakses."
+
+#: ../java/build/Proxy.java:176
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr "Silahkan masukkan nama pengguna dan kata sandi Anda, atau periksa {0}konfigurasi router{1} atau {2}konfigurasi I2PTunnel{3} Anda."
+
+#: ../java/build/Proxy.java:177
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
+msgstr "Untuk menonaktifkan otorisasi, hapus konfigurasi {0}i2ptunnel.proxy.auth=basic{1}, kemudian hentikan dan mulai ulang saluran Proxy HTTP."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
+msgid "This seems to be a bad destination:"
+msgstr "Ini sepertinya menjadi tujuan yang buruk."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2paddresshelper tidak dapat membantu Anda dengan tujuan seperti itu!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
+#, java-format
+msgid ""
+"To visit the destination in your host database, click <a "
+"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
+"click <a href=\"{1}\">here</a>."
+msgstr "Untuk mengunjungi tujuan dalam database host Anda, klik <a href=\"{0}\">disini</a>. Untuk mengunjungi tujuan addresshelper yang bertentangan, klik <a href=\"{1}\">disini</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
+msgid "Destination"
+msgstr "Tujuan"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Melanjutkan ke {0} tanpa menyimpan"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
+#, java-format
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
+#, java-format
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
+#, java-format
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Ditambahkan melalui alamat pembantu dari {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:164
+msgid "Added via address helper"
+msgstr "Ditambahkan melalui alamat pembantu"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:187
+msgid "router"
+msgstr "router"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:189
+msgid "master"
+msgstr "master"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:191
+msgid "private"
+msgstr "pribadi"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Mengalihkan ke {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "Menyimpan {0} ke buku alamat {1}, mengalihkan sekarang."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:211
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Gagal menyimpan {0} ke buku alamat {1}, mengalihkan sekarang."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213
+msgid "Click here if you are not redirected automatically."
+msgstr "Klik disini jika Anda tidak dialihkan secara otomatis."
diff --git a/apps/i2ptunnel/locale-proxy/messages_it.po b/apps/i2ptunnel/locale-proxy/messages_it.po
index b979423fe5b4b1b2d1019a3b513f7644ab8fcb40..76b68bc3b420730d82c6be9277be7e924ac8c841 100644
--- a/apps/i2ptunnel/locale-proxy/messages_it.po
+++ b/apps/i2ptunnel/locale-proxy/messages_it.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -33,9 +33,10 @@ msgstr ""
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Console del router"
@@ -44,9 +45,10 @@ msgstr "Console del router"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Console del router"
 
@@ -54,9 +56,10 @@ msgstr "Console del router"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configurazione"
@@ -65,9 +68,10 @@ msgstr "Configurazione"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Aiuto"
@@ -76,9 +80,10 @@ msgstr "Aiuto"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Rubrica"
@@ -126,8 +131,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -165,217 +170,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Destinazione tunnel"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Errore: Richiesta negata"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Errore: Accesso locale"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Il tuo browse non supporta gli iFrames."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Attenzione: Nessun Proxy di uscita configurato"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Destinazione locale"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "Il proxy HTTP non è avviato"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Autorizzazione Outproxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Autorizzazione Outproxy"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Questo proxy necessita username e password per l'accesso"
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -391,7 +419,7 @@ msgstr "Questa non sembra essere una buona destinazione:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper non ti può aiutare con una destinazione del genere!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -399,42 +427,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Per visitare la destinazione nel tuo database host, cliccare <a href=\"{0}\">qui</a>. \nPer visitare la destinazione addresshelper in conflitto, cliccare <a href=\"{1}\">qui</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destinazione"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Continua a {0} senza salvare"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica del router e continua verso l'eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica master e continua verso l'eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica privata e continua verso l'eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_nb.po b/apps/i2ptunnel/locale-proxy/messages_nb.po
index 893648e754e1089f68d9acbe277577c8c5cd8f73..2383d74126394abbfee0280169aefad824031248 100644
--- a/apps/i2ptunnel/locale-proxy/messages_nb.po
+++ b/apps/i2ptunnel/locale-proxy/messages_nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,9 +27,10 @@ msgstr ""
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Ruter Konsoll"
@@ -38,9 +39,10 @@ msgstr "Ruter Konsoll"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Ruter Konsoll"
 
@@ -48,9 +50,10 @@ msgstr "Ruter Konsoll"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Konfigurasjon"
@@ -59,9 +62,10 @@ msgstr "Konfigurasjon"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Hjelp"
@@ -70,9 +74,10 @@ msgstr "Hjelp"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Adressebok"
@@ -120,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -159,217 +164,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Tunnel destinasjon"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr ""
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr ""
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Lokal destinasjon"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "utproxy autorisasjon"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "utproxy autorisasjon"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -385,7 +413,7 @@ msgstr "Dette synes å være en dårlig destinasjon:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper kan ikke hjelpe deg med en destinasjon som dette!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -393,42 +421,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "For å besøke destinasjonen i din vert database, klikk <a href=\"{0}\">her</a>. For å å besøke motstridende adressehjelper destinasjon, klikk <a href=\"{1}\">her</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Vert"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destinasjon"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Fortsett til {0} uten å lagre"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Lagre {0} til ruter adressebok og fortsett til eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Save {0} til hoved adressebok og fortsett til eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Save {0} til privat adressebok og fortsett til eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_nl.po b/apps/i2ptunnel/locale-proxy/messages_nl.po
index 6fd556be4107b0e046e3269a6e3e2c07026826de..0eb2ff64a56a442e7b8aae93d97a4e6b41921386 100644
--- a/apps/i2ptunnel/locale-proxy/messages_nl.po
+++ b/apps/i2ptunnel/locale-proxy/messages_nl.po
@@ -5,12 +5,13 @@
 # 
 # Translators:
 # foo <foo@bar>, 2009
+# Nathan Follens, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,36 +22,39 @@ msgstr ""
 
 #: ../java/build/Proxy.java:5
 msgid "Information: New Host Name"
-msgstr ""
+msgstr "Informatie: nieuwe hostnaam"
 
 #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
-msgstr ""
+msgstr "Router console"
 
 #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
-msgstr ""
+msgstr "I2P router console"
 
 #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configuratie wijzigingen opgeslagen"
@@ -59,69 +63,71 @@ msgstr "Configuratie wijzigingen opgeslagen"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Toevoegen aan lokaal adresboek"
 
 #: ../java/build/Proxy.java:11
 msgid "Information: New Host Name with Address Helper"
-msgstr ""
+msgstr "Informatie: nieuwe hostnaam met adreshelper"
 
 #: ../java/build/Proxy.java:12
 msgid ""
 "The address helper link you followed is for a new host name that is not in "
 "your address book."
-msgstr ""
+msgstr "De adreshelperlink die je hebt gevolgd is voor een nieuwe hostnaam die zich niet in je adresboek bevindt."
 
 #: ../java/build/Proxy.java:13
 msgid "You may save this host name to your local address book."
-msgstr ""
+msgstr "Je kan deze hostnaam opslaan in je lokale adresboek."
 
 #: ../java/build/Proxy.java:14
 msgid ""
 "If you save it to your address book, you will not see this message again."
-msgstr ""
+msgstr "Als je ze opslaat in je adresboek zal je dit bericht niet meer zien."
 
 #: ../java/build/Proxy.java:15
 msgid ""
 "If you do not save it, the host name will be forgotten after the next router"
 " restart."
-msgstr ""
+msgstr "Als je ze niet opslaat, zal de hostnaam vergeten worden de volgende keer dat de router herstart."
 
 #: ../java/build/Proxy.java:16
 msgid ""
 "If you do not wish to visit this host, click the \"back\" button on your "
 "browser."
-msgstr ""
+msgstr "Als je deze host niet wil bezoeken, klik dan op de \"terug\"-knop in je browser."
 
 #: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
 msgid "Warning: Destination Key Conflict"
-msgstr ""
+msgstr "Waarschuwing: bestemmingssleutelconflict"
 
 #: ../java/build/Proxy.java:24
 msgid ""
 "The addresshelper link you followed specifies a different destination key "
 "than a host entry in your host database."
-msgstr ""
+msgstr "De adreshelperlink die je hebt gevolgd specifieerde een verschillende bestemmingssleutel dan een host-entry in je hostdatabase."
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -129,253 +135,276 @@ msgid ""
 "You can resolve the conflict by considering which key you trust, and either "
 "discarding the addresshelper link, discarding the host entry from your host "
 "database, or naming one of them differently."
-msgstr ""
+msgstr "Je kan het conflict oplossen door te bepalen welke sleutel je vertrouwt, en vervolgens ofwel de adreshelperlink te verwijderen, de host-entry uit je hostdatabase te verwijderen, of een ervan anders te noemen."
 
 #: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33
 msgid "Warning: Bad Address Helper"
-msgstr ""
+msgstr "Waarschuwing: slechte adreshelper"
 
 #: ../java/build/Proxy.java:34
 #, java-format
 msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
-msgstr ""
+msgstr "De helpersleutel in de URL ({0}i2paddresshelper={1}) kan niet opgelost worden."
 
 #: ../java/build/Proxy.java:35
 msgid "It seems to be garbage data, or a mistyped Base 32 address."
-msgstr ""
+msgstr "Het lijkt op rommeldata, of een verkeerd getypt Base-32 adres."
 
 #: ../java/build/Proxy.java:36
 msgid ""
 "Check your URL to try and fix the helper key to be a valid Base 32 hostname "
 "or Base 64 key."
-msgstr ""
+msgstr "Controleer je URL om te proberen de helpersleutel te herstellen om een geldige Base-32 hostnaam of Base-64 sleutel te zijn."
 
 #: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
 msgid "Warning: Request Denied"
-msgstr ""
+msgstr "Waarschuwing: aanvraag geweigerd"
 
 #: ../java/build/Proxy.java:44
 msgid "You attempted to connect to a non-I2P website or location."
-msgstr ""
+msgstr "Je probeerde te verbinden met een niet-I2P website of locatie."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
-msgstr ""
+msgstr "Je wil misschien {0}opnieuw proberen{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Tunnel Destinations"
 
-#: ../java/build/Proxy.java:56
-msgid "Error: Request Denied"
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "Kon niet verbinden met de volgende bestemming:"
+
+#: ../java/build/Proxy.java:65
+msgid "Error: Request Denied"
+msgstr "Fout: toegang geweigerd"
+
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
-msgstr ""
+msgstr "Fout: lokale toegang"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
-msgstr ""
+msgstr "Je browser is verkeerd ingesteld."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
-msgstr ""
+msgstr "Gebruik de proxy niet om de routerconsole, localhost of lokale LAN-bestemmingen te bereiken."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
-msgstr ""
+msgstr "Waarschuwing: geen outproxy ingesteld"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
-msgstr ""
+msgstr "Je aanvraag was voor een site buiten I2P, maar je hebt geen HTTP-outproxy ingesteld."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
-msgstr ""
+msgstr "Gelieve een outproxy in te stellen in I2PTunnel."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Lokale destination"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
-msgstr ""
+msgstr "Misschien heb je de verkeerde Base-64-string gekopieerd of is de link die je volgt slecht."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
-msgstr ""
+msgstr "De I2P-host kan ook offline zijn."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
-msgstr ""
+msgstr "Waarschuwing: non-HTTP protocol"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
-msgstr ""
+msgstr "De aanvraag gebruikt een slecht protocol."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
-msgstr ""
+msgstr "De I2P HTTP-proxy ondersteunt enkel HTTP en HTTPs-aanvragen."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
+msgstr "Andere protocollen zoals FTP zijn niet toegestaan."
+
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "De HTTP-outproxy kan niet bereikt worden omdat deze versleutelingsopties gebruikt die niet worden ondersteund door je I2P of Java-versie."
+
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Je wil misschien {0}opnieuw proberen{1} aangezien dit een willekeurige outproxy van de pool die je {2}hier{3} hebt gedefinieerd (als je er meer dan een hebt ingesteld) opnieuw zal selecteren."
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Als je problemen blijft ondervinden wil je misschien je outproxy-lijst {0}hier{1} wijzigen."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
-msgstr ""
+msgstr "Controleer de link of vind een Base-32 of Base-64-adres."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
-msgstr ""
+msgstr "Als je het Base-64-adres hebt, {0}voeg het dan toe aan je adresboek{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
-msgstr ""
+msgstr "Zoniet, vind een Base-32 of adreshelperlink, of gebruik een springservicelink hieronder."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
-msgstr ""
+msgstr "Zie je deze pagina vaak? Bekijk dan {0}de VGV{1} voor hulp met {2}abonnementen toevoegen{3} aan je adresboek."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
-msgstr ""
+msgstr "Waarschuwing: ongeldige aanvraag-URI"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
-msgstr ""
+msgstr "De aanvraag-URI is ongeldig, en bevat waarschijnlijk illegale karakters."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
-msgstr ""
+msgstr "Als je op een link klikte, controleer dan het einde van de URI voor karakters die de browser er per abuis aan heeft toegevoegd."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
-msgstr ""
+msgstr "De HTTP-outproxy kan niet bereikt worden omdat de leaseset niet is gevonden."
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
-msgstr ""
-
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
+msgstr "De outproxy is waarschijnlijk plat, maar het netwerk kan ook overbelast zijn."
 
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "De HTTP proxy is niet ingeschakeld"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
-msgstr ""
+msgstr "Deze is offline, het netwerk is overbelast, of je router is nog niet goed geïntegreerd met peers."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Uitgaande Proxy Autorisatie"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Uitgaande Proxy Autorisatie"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
-msgstr ""
+msgstr "Deze proxy is ingesteld om een gebruikersnaam en wachtwoord te vereisen voor toegang."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
-msgstr ""
+msgstr "Gelieve je gebruikersnaam en wachtwoord in te geven, of controleer je {0}routerinstellingen{1} of {2}I2PTunnel-instellingen{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
 "{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
 "tunnel."
-msgstr ""
+msgstr "Om authorisatie uit te zetten verwijder je de configuratie {0}i2ptunnel.proxy.auth=basic{1} en stop en herstart je vervolgens de HTTP-proxy tunnel."
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "This seems to be a bad destination:"
@@ -383,9 +412,9 @@ msgstr "Tunnel Destinations"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "i2paddresshelper cannot help you with a destination like that!"
-msgstr ""
+msgstr "i2padresshelper kan je niet helpen met zo'n bestemming!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -393,63 +422,63 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Om de destination in je host database te bezoeken, klik <a href=\"{0}\">hier</a>. Om de conflicterende adreshelper destination te bezoeken, klik <a href=\"{1}\">hier</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
-msgstr ""
+msgstr "Bestemmingsleaseset niet gevonden"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
-msgstr ""
+msgstr "Base-32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destination"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
-msgstr ""
+msgstr "Doorgaan naar {0} zonder op te slaan"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
 msgid "Added via address helper from {0}"
-msgstr ""
+msgstr "Toegevoegd via adreshelper vanaf {0}"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:164
 msgid "Added via address helper"
-msgstr ""
+msgstr "Toegevoegd via adreshelper"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:187
 msgid "router"
-msgstr ""
+msgstr "router"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:189
 msgid "master"
-msgstr ""
+msgstr "meester"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:191
 msgid "private"
-msgstr ""
+msgstr "privé"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198
 #, java-format
@@ -459,13 +488,13 @@ msgstr "Updaten van {0}"
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210
 #, java-format
 msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr ""
+msgstr "{0} in het {1} adresboek opgeslagen, je wordt nu doorgestuurd."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:211
 #, java-format
 msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr ""
+msgstr "Opslaan van {0} in het {1} adresboek mislukt, je wordt nu doorgestuurd."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213
 msgid "Click here if you are not redirected automatically."
-msgstr ""
+msgstr "Klik hier als je niet automatisch wordt doorgestuurd."
diff --git a/apps/i2ptunnel/locale-proxy/messages_pl.po b/apps/i2ptunnel/locale-proxy/messages_pl.po
index 167ceaf21895984f4600a993642fe589c287c38d..393a28a052191d41cb8898311c9630e20601ad59 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pl.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pl.po
@@ -6,14 +6,16 @@
 # Translators:
 # PolishAnon <b790979@klzlk.com>, 2012
 # Warton <businesshehe@yahoo.com>, 2011-2012
+# polacco <polacco@i2pmail.org>, 2015
+# seb, 2015
 # Smert i2p <Smert@safe-mail.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-17 22:00+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,36 +25,39 @@ msgstr ""
 
 #: ../java/build/Proxy.java:5
 msgid "Information: New Host Name"
-msgstr ""
+msgstr "Informacja: nowa nazwa hosta"
 
 #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
-msgstr "Konsola Routera"
+msgstr "Konsola węzła"
 
 #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
-msgstr "Konsola Routera"
+msgstr "Konsola węzła I2P"
 
 #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Konfiguracja"
@@ -61,9 +66,10 @@ msgstr "Konfiguracja"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Pomoc"
@@ -72,9 +78,10 @@ msgstr "Pomoc"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Książka adresowa"
@@ -91,28 +98,28 @@ msgstr ""
 
 #: ../java/build/Proxy.java:13
 msgid "You may save this host name to your local address book."
-msgstr ""
+msgstr "Możesz zapisać tę nazwę hosta w swojej lokalnej książce adresowej."
 
 #: ../java/build/Proxy.java:14
 msgid ""
 "If you save it to your address book, you will not see this message again."
-msgstr ""
+msgstr "Jeśli zapiszesz do książki adresowej, nie zobaczysz ponowniej tej wiadomości."
 
 #: ../java/build/Proxy.java:15
 msgid ""
 "If you do not save it, the host name will be forgotten after the next router"
 " restart."
-msgstr ""
+msgstr "Jeśli nie zapiszesz, nazwa zostanie zapomniana przy wyłączeniu lub restarcie węzłą I2P."
 
 #: ../java/build/Proxy.java:16
 msgid ""
 "If you do not wish to visit this host, click the \"back\" button on your "
 "browser."
-msgstr ""
+msgstr "Jeśli nie chcesz odwiedzać tego hosta, kliknij guzik \"wstecz\" w swojej przeglądarce www."
 
 #: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
 msgid "Warning: Destination Key Conflict"
-msgstr ""
+msgstr "Ostrzeżenie: konflikt kluczy celów"
 
 #: ../java/build/Proxy.java:24
 msgid ""
@@ -122,8 +129,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -144,7 +151,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:35
 msgid "It seems to be garbage data, or a mistyped Base 32 address."
-msgstr ""
+msgstr "Wygląda to na przypadkowe dane lub błędny adres Base32."
 
 #: ../java/build/Proxy.java:36
 msgid ""
@@ -154,224 +161,247 @@ msgstr ""
 
 #: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
 msgid "Warning: Request Denied"
-msgstr ""
+msgstr "Ostrzeżenie: zapytanie odrzucone"
 
 #: ../java/build/Proxy.java:44
 msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr ""
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "Strona niedostępna."
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
-msgstr ""
+msgstr "Możesz {0}powtórzyć{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "nazwa lub cel"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "Strona jest niedostępna, gdyż używa metody szyfrowania nieobsługiwanej przez Twój węzeł I2P lub javę."
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "Nie można połączyć z następującym celem:"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
-msgstr ""
+msgstr "Błąd: zapytanie odrzucone"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
-msgstr ""
+msgstr "Błąd: adres lokalny"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
-msgstr ""
+msgstr "Twoja przeglądarka www jest niepoprawnie skonfigurowana."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
-msgstr ""
+msgstr "Nie używaj proxy do połączeń z konsolą węzła I2P, hostem lokalnym (127.0.0.1) lub hostami w sieci lokalnej (LAN)."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
-msgstr ""
+msgstr "Ostrzeżenie: nie ustawiono proxy wyjściowego"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr ""
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "Strona www była nieosiągalna."
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr ""
+msgstr "Strona jest wyłączona lub siec jest zatłoczona lub Twój węzeł nie jest dobrze zintegrowany z siecią I2P."
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
-msgstr "Cel localny"
+msgstr "Ostrzeżenie: nieprawidłowy cel"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
-msgstr ""
+msgstr "Host mógł być również wyłączony."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
-msgstr ""
+msgstr "Ostrzeżenie: protokół inny niż HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
-msgstr ""
+msgstr "Zapytanie używa złego protokołu."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
-msgstr ""
+msgstr "To proxy obsługuje wyłącznie protokoły HTTP i HTTPS."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
-msgstr ""
+msgstr "Inne protokoły, jak np. FTP, są niepoprawne."
+
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "Proxy wyjściowe niedostępne"
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "Proxy wyjściowe jest niedostępne, gdyż używa metody szyfrowania nieobsługiwanej przez Twój węzeł I2P lub javę."
+
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "Nieznana strona www"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "Nie znaleziono strony www w książce adresowej"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
-msgstr ""
+msgstr "Jeśli masz adres Base64, {0}dodaj go do swojej książki adresowej{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr ""
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "Nie znaleziono proxy wyjściowego"
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
-msgstr ""
+msgstr "Nie znaleziono proxy wyjściowego HTTP."
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Autoryzacja Outproxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Autoryzacja Outproxy"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
-msgstr ""
+msgstr "Proszę wpisz swoją nazwę użytkownika i hasło, albo sprawdź {0}router konfigurację{1} lub {2}I2PTunnel konfigurację{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -387,7 +417,7 @@ msgstr "Wydaje się to być złym celem:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper, pomocnik adresowy i2p, nie może pomóc ci z takim celem!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -395,42 +425,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "By odwiedzić cel w bazie danych twojego hosta, naciśnij <a href=\"{0}\">tutaj</a>. By odwiedzić konfliktujący cel pomocnika adresów, naciśnij <a href=\"{1}\">tutaj</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
-msgstr ""
+msgstr "Base32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Cel"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Kontynuuj do {0} bez zapisywania"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Zapisz {0} do książki adresowej rutera i kontynuuj do eepsite'u"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Zapisz {0} do książki adresowej węzła i przejdź na stronę www"
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Zapisz {0} do głównej książki adresowej i kontynuuj do eepsite'u"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Zapisz {0} do głównej książki adresowej i przejdź na stronę www"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Zapisz {0} do prywatnej książki adresowej i kontynuuj do eepsite'u"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Zapisz {0} do prywatnej książki adresowej i przejdź na stronę www"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
@@ -443,15 +473,15 @@ msgstr "Dodano poprzez pomocnika adresów"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:187
 msgid "router"
-msgstr ""
+msgstr "węzła"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:189
 msgid "master"
-msgstr ""
+msgstr "głównej"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:191
 msgid "private"
-msgstr ""
+msgstr "prywatnej"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198
 #, java-format
@@ -461,13 +491,13 @@ msgstr "Przekierowywuje do {0}"
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210
 #, java-format
 msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr "Zapisano {0} do książki adresowej {1}, przekierowywuje."
+msgstr "Zapisano {0} do książki adresowej {1}, przekierowuję."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:211
 #, java-format
 msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr "Nie udało sie zapisać {0} do książki adresowej {1}, przkierowywuje."
+msgstr "Nie udało sie zapisać {0} do książki adresowej {1}, przkierowuję."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213
 msgid "Click here if you are not redirected automatically."
-msgstr "Sprawdź tutaj jeżeli nie jesteś automatycznie przekierowany."
+msgstr "Kliknij tutaj, jeżeli nie jesteś automatycznie przekierowany."
diff --git a/apps/i2ptunnel/locale-proxy/messages_pt.po b/apps/i2ptunnel/locale-proxy/messages_pt.po
index 67fc849be6fed7c8cc7bab09812fb848808579c5..3d918ef7b111ae8c7d25d61fb9d204acf6e65869 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pt.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pt.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -32,9 +32,10 @@ msgstr "Informação: Novo nome de anfitrião."
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Painel do Roteador"
@@ -43,9 +44,10 @@ msgstr "Painel do Roteador"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Painel do Roteador"
 
@@ -53,9 +55,10 @@ msgstr "Painel do Roteador"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configuração"
@@ -64,9 +67,10 @@ msgstr "Configuração"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Ajuda"
@@ -75,9 +79,10 @@ msgstr "Ajuda"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Livro de endereços"
@@ -125,9 +130,9 @@ msgstr "A ligação de ajudante de endereço que seguiste especifica um destinat
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Alguém pode estar a tentar se passar por outro site da rede I2P, ou pessoas deram a dois sites da rede I2P distintos o mesmo nome."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr ""
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -164,217 +169,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Tentaste acessar um site ou recurso fora da rede I2P."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Aviso: Site na rede I2P inalcançável."
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Talvez queira {0}retentar{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Não foi possível encontrar o seguinte destinatário:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Erro: Pedido negado"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Erro: Endereço local"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Seu navegador não suporta iFrames."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "Não uses o intermediador (proxy) para acessar o painel controlador do roteador, o autoendereço, ou endereços na rede local."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Aviso: nenhum intermediador (proxy) externo a rede I2P configurado"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Teu pedido de acesso foi para um site fora da rede I2P, mas não há nenhum intermediador (proxy) HTTP externo a rede I2P configurado."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configura um intermediador (proxy) externo a rede I2P no túnel I2P"
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "O site na rede I2P não está alcançável."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "O site na rede I2P está fora do ar, há congestionamento de dados, ou teu roteador não está bem integrado com os participantes."
+msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Aviso: Destinatário inválido"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "O destinatário, um site na rede I2P, especificado não é valido, ou está inalcançável."
+msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Talvez colaste uma cadeia de caracteres na base 64 errada ou a ligação que seguiste não serve."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "Também existe a possibilidade do anfitrião na rede I2P estar fora do ar."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Aviso: Protocolo fora do padrão HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "O pedido usa um protocolo ruim."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Aviso: Site na rede I2P desconhecido"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Aviso: Site na rede I2P não encontrado no livro de endereços"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "O site na rede I2P não foi encontrado no livro de endereços do seu roteador"
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Talvez queiras {0}tentar novamente{1}, o que irá selecionar aleatoriamente um intermediador externo a rede I2P da lista que definiste {2}aqui{3} (Se tens mais de um configurado)."
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Se continuas a ter problemas, podeis modificar tua lista de intermediadores externos a rede I2P {0}aqui{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Verifique a ligação ou encontra um endereço na base 32 ou base 64."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Se tens o endereço na base 64, {0}adiciona-o para teu livro de endereços{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "Senão, encontra um endereço na base 32 ou uma ligação de ajudante para endereço, ou um dos serviços buscadores de ligações abaixo."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "Estar a ver esta página frequentemente? Veja as {0}perguntas frequentes{1} para ajuda em {2}incluindo novos registros{3} em teu livro de endereços."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Aviso: URI inválida"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "A URI informada é inválida, e provavelmente contém caracteres ilegais."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Se acessaste uma ligação, verifique o final da URI para quaisquer caracteres que o navegador possa, por engano, ter adicionado."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Aviso: Intermediador externo fora da rede I2P não encontrado"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Talvez queiras {0}tentar novamente{1}, o que irá selecionar aleatoriamente um intermediador externo a rede I2P da lista que definiste {2}aqui{3} (Se tens mais de um configurado)."
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Se continuas a ter problemas, podeis modificar tua lista de intermediadores externos a rede I2P {0}aqui{1}."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "O proxy HTTP não está alcançável"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Está fora do ar, há congestionamento de dados, ou teu roteador não está bem integrado com os participantes."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Autorização do proxy de saída"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Autorização do proxy de saída"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Este intermediador (proxy) está configurado para pedir um nome de usuário e palavra-passe para ser acessado."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Por favor,  insira teu nome de usuário e palavra-passe, ou verifique tua {0}configuração do roteador{1} ou {2}configuração do túnel I2P{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -390,7 +418,7 @@ msgstr "Este destino parece estar incorreto:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "Auxiliar de endereços não pode ajudar em destinos como este!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -398,42 +426,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Para visitar o destino da sua base de dados, clique <a href=\"{0}\">aqui</a>. Para visitar o endereço de ajuda do conflito, clique <a href=\"{1}\">aqui</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Continuar para {0} sem salvar"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Salvar {0} ao livro de endereços do roteador e continuar no eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Salvar {0} ao livro de endereços master e continuar no eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Salvar {0} no livro de endereços particular e continuar no eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
index a75d7ee46c1489a56bc8712144bfa4296aad123b..c26fd61b93a7cf4a434c369a7faa74accfa89de3 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -28,9 +28,10 @@ msgstr "Informação: novo nome de host"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Painel do roteador"
@@ -39,9 +40,10 @@ msgstr "Painel do roteador"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Painel do roteador I2P"
 
@@ -49,9 +51,10 @@ msgstr "Painel do roteador I2P"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configurações"
@@ -60,9 +63,10 @@ msgstr "Configurações"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Ajuda"
@@ -71,9 +75,10 @@ msgstr "Ajuda"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Livro de endereços"
@@ -121,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -160,217 +165,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Aviso: eepsite inalcançável"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Talvez você queira {0}tentar novamente{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Não foi possível encontrar o seguinte destino:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Erro: Pedido Negado"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Erro: Acesso Local"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "O seu navegador está mal-configurado."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Aviso: Nenhum proxy de saída configurado"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "O seu pedido foi para um site fora da I2P, mas você não possui nenhum proxy de saída para HTTP configurado"
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configurar um proxy de saída no túnel I2P."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "O eepsite não se encontra alcançável."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Aviso: Destino inválido"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "O host I2P pode estar offline também."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Aviso: Protocolo não-HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "O pedido usa um protocolo inadequado."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Aviso: eepsite desconhecido"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Aviso: eepsite não encontrado no livro de endereços"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "O eepsite não foi encontrado no livro de endereços do seu roteador."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Verifique o linque ou procure por um endereço de Base 32 ou Base 64."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Se você tem o endereço de Base 64, {0}adicione-o ao seu livro de endereços{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Aviso: pedido de URI inválido"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "O pedido de URI é inválido e pode conter caractéres ilegítimos."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Aviso: proxy de saída não encontrado"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Autorização do proxy necessária"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "É necessária a autorização do proxy http da I2P"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Este proxy está configurado para pedir um nome de usuário e uma senha para acesso."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Por favor, forneça o seu nome de usuário e senha, ou verifique sua {0}configuração de roteamento{1} ou {2}configuração do túnel I2P{3};"
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -386,7 +414,7 @@ msgstr "Parece que este destino é inadequado:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "O auxiliar de endereços da I2P não pode ajudá-lo com um destino como este!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -394,41 +422,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Host"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_ro.po b/apps/i2ptunnel/locale-proxy/messages_ro.po
index 578794703cf50f3135b609c0d0be5e41dcc697b4..5a2c6ff3f4c531f176a1db908f99064fddc91c28 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ro.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ro.po
@@ -2,469 +2,460 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the i2ptunnel package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-01 20:04+0000\n"
-"PO-Revision-Date: 2013-11-12 08:28+0000\n"
-"Last-Translator: polearnik <polearnik@mail.ru>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/"
-"ro/)\n"
-"Language: ro\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
-msgid "Warning: Outproxy Not Found"
-msgstr "Atenție: Outproxy Nu a fost găsit"
+#: ../java/build/Proxy.java:5
+msgid "Information: New Host Name"
+msgstr "Informații: Nume de gazda nou"
 
 #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
-#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
-#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
-#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:104
-#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
+#: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Consola router"
 
 #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
-#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
-#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
-#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:105
-#: ../java/build/Proxy.java:117 ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
+#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
+#: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "I2P consola router"
 
 #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
-#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
-#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
-#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:80
-#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:106
-#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Configurație"
 
 #: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
-#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
-#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
-#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:81
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:107
-#: ../java/build/Proxy.java:119 ../java/build/Proxy.java:129
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Ajutor"
 
 #: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
-#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
-#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
-#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:82
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:108
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:130
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Agendă"
 
+#: ../java/build/Proxy.java:11
+msgid "Information: New Host Name with Address Helper"
+msgstr "Informații:Nume de gazda nou cu adress helper"
+
 #: ../java/build/Proxy.java:12
-msgid "The HTTP Outproxy was not found."
-msgstr "HTTP Outproxy nu a fost găsit."
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr "Link-ul de adress helper pe care a urmat este pentru un nume de gazdă nou, care nu este în agendă."
 
 #: ../java/build/Proxy.java:13
-msgid ""
-"It is offline, there is network congestion, or your router is not yet well-"
-"integrated with peers."
-msgstr ""
-"Acesta este deconectat, este congestionarea rețelei, sau router-ul nu este "
-"încă bine integrat cu colegii."
+msgid "You may save this host name to your local address book."
+msgstr "Puteți salva acest nume gazdă în agenda dvs. locală."
 
 #: ../java/build/Proxy.java:14
-#, java-format
 msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-"Este posibil să doriți să {0}  încercați din nou {1} ca acest lucru se va "
-"selecta din nou la întâmplare un outproxy din pool pe care l-ați definit {2} "
-"aici {3} (dacă aveți mai mult de unul configurate)."
+"If you save it to your address book, you will not see this message again."
+msgstr "Dacă-l salvați în agenda dvs., nu veți mai vedea acest mesaj."
 
 #: ../java/build/Proxy.java:15
-#, java-format
 msgid ""
-"If you continue to have trouble you may want to edit your outproxy list {0}"
-"here{1}."
-msgstr ""
-"Dacă aveți în continuare probleme, este posibil să doriți să editați lista "
-"de outproxy {0} aici {1}."
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
+msgstr "Dacă nu-l salvați, numele de gazdă va fi uitat după următoarea repornire router."
 
-#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
-#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:102
-msgid "Could not find the following destination:"
-msgstr "Nu am putut găsi următoarea destinație:"
-
-#: ../java/build/Proxy.java:17
-msgid "Error: Request Denied"
-msgstr "Eroare: Cerere interzisa"
+#: ../java/build/Proxy.java:16
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr "Dacă nu doriți să vizitați această gazdă, faceți clic pe butonul \"Înapoi\" din browser"
 
-#: ../java/build/Proxy.java:23
-msgid "Error: Local Access"
-msgstr "Eroare: acces local"
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+msgid "Warning: Destination Key Conflict"
+msgstr "Atenție: Conflictul destinație-cheie"
 
 #: ../java/build/Proxy.java:24
-msgid "Your browser is misconfigured."
-msgstr "Browser-ul dumneavoastră este configurat incorect."
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr "Link-ul addresshelper ați specificat o cheie de destinație diferită de o intrare în baza de date gazdă."
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Do not use the proxy to access the router console, localhost, or local LAN "
-"destinations."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
-"Nu utilizați proxy pentru a accesa consola router, localhost, sau destinații "
-"LAN locale."
 
 #: ../java/build/Proxy.java:26
-msgid "Warning: Eepsite Unknown"
-msgstr "Atenție: Eepsite Necunoscut"
-
-#: ../java/build/Proxy.java:32
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Atenție: Eepsite nu a fost găsit în Agenda"
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr "Puteți rezolva conflictul, luând în considerare cheie in care aveți încredere, și aruncând link addresshelper, aruncând intrarea gazda din baza de date gazdă, sau denumirea unului dintre ei diferit."
 
-#: ../java/build/Proxy.java:33
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Eepsite nu a fost gasit in Agenda ruterului."
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33
+msgid "Warning: Bad Address Helper"
+msgstr "Atenție: Adress Helper incorect"
 
 #: ../java/build/Proxy.java:34
-msgid "Check the link or find a Base 32 or Base 64 address."
-msgstr "Verificați link-ul sau găsiti adresa Base 32 sau  adresa Base 64."
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr "Cheia ajutor în URL-ul ({0} i2paddresshelper = {1}) nu este rezolvabila."
 
 #: ../java/build/Proxy.java:35
-#, java-format
-msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
-msgstr "Dacă aveți adresa Base 64, {0} adăugați-l la Agenda dvs. {1}."
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr "Se pare a fi date de gunoi, sau de o bază adresa 32 introdusă greșit."
 
 #: ../java/build/Proxy.java:36
 msgid ""
-"Otherwise, find a Base 32 or address helper link, or use a jump service link "
-"below."
-msgstr ""
-"În caz contrar, găsiți o bază 32 sau link-ul adress helper, sau folositi  "
-"link-ul de serviciu-salt de mai jos."
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr "Verificați URL-ul dvs. pentru a încercarea și stabilirea cheii de ajutor pentru a fi nume de gazdă Base34 sau cheie Base 64 validă."
 
-#: ../java/build/Proxy.java:37
-#, java-format
-msgid ""
-"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
-"subscriptions{3} to your addressbook."
-msgstr ""
-"Vedeti aceasta pagina des? Vezi {0}  FAQ {1} pentru ajutor în {2} adăugarea "
-"unor abonamente {3} la Agenda dumneavoastră."
+#: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
+msgid "Warning: Request Denied"
+msgstr "Atenție: Cerere interzisa"
 
-#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
-msgid "Warning: Invalid Request URI"
-msgstr "Atenție: URI de solicitare incorect"
+#: ../java/build/Proxy.java:44
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Ați încercat să vă conectați la un site sau locație non-I2P ."
 
-#: ../java/build/Proxy.java:46
-msgid "The request URI is invalid, and probably contains illegal characters."
-msgstr "Cererea URI este incorecta, și, probabil, contine caractere ilegale."
+#: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
 
-#: ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:52
+msgid "The website was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:53
 msgid ""
-"If you clicked a link, check the end of the URI for any characters the "
-"browser has mistakenly added on."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
-"Dacă ați făcut clic pe un link, verificați sfârșitul URI pentru orice "
-"caractere, pe care browser-ul a adăugat din greșeală ."
 
-#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
-msgid "Warning: Invalid Destination"
-msgstr "Atenție: Destinație incorecta"
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Este posibil să doriți să {0} {1} încercați din nou."
+
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
+msgid "Could not find the following destination:"
+msgstr "Nu am putut găsi următoarea destinație:"
 
-#: ../java/build/Proxy.java:55
+#: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
-"unreachable."
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
 msgstr ""
-"Destinația eepsite specificat nu a fost valabila, sau a fost inaccesibila."
 
-#: ../java/build/Proxy.java:56
-msgid ""
-"Perhaps you pasted in the wrong Base 64 string or the link you are following "
-"is bad."
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
 msgstr ""
-"Poate că ați inserat șir Base 64 greșit sau link-ul pe care urmează este "
-"incorect."
 
-#: ../java/build/Proxy.java:57
-msgid "The I2P host could also be offline."
-msgstr "I2P gazdă a putea fi, de asemenea, offline."
+#: ../java/build/Proxy.java:65
+msgid "Error: Request Denied"
+msgstr "Eroare: Cerere interzisa"
 
-#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:101
-#, java-format
-msgid "You may want to {0}retry{1}."
-msgstr "Este posibil să doriți să {0} {1} încercați din nou."
+#: ../java/build/Proxy.java:71
+msgid "Error: Local Access"
+msgstr "Eroare: acces local"
 
-#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
-msgid "Warning: Request Denied"
-msgstr "Atenție: Cerere interzisa"
+#: ../java/build/Proxy.java:72
+msgid "Your browser is misconfigured."
+msgstr "Browser-ul dumneavoastră este configurat incorect."
 
-#: ../java/build/Proxy.java:67
-msgid "You attempted to connect to a non-I2P website or location."
-msgstr "Ați încercat să vă conectați la un site sau locație non-I2P ."
+#: ../java/build/Proxy.java:73
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr "Nu utilizați proxy pentru a accesa consola router, localhost, sau destinații LAN locale."
 
-#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Atenție: Outproxy nu este configurată"
 
-#: ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
-msgstr ""
-"Cererea Dvs a fost de un site in afara de I2P, dar nu aveți nici HTTP "
-"outproxy configurat."
+msgstr "Cererea Dvs a fost de un site in afara de I2P, dar nu aveți nici HTTP outproxy configurat."
 
-#: ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Vă rugăm să configurați un outproxy în I2PTunnel."
 
-#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:83
-msgid "Warning: Destination Key Conflict"
-msgstr "Atenție: Conflictul destinație-cheie"
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr ""
 
-#: ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:91
 msgid ""
-"The addresshelper link you followed specifies a different destination key "
-"than a host entry in your host database."
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
 msgstr ""
-"Link-ul addresshelper ați specificat o cheie de destinație diferită de o "
-"intrare în baza de date gazdă."
 
-#: ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+msgid "Warning: Invalid Destination"
+msgstr "Atenție: Destinație incorecta"
+
+#: ../java/build/Proxy.java:101
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given "
-"two eepsites identical names."
+"The website destination specified was not valid, or was otherwise "
+"unreachable."
 msgstr ""
-"Cineva ar putea fi încercă să imita un alt eepsite, sau cineva au dat două "
-"nume eepsite identice."
 
-#: ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:102
 msgid ""
-"You can resolve the conflict by considering which key you trust, and either "
-"discarding the addresshelper link, discarding the host entry from your host "
-"database, or naming one of them differently."
+"Perhaps you pasted in the wrong Base 64 string or the link you are following"
+" is bad."
+msgstr "Poate că ați inserat șir Base 64 greșit sau link-ul pe care urmează este incorect."
+
+#: ../java/build/Proxy.java:103
+msgid "The I2P host could also be offline."
+msgstr "I2P gazdă a putea fi, de asemenea, offline."
+
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Atenție: protocolul Non-HTTP"
+
+#: ../java/build/Proxy.java:113
+msgid "The request uses a bad protocol."
+msgstr "Cererea utilizează un protocol incorect."
+
+#: ../java/build/Proxy.java:114
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
-"Puteți rezolva conflictul, luând în considerare cheie in care aveți "
-"încredere, și aruncând link addresshelper, aruncând intrarea gazda din baza "
-"de date gazdă, sau denumirea unului dintre ei diferit."
 
-#: ../java/build/Proxy.java:87
-msgid "Proxy Authorization Required"
-msgstr "Autentificare proxy necesară"
+#: ../java/build/Proxy.java:115
+msgid "Other protocols such as FTP are not allowed."
+msgstr ""
 
-#: ../java/build/Proxy.java:88
-msgid "I2P HTTP Proxy Authorization Required"
-msgstr "Autentificare I2P HTTP proxy necesară"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
 
-#: ../java/build/Proxy.java:89
-msgid "This proxy is configured to require a username and password for access."
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
-"Acest proxy este configurat pentru a necesita un nume de utilizator și o "
-"parolă de acces."
 
-#: ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
 #, java-format
 msgid ""
-"Please enter your username and password, or check your {0}router "
-"configuration{1} or {2}I2PTunnel configuration{3}."
-msgstr ""
-"Va rugam sa introduceti numele de utilizator si parola, sau verifica {0} "
-"configurația router {1} sau {2} configurare I2PTunnel {3}."
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Este posibil să doriți să {0}  încercați din nou {1} ca acest lucru se va selecta din nou la întâmplare un outproxy din pool pe care l-ați definit {2} aici {3} (dacă aveți mai mult de unul configurate)."
 
-#: ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
 #, java-format
 msgid ""
-"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
-"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
-msgstr ""
-"Pentru a dezactiva autorizare, stergeti  configurarea {0} i2ptunnel.proxy."
-"auth = basic {1}, apoi opriți și reporniți tunelul proxy HTTP."
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Dacă aveți în continuare probleme, este posibil să doriți să editați lista de outproxy {0} aici {1}."
 
-#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
-msgid "Warning: Eepsite Unreachable"
-msgstr "Atenție: Eepsite indisponibil"
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
 
-#: ../java/build/Proxy.java:99
-msgid "The eepsite was not reachable."
-msgstr "Eepsite nu a fost accesibil."
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
 
-#: ../java/build/Proxy.java:100
-msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
-"yet well-integrated with peers."
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
 msgstr ""
-"Eepsite este deconectat, este congestionarea rețelei, sau router-ul nu este "
-"încă bine integrat cu colegii."
 
-#: ../java/build/Proxy.java:103
-msgid "Information: New Host Name"
-msgstr "Informații: Nume de gazda nou"
+#: ../java/build/Proxy.java:135
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Verificați link-ul sau găsiti adresa Base 32 sau  adresa Base 64."
 
-#: ../java/build/Proxy.java:109
-msgid "Information: New Host Name with Address Helper"
-msgstr "Informații:Nume de gazda nou cu adress helper"
+#: ../java/build/Proxy.java:136
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Dacă aveți adresa Base 64, {0} adăugați-l la Agenda dvs. {1}."
 
-#: ../java/build/Proxy.java:110
+#: ../java/build/Proxy.java:137
 msgid ""
-"The address helper link you followed is for a new host name that is not in "
-"your address book."
-msgstr ""
-"Link-ul de adress helper pe care a urmat este pentru un nume de gazdă nou, "
-"care nu este în agendă."
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
+msgstr "În caz contrar, găsiți o bază 32 sau link-ul adress helper, sau folositi  link-ul de serviciu-salt de mai jos."
 
-#: ../java/build/Proxy.java:111
-msgid "You may save this host name to your local address book."
-msgstr "Puteți salva acest nume gazdă în agenda dvs. locală."
-
-#: ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:138
+#, java-format
 msgid ""
-"If you save it to your address book, you will not see this message again."
-msgstr "Dacă-l salvați în agenda dvs., nu veți mai vedea acest mesaj."
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr "Vedeti aceasta pagina des? Vezi {0}  FAQ {1} pentru ajutor în {2} adăugarea unor abonamente {3} la Agenda dumneavoastră."
 
-#: ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
+msgid "Warning: Invalid Request URI"
+msgstr "Atenție: URI de solicitare incorect"
+
+#: ../java/build/Proxy.java:147
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr "Cererea URI este incorecta, și, probabil, contine caractere ilegale."
+
+#: ../java/build/Proxy.java:148
 msgid ""
-"If you do not save it, the host name will be forgotten after the next router "
-"restart."
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr "Dacă ați făcut clic pe un link, verificați sfârșitul URI pentru orice caractere, pe care browser-ul a adăugat din greșeală ."
+
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
-"Dacă nu-l salvați, numele de gazdă va fi uitat după următoarea repornire "
-"router."
 
-#: ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:156
 msgid ""
-"If you do not wish to visit this host, click the \"back\" button on your "
-"browser."
+"The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
-"Dacă nu doriți să vizitați această gazdă, faceți clic pe butonul \"Înapoi\" "
-"din browser"
 
-#: ../java/build/Proxy.java:115 ../java/build/Proxy.java:121
-msgid "Warning: Bad Address Helper"
-msgstr "Atenție: Adress Helper incorect"
-
-#: ../java/build/Proxy.java:122
-#, java-format
-msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+#: ../java/build/Proxy.java:157
+msgid ""
+"The outproxy is probably down, but there could also be network congestion."
 msgstr ""
-"Cheia ajutor în URL-ul ({0} i2paddresshelper = {1}) nu este rezolvabila."
 
-#: ../java/build/Proxy.java:123
-msgid "It seems to be garbage data, or a mistyped Base 32 address."
-msgstr "Se pare a fi date de gunoi, sau de o bază adresa 32 introdusă greșit."
+#: ../java/build/Proxy.java:168
+msgid "The HTTP Outproxy was not found."
+msgstr "HTTP Outproxy nu a fost găsit."
 
-#: ../java/build/Proxy.java:124
+#: ../java/build/Proxy.java:169
 msgid ""
-"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
-"or Base 64 key."
-msgstr ""
-"Verificați URL-ul dvs. pentru a încercarea și stabilirea cheii de ajutor "
-"pentru a fi nume de gazdă Base34 sau cheie Base 64 validă."
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr "Acesta este deconectat, este congestionarea rețelei, sau router-ul nu este încă bine integrat cu colegii."
 
-#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:131
-msgid "Warning: Non-HTTP Protocol"
-msgstr "Atenție: protocolul Non-HTTP"
+#: ../java/build/Proxy.java:173
+msgid "Proxy Authorization Required"
+msgstr "Autentificare proxy necesară"
 
-#: ../java/build/Proxy.java:132
-msgid "The request uses a bad protocol."
-msgstr "Cererea utilizează un protocol incorect."
+#: ../java/build/Proxy.java:174
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Autentificare I2P HTTP proxy necesară"
 
-#: ../java/build/Proxy.java:133
+#: ../java/build/Proxy.java:175
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr "Acest proxy este configurat pentru a necesita un nume de utilizator și o parolă de acces."
+
+#: ../java/build/Proxy.java:176
 #, java-format
-msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
-msgstr "I2P HTTP Proxy suporta {0} numai cereri http:// {1} ."
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr "Va rugam sa introduceti numele de utilizator si parola, sau verifica {0} configurația router {1} sau {2} configurare I2PTunnel {3}."
 
-#: ../java/build/Proxy.java:134
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
-"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
-msgstr ""
-"Alte protocoale, cum ar fi {0} https:// {1} și {0} ftp:// {1} nu sunt "
-"permise."
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
+msgstr "Pentru a dezactiva autorizare, stergeti  configurarea {0} i2ptunnel.proxy.auth = basic {1}, apoi opriți și reporniți tunelul proxy HTTP."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "This seems to be a bad destination:"
 msgstr "Aceasta pare a fi o destinație rea:"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper nu vă poate ajuta cu o destinație de genul asta!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:638
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
-"To visit the destination in your host database, click <a href=\"{0}\">here</"
-"a>. To visit the conflicting addresshelper destination, click <a href="
-"\"{1}\">here</a>."
+"To visit the destination in your host database, click <a "
+"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
+"click <a href=\"{1}\">here</a>."
+msgstr "Pentru a vizita destinație în baza de date gazdă, click <a href=\"{0}\">aici</a>.Pentru a vizita destinația addresshelper conflict, click<a href=\"{1}\"> aici</a>"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
+msgid "Destination lease set not found"
 msgstr ""
-"Pentru a vizita destinație în baza de date gazdă, click <a href="
-"\"{0}\">aici</a>.Pentru a vizita destinația addresshelper conflict, click<a "
-"href=\"{1}\"> aici</a>"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1042
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Gazdă"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1050
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Destinație"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1056
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Continuați {0} fără salvare"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1061
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Salvați {0} în agendă router și continuă la eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1064
-#, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Salvați {0} în agenda master  și continuă la eepsite"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Salvați {0} în agendă router privata și continuă la eepsite"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
-msgid "HTTP Outproxy"
-msgstr "OutProxy HTTP"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" service:"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
-"Faceți clic pe link-ul de mai jos pentru a cauta un adress helper prin "
-"utilizarea unui serviciu de \"salt\":"
 
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "{0} jump service"
-msgstr " serviciu salt {0}"
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_ru.po b/apps/i2ptunnel/locale-proxy/messages_ru.po
index c7d5fa596bbba7915bd9d5220bdeffabc03ec0c8..71648a2d8670e223aa4d773a50d544f142608c87 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ru.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ru.po
@@ -11,13 +11,13 @@
 # gmind, 2012-2013
 # Nikolay Parukhin <parukhin@gmail.com>, 2014
 # sfix <anon-9b36b2e@lycos.com>, 2013
-# yume, 2014
+# yume, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 18:27+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 11:13+0000\n"
 "Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -34,9 +34,10 @@ msgstr "Информация: Новый доменной адрес"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Консоль маршрутизатора I2P"
@@ -45,9 +46,10 @@ msgstr "Консоль маршрутизатора I2P"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Консоль маршрутизатора I2P"
 
@@ -55,9 +57,10 @@ msgstr "Консоль маршрутизатора I2P"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Настройки"
@@ -66,9 +69,10 @@ msgstr "Настройки"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Помощь"
@@ -77,9 +81,10 @@ msgstr "Помощь"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Адресная книга"
@@ -127,9 +132,9 @@ msgstr "Ссылка AddressHelper, по которой вы прошли, оп
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Кто-то может пытаться выдать себя за другой сайт или разные люди дали двум сайтам одинаковые имена."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Возможно, кто-то пытается выдать себя за другой сайт или разные люди дали двум сайтам одинаковые имена."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -166,217 +171,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Вы попытались соединиться с сайтом не в сети I2P."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Предупреждение: Сайт I2P недоступен"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "Сайт недоступен"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "eepsite недоступен, так как его LeaseSet не был найден."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "Сайт недоступен, так как его LeaseSet не был найден."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "eepsite, вероятно, выключен, но также возможна перегрузка сети"
+"The website is probably down, but there could also be network congestion."
+msgstr "Сайт, вероятно, выключен, но также возможна перегрузка сети."
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Вы можете {0}повторить{1} операцию."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Назначение туннеля"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "Сайт недоступен, так как использует настройки шифрования, которые не поддерживаются вашей версией I2P или Java."
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "Не удалось подключиться к следующему адресу:"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Ошибка: Отказ в выполнении запроса"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Ошибка: Локальный адрес"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Ваш браузер не поддерживает iFrames"
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "Не используйте прокси-сервер для доступа к консоли маршрутизатора, локальному компьютеру или локальной сети."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Предупреждение: Выходной прокси-сервер не настроен"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Вы запросили страницу вне сети I2P, но не имеете настроенного выходного прокси-сервера."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Пожалуйста, настройте выходной прокси-сервер в I2PTunnel."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "Сайт I2P недоступен."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "Сайт недоступен."
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Возможно, он отключен, сеть перегружена или ваш маршрутизатор недостаточно интегрирован с другими узлами."
+msgstr "Возможно, сайт отключен, сеть перегружена или ваш маршрутизатор недостаточно интегрирован с другими пирами."
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Локальный адрес назначения"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "Указанный адрес недействителен или недоступен."
+msgstr "Указанный адрес сайт недействителен или недоступен."
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Возможно, вы вставили неправильную строку Base64 или прошли по нерабочей ссылке."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "Сайт I2P также может быть отключен."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Предупреждение: Протокол не HTTP"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "Запрос отправлен через неподдерживанмый протокол."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr "I2P HTTP прокси поддерживает только HTTP и HTTPS запросы."
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr "Другие протоколы, такие как FTP не допустимы."
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Предупреждение: Неизвестный сайт I2P"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "Внешний прокси недоступен"
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Предупреждение: Сайт I2P не найден в адресной книге"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "Внешний HTTP-прокси недоступен, так как использует настройки шифрования, которые не поддерживаются вашей версией I2P или Java."
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Сайт I2P не найден в адресной книге вашего маршрутизатора."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Вы можете {0}повторить{1} операцию (это случайным образом выберет прокси-сервер из определенного {2}здесь{3} списка, если вы настроили более одного прокси-сервера)."
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Если проблема продолжит появляться, вы можете изменить список прокси-серверов {0}здесь{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "Неизвестный сайт"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "Сайт не найден в адресной книге"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr "Сайт не найден в вашей адресной книге маршрутизатора."
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Проверьте ссылку или найдите адрес Base32 или Base64."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Если у вас есть адрес Base64, {0}добавьте его в адресную книгу{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "В противном случае найдите ссылку Base32 или AddressHelper или используйте Jump-службу."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "Если вы слишком часто попадаете на эту страницу, то обратитесь к {0}FAQ{1} за инструкциями по {2}добавлению подписок{3} адресной книги."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Предупреждение: Некорректный URI запроса"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "Некорректный URI запроса. Возможно, он содержит недопустимые символы."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Если вы прошли по ссылке, проверьте конец URI на наличие символов, ошибочно добавленных браузером."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Предупреждение: Выходной прокси-сервер недоступен"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "Внешний прокси не найден"
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr "Внешний HTTP-прокси недоступен, так как его LeaseSet не был найден."
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr "Внешний прокси, вероятно, выключен, но также возможна перегрузка сети"
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Вы можете {0}повторить{1} операцию (это случайным образом выберет прокси-сервер из определенного {2}здесь{3} списка, если вы настроили более одного прокси-сервера)."
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Если проблема продолжит появляться, вы можете изменить список прокси-серверов {0}здесь{1}."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "HTTP-прокси не поднят"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Возможно, он отключен, сеть перегружена или ваш маршрутизатор недостаточно интегрирован с другими узлами."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Авторизация outproxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Авторизация outproxy"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Этот прокси-сервер требует имя пользователя и пароль для доступа."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Введите имя и пароль или проверьте ваши {0}настройки маршрутизатора{1} и {2}настройки I2PTunnel{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -392,7 +420,7 @@ msgstr "Кажется это плохой адрес назначения:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "С таким адресом назначения i2paddresshelper вам не поможет!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -400,42 +428,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Для перехода по ссылке из локальной адресной книги, нажмите <a href=\"{0}\">здесь</a>. Для перехода по новой addresshelper-ссылке, нажмите <a href=\"{1}\">здесь</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr "LeaseSet для адреса назначения не найден"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Адрес"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Адрес назначения"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Продолжить переход к {0} без сохранения"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Сохранить {0} в адресную книгу роутера (router address book) и продолжить переход к eep-сайту"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Сохранить {0} в адресную книгу маршрутизатора и перейти к сайту"
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Сохранить {0} в основную (master) адресную книгу и продолжить переход к eep-сайту"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Сохранить {0} в основную адресную книгу и перейти к сайту"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Сохранить {0} в приватную адресную книгу и продолжить переход к eep-сайту"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Сохранить {0} в приватную адресную книгу и перейти к сайту"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_sk.po b/apps/i2ptunnel/locale-proxy/messages_sk.po
index f3c8d651e1cd1cc4ed5334a4d873f8a6ae944e1a..f76b56a36304bf69519ccdd11625152ff3fe298b 100644
--- a/apps/i2ptunnel/locale-proxy/messages_sk.po
+++ b/apps/i2ptunnel/locale-proxy/messages_sk.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-05-19 19:29+0000\n"
-"Last-Translator: Roman 'Kaktuxista' Benji <romanbeno273@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,345 +19,401 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
-msgid "Warning: Outproxy Not Found"
-msgstr ""
+#: ../java/build/Proxy.java:5
+msgid "Information: New Host Name"
+msgstr "Informácia: Nový názov hostiteľa"
 
 #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
-#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
-#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
-#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:104
-#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
+#: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Konzola routra"
 
 #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
-#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
-#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
-#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:105
-#: ../java/build/Proxy.java:117 ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
+#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
+#: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Konzola I2P routra"
 
 #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
-#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
-#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
-#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:80
-#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:106
-#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Konfigurácia"
 
 #: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
-#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
-#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
-#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:81
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:107
-#: ../java/build/Proxy.java:119 ../java/build/Proxy.java:129
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Pomoc"
 
 #: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
-#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
-#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
-#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:82
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:108
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:130
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Adresár"
 
+#: ../java/build/Proxy.java:11
+msgid "Information: New Host Name with Address Helper"
+msgstr "Informácia: Nový názov hostiteľa s adresným pomocníkom"
+
 #: ../java/build/Proxy.java:12
-msgid "The HTTP Outproxy was not found."
-msgstr ""
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr "Odkaz adresného pomocníka, ktorý ste nasledovali, je určený pre nový názov hostiteľa nenachádzajúceho sa vo vašom adresári."
 
 #: ../java/build/Proxy.java:13
-msgid ""
-"It is offline, there is network congestion, or your router is not yet well-"
-"integrated with peers."
-msgstr ""
+msgid "You may save this host name to your local address book."
+msgstr "Môžete uložiť tento názov hostiteľa do lokálneho adresára."
 
 #: ../java/build/Proxy.java:14
-#, java-format
 msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
+"If you save it to your address book, you will not see this message again."
+msgstr "Ak ho uložíte do svojho adresára, už túto správu znova neuvidíte."
 
 #: ../java/build/Proxy.java:15
-#, java-format
 msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
-#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:102
-msgid "Could not find the following destination:"
-msgstr "Nebolo možné nájsť nasledovnú destináciu:"
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
+msgstr "Ak ho neuložíte, názov hostiteľa bude po ďalšom reštarte routra zabudnutý."
 
-#: ../java/build/Proxy.java:17
-msgid "Error: Request Denied"
-msgstr ""
+#: ../java/build/Proxy.java:16
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr "Ak si neželáte navštíviť tohto hostiteľa, kliknite na tlačítko \"Späť\" vo vašom prehliadači."
 
-#: ../java/build/Proxy.java:23
-msgid "Error: Local Access"
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+msgid "Warning: Destination Key Conflict"
 msgstr ""
 
 #: ../java/build/Proxy.java:24
-msgid "Your browser is misconfigured."
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
 msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Do not use the proxy to access the router console, localhost, or local LAN "
-"destinations."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
-msgid "Warning: Eepsite Unknown"
-msgstr "Varovanie: Neznáma eepsite"
-
-#: ../java/build/Proxy.java:32
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Varovanie: Eepsite nebola v adresári nájdená"
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
 
-#: ../java/build/Proxy.java:33
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Daná eepsite nebola nájdená v adresári vášho routra."
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33
+msgid "Warning: Bad Address Helper"
+msgstr ""
 
 #: ../java/build/Proxy.java:34
-msgid "Check the link or find a Base 32 or Base 64 address."
-msgstr "Skontrolujte daný odkaz, prípadne nájdite Base 32 alebo Base 64 adresu."
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
 
 #: ../java/build/Proxy.java:35
-#, java-format
-msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
-msgstr "Ak máte Base 64 adresu, {0}pridajte si ju do svojho adresára{1}."
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
 
 #: ../java/build/Proxy.java:36
 msgid ""
-"Otherwise, find a Base 32 or address helper link, or use a jump service link"
-" below."
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
 msgstr ""
 
-#: ../java/build/Proxy.java:37
-#, java-format
-msgid ""
-"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
-"subscriptions{3} to your addressbook."
-msgstr ""
+#: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
+msgid "Warning: Request Denied"
+msgstr "Varovanie: Požiadavok bol odmietnutý"
 
-#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
-msgid "Warning: Invalid Request URI"
-msgstr "Varovanie: Neplatná URI požiadavku"
+#: ../java/build/Proxy.java:44
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Pokúsili ste sa pripojiť k webovej stránke alebo lokácii mimo I2P."
 
-#: ../java/build/Proxy.java:46
-msgid "The request URI is invalid, and probably contains illegal characters."
-msgstr "URI požiadavku je neplatná a zrejme obsahuje nepovolené znaky."
+#: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:52
+msgid "The website was not reachable, because its lease set was not found."
+msgstr ""
 
-#: ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:53
 msgid ""
-"If you clicked a link, check the end of the URI for any characters the "
-"browser has mistakenly added on."
-msgstr "Ak ste klikli na odkaz, skontrolujte koniec URI, či sa v ňom nenachádzajú nejaké znaky omylom pridané prehliadačom."
+"The website is probably down, but there could also be network congestion."
+msgstr ""
 
-#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
-msgid "Warning: Invalid Destination"
-msgstr "Varovanie: Neplatná destinácia"
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Môžete to chcieť {0}skúsiť znova{1}."
 
-#: ../java/build/Proxy.java:55
-msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
-"unreachable."
-msgstr "Zadaná eepsite destinácia nebola platná, alebo sa ju iným spôsobom nepodarilo dosiahnuť."
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
+msgid "Could not find the following destination:"
+msgstr "Nebolo možné nájsť nasledovnú destináciu:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
 msgid ""
-"Perhaps you pasted in the wrong Base 64 string or the link you are following"
-" is bad."
-msgstr "Možno ste vložili nesprávny Base 64 reťazec, prípadne odkaz, ktorý práve nasledujete, je zlý."
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
 
-#: ../java/build/Proxy.java:57
-msgid "The I2P host could also be offline."
-msgstr "Takisto I2P hostiteľ mohol byť offline."
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
 
-#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:101
-#, java-format
-msgid "You may want to {0}retry{1}."
-msgstr "Môžete to chcieť {0}skúsiť znova{1}."
+#: ../java/build/Proxy.java:65
+msgid "Error: Request Denied"
+msgstr ""
 
-#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
-msgid "Warning: Request Denied"
-msgstr "Varovanie: Požiadavok bol odmietnutý"
+#: ../java/build/Proxy.java:71
+msgid "Error: Local Access"
+msgstr ""
 
-#: ../java/build/Proxy.java:67
-msgid "You attempted to connect to a non-I2P website or location."
-msgstr "Pokúsili ste sa pripojiť k webovej stránke alebo lokácii mimo I2P."
+#: ../java/build/Proxy.java:72
+msgid "Your browser is misconfigured."
+msgstr ""
 
-#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+#: ../java/build/Proxy.java:73
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Varovanie: Nie je nakonfigurovaný žiadny východzí proxy"
 
-#: ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Váš požiadavok bol určený pre stránku mimo I2P, avšak nemáte nakonfigurovaný žiadny východzí proxy."
 
-#: ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Prosím nakonfigurujte si v I2PTunneli východzí proxy."
 
-#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:83
-msgid "Warning: Destination Key Conflict"
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:91
 msgid ""
-"The addresshelper link you followed specifies a different destination key "
-"than a host entry in your host database."
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+msgid "Warning: Invalid Destination"
+msgstr "Varovanie: Neplatná destinácia"
+
+#: ../java/build/Proxy.java:101
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"The website destination specified was not valid, or was otherwise "
+"unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:102
 msgid ""
-"You can resolve the conflict by considering which key you trust, and either "
-"discarding the addresshelper link, discarding the host entry from your host "
-"database, or naming one of them differently."
+"Perhaps you pasted in the wrong Base 64 string or the link you are following"
+" is bad."
+msgstr "Možno ste vložili nesprávny Base 64 reťazec, prípadne odkaz, ktorý práve nasledujete, je zlý."
+
+#: ../java/build/Proxy.java:103
+msgid "The I2P host could also be offline."
+msgstr "Takisto I2P hostiteľ mohol byť offline."
+
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
+msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:87
-msgid "Proxy Authorization Required"
-msgstr "Je vyžadovaná autorizácia proxy"
+#: ../java/build/Proxy.java:113
+msgid "The request uses a bad protocol."
+msgstr ""
 
-#: ../java/build/Proxy.java:88
-msgid "I2P HTTP Proxy Authorization Required"
-msgstr "Je vyžadovaná autorizácia I2P HTTP proxy"
+#: ../java/build/Proxy.java:114
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+msgstr ""
 
-#: ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:115
+msgid "Other protocols such as FTP are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:123
 msgid ""
-"This proxy is configured to require a username and password for access."
-msgstr "Tento proxy je nakonfigurovaný tak, aby pre prístup vyžadoval uživateľské meno a heslo."
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr ""
 
-#: ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
 #, java-format
 msgid ""
-"Please enter your username and password, or check your {0}router "
-"configuration{1} or {2}I2PTunnel configuration{3}."
-msgstr "Prosím zadajte vaše užívateľské meno a heslo, prípadne skontrolujte vašu {0}konfiguráciu routra{1} alebo {2}I2PTunnel konfiguráciu{3}."
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
 
-#: ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
 #, java-format
 msgid ""
-"To disable authorization, remove the configuration "
-"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
-"tunnel."
-msgstr "Ak chcete zakázať autorizáciu, odstráňte nastavenie {0}i2ptunnel.proxy.auth=basic{1} a následne zastavte a reštartujte HTTP Proxy tunel."
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
 
-#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
 msgstr ""
 
-#: ../java/build/Proxy.java:99
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
 msgstr ""
 
-#: ../java/build/Proxy.java:100
-msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
-"yet well-integrated with peers."
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:103
-msgid "Information: New Host Name"
-msgstr "Informácia: Nový názov hostiteľa"
+#: ../java/build/Proxy.java:135
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Skontrolujte daný odkaz, prípadne nájdite Base 32 alebo Base 64 adresu."
 
-#: ../java/build/Proxy.java:109
-msgid "Information: New Host Name with Address Helper"
-msgstr "Informácia: Nový názov hostiteľa s adresným pomocníkom"
+#: ../java/build/Proxy.java:136
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Ak máte Base 64 adresu, {0}pridajte si ju do svojho adresára{1}."
 
-#: ../java/build/Proxy.java:110
+#: ../java/build/Proxy.java:137
 msgid ""
-"The address helper link you followed is for a new host name that is not in "
-"your address book."
-msgstr "Odkaz adresného pomocníka, ktorý ste nasledovali, je určený pre nový názov hostiteľa nenachádzajúceho sa vo vašom adresári."
-
-#: ../java/build/Proxy.java:111
-msgid "You may save this host name to your local address book."
-msgstr "Môžete uložiť tento názov hostiteľa do lokálneho adresára."
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
+msgstr ""
 
-#: ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:138
+#, java-format
 msgid ""
-"If you save it to your address book, you will not see this message again."
-msgstr "Ak ho uložíte do svojho adresára, už túto správu znova neuvidíte."
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid ""
-"If you do not save it, the host name will be forgotten after the next router"
-" restart."
-msgstr "Ak ho neuložíte, názov hostiteľa bude po ďalšom reštarte routra zabudnutý."
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
+msgid "Warning: Invalid Request URI"
+msgstr "Varovanie: Neplatná URI požiadavku"
 
-#: ../java/build/Proxy.java:114
-msgid ""
-"If you do not wish to visit this host, click the \"back\" button on your "
-"browser."
-msgstr "Ak si neželáte navštíviť tohto hostiteľa, kliknite na tlačítko \"Späť\" vo vašom prehliadači."
+#: ../java/build/Proxy.java:147
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr "URI požiadavku je neplatná a zrejme obsahuje nepovolené znaky."
 
-#: ../java/build/Proxy.java:115 ../java/build/Proxy.java:121
-msgid "Warning: Bad Address Helper"
-msgstr ""
+#: ../java/build/Proxy.java:148
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr "Ak ste klikli na odkaz, skontrolujte koniec URI, či sa v ňom nenachádzajú nejaké znaky omylom pridané prehliadačom."
 
-#: ../java/build/Proxy.java:122
-#, java-format
-msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:123
-msgid "It seems to be garbage data, or a mistyped Base 32 address."
+#: ../java/build/Proxy.java:156
+msgid ""
+"The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:124
+#: ../java/build/Proxy.java:157
 msgid ""
-"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
-"or Base 64 key."
+"The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:131
-msgid "Warning: Non-HTTP Protocol"
+#: ../java/build/Proxy.java:168
+msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:132
-msgid "The request uses a bad protocol."
+#: ../java/build/Proxy.java:169
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:133
-msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
-msgstr ""
+#: ../java/build/Proxy.java:173
+msgid "Proxy Authorization Required"
+msgstr "Je vyžadovaná autorizácia proxy"
 
-#: ../java/build/Proxy.java:134
-msgid "Other protocols such as FTP are not allowed."
-msgstr ""
+#: ../java/build/Proxy.java:174
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Je vyžadovaná autorizácia I2P HTTP proxy"
+
+#: ../java/build/Proxy.java:175
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr "Tento proxy je nakonfigurovaný tak, aby pre prístup vyžadoval uživateľské meno a heslo."
+
+#: ../java/build/Proxy.java:176
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr "Prosím zadajte vaše užívateľské meno a heslo, prípadne skontrolujte vašu {0}konfiguráciu routra{1} alebo {2}I2PTunnel konfiguráciu{3}."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595
+#: ../java/build/Proxy.java:177
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
+msgstr "Ak chcete zakázať autorizáciu, odstráňte nastavenie {0}i2ptunnel.proxy.auth=basic{1} a následne zastavte a reštartujte HTTP Proxy tunel."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "This seems to be a bad destination:"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:662
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -365,53 +421,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1151
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1155
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1159
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1165
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1173
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1174
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1290
-msgid "HTTP Outproxy"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1326
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" "
-"service:"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1334
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "{0} jump service"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_sv.po b/apps/i2ptunnel/locale-proxy/messages_sv.po
index 3e99b36b918f8c183334ec5d1cedf7d31562dd4e..1369b020d6244bb71dd25f873f4a3be3501ee2f9 100644
--- a/apps/i2ptunnel/locale-proxy/messages_sv.po
+++ b/apps/i2ptunnel/locale-proxy/messages_sv.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -30,9 +30,10 @@ msgstr "Information: Nytt Värdnamn"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Routerkonsol"
@@ -41,9 +42,10 @@ msgstr "Routerkonsol"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Routerkonsol"
 
@@ -51,9 +53,10 @@ msgstr "Routerkonsol"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -62,9 +65,10 @@ msgstr "Konfiguration"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Hjälp"
@@ -73,9 +77,10 @@ msgstr "Hjälp"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Adressbok"
@@ -123,9 +128,9 @@ msgstr "Adresshjälpar-länken du följde specifierad en annan mål-nyckel än f
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Någon kanske försöker utge sig för att vara en annan eepsite eller personer kan ha givit eepsites identiska namn."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr ""
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -162,217 +167,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "Du försökte ansluta till en icke-I2P webbsida eller plats."
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "Varning: Eepsite kan ej nås"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "Du kanske vill {0}försöka igen{1}."
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "Kunde inte hitta följande mål:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "Fel: Förfrågan Nekad"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "Fel: Lokal Åtkomst"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "Din webbläsare är felkonfigurerad."
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "Använd inte proxyn för åtkomst till routerkonsolen, localhost eller lokala LAN mål."
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "Varning: Ingen Utproxy Inställd"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "Din förfrågan var för en sida utanför I2P, men du har ingen HTTP utproxy inställd."
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Var god ställ in en utproxy i I2PTunnel."
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "Eepsiten var inte nåbar."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Eepsiten är offline, nätverket är under hög belastning eller din router är ännu inte väl integrerad med peers."
+msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Varning: Ogiltigt Mål"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "Eepsite målet som specificerades är inte giltigt eller kan annars ej nås."
+msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "Kanske kopierade du in fel Base64 sträng eller så är länken du följer dålig."
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "I2P-värden kan också vara offline."
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "Varning: Ej HTTP Protokoll"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "Förfrågan använder ett dåligt protokoll."
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "Varning: Okänd Eepsite"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Varning: Eepsite Finns Inte i Adressboken"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Eepsite:n hittades inte i din routers adressbok."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "Du kanske vill {0}försöka igen{1} eftersom en ny utproxy kommer väljas slumpmässigt utav de som är definierade {2}här{3} (om du har mer än en inställd)."
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "Om du fortsätter att ha problem, så kanske du vill ändra din utproxy-liste {0}här{1}."
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "Kontrollera länken eller hitta en Base32 eller Base64 adress."
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "Om du har en Base64-adress, {0}lägg till den till din adressbok{1}."
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "Annars, hitta en Base32 eller adresshjälpar-länk eller använder en hopp-tjänst länk nedan."
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "Ser du denhär sidan ofta? Kika i {0}FAQ:en{1} efter hjälp med att {2}lägga till några prenumerationer{3} till din adressbok."
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "Varning: Ogiltig URI Begärd"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "Den begärde URI:n är ogiltig och innehåller troligtvis ogiltiga tecken."
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "Om du klicka på en länk, kontrollera slutet av URI:n efter andra tecken som webbläsaren av misstag lagt till."
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "Varning: Utproxy Ej Hittad"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "Du kanske vill {0}försöka igen{1} eftersom en ny utproxy kommer väljas slumpmässigt utav de som är definierade {2}här{3} (om du har mer än en inställd)."
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "Om du fortsätter att ha problem, så kanske du vill ändra din utproxy-liste {0}här{1}."
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "HTTP Utproxyn hittades ej."
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "Den är antingen offline, nätverket är under stor belastning eller så är din router ännu inte väl integrerad med peers."
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Proxy Tillstånd Krävs"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "I2P HTTP Proxy Tillstånd Krävs"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "Denhär proxy är inställd till att kräva användarnamn och lösenord för åtkomst."
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "Var god ange ditt användarnamn och lösenord eller kontrollera din {0}router-konfiguration{1} eller {2}I2PTunnel-konfiguration{3}."
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -388,7 +416,7 @@ msgstr "Detta verkar vara ett felaktigt mål"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2padresshjälp kan inte hjälpa dig med ett sådant  mål!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -396,42 +424,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "För att besöka målet i din värd databas href=\"{0}\"> klicka <a här </ a>. För att besöka de motstridiga hjälpaddresserna,<a href=\"{1}\"> klicka <a här </ a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Värd"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Bas 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Mål"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Fortsätt till {0} utan att spara"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Spara {0} till routeradressboken och fortsätt till eepsite "
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Spara {0} till huvudadressboken och fortsätt till eepsite "
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Spara {0} till privatadressbok och fortsätt till eepsite "
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_uk.po b/apps/i2ptunnel/locale-proxy/messages_uk.po
index e66038d06c20c1b74d2e278168391810767e7d93..405732214d89318ebd90ee023e41fd3fbf014d39 100644
--- a/apps/i2ptunnel/locale-proxy/messages_uk.po
+++ b/apps/i2ptunnel/locale-proxy/messages_uk.po
@@ -7,14 +7,15 @@
 # Denis Blank <gribua@gmail.com>, 2011
 # Denis Blank <gribua@gmail.com>, 2012
 # jonny_nut, 2014
+# madjong <madjong@i2pmail.org>, 2014
 # puxud <puxud@alivance.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-07 13:42+0000\n"
-"Last-Translator: puxud <puxud@alivance.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,345 +23,401 @@ msgstr ""
 "Language: uk_UA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:5
+msgid "Information: New Host Name"
 msgstr ""
 
 #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
-#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
-#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
-#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:104
-#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
+#: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "Консоль роутера"
 
 #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
-#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
-#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
-#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:105
-#: ../java/build/Proxy.java:117 ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
+#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
+#: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "Консоль роутера"
 
 #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
-#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
-#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
-#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:80
-#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:106
-#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "Настройки"
 
 #: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
-#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
-#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
-#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:81
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:107
-#: ../java/build/Proxy.java:119 ../java/build/Proxy.java:129
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "Допомога"
 
 #: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
-#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
-#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
-#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:82
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:108
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:130
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "Адресна книга"
 
+#: ../java/build/Proxy.java:11
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
 #: ../java/build/Proxy.java:12
-msgid "The HTTP Outproxy was not found."
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
 msgstr ""
 
 #: ../java/build/Proxy.java:13
-msgid ""
-"It is offline, there is network congestion, or your router is not yet well-"
-"integrated with peers."
+msgid "You may save this host name to your local address book."
 msgstr ""
 
 #: ../java/build/Proxy.java:14
-#, java-format
 msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
+"If you save it to your address book, you will not see this message again."
 msgstr ""
 
 #: ../java/build/Proxy.java:15
-#, java-format
 msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
 msgstr ""
 
-#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
-#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:102
-msgid "Could not find the following destination:"
-msgstr "Місце призначення тунелю"
-
-#: ../java/build/Proxy.java:17
-msgid "Error: Request Denied"
+#: ../java/build/Proxy.java:16
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
 msgstr ""
 
-#: ../java/build/Proxy.java:23
-msgid "Error: Local Access"
-msgstr "Помилка: Локальний доступ"
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+msgid "Warning: Destination Key Conflict"
+msgstr ""
 
 #: ../java/build/Proxy.java:24
-msgid "Your browser is misconfigured."
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
 msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Do not use the proxy to access the router console, localhost, or local LAN "
-"destinations."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
-msgid "Warning: Eepsite Unknown"
-msgstr "Увага: Невідомий eep-сайт"
-
-#: ../java/build/Proxy.java:32
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Увага: Eep-сайт не знайдене в адресній книзі"
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
 
-#: ../java/build/Proxy.java:33
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Eep-сайт не знайдене в адресній книзі вашого роутеру."
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33
+msgid "Warning: Bad Address Helper"
+msgstr ""
 
 #: ../java/build/Proxy.java:34
-msgid "Check the link or find a Base 32 or Base 64 address."
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
 msgstr ""
 
 #: ../java/build/Proxy.java:35
-#, java-format
-msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
 msgstr ""
 
 #: ../java/build/Proxy.java:36
 msgid ""
-"Otherwise, find a Base 32 or address helper link, or use a jump service link"
-" below."
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
 msgstr ""
 
-#: ../java/build/Proxy.java:37
-#, java-format
-msgid ""
-"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
-"subscriptions{3} to your addressbook."
+#: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43
+msgid "Warning: Request Denied"
+msgstr "Попередження: запит відхилено"
+
+#: ../java/build/Proxy.java:44
+msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
-#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
-msgid "Warning: Invalid Request URI"
+#: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:46
-msgid "The request URI is invalid, and probably contains illegal characters."
+#: ../java/build/Proxy.java:52
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:53
 msgid ""
-"If you clicked a link, check the end of the URI for any characters the "
-"browser has mistakenly added on."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
-msgid "Warning: Invalid Destination"
-msgstr "Локальний адрес призначення"
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Не бажаєте {0}повторити спробу{1}?"
 
-#: ../java/build/Proxy.java:55
-msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
-"unreachable."
-msgstr ""
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
+msgid "Could not find the following destination:"
+msgstr "Місце призначення тунелю"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
 msgid ""
-"Perhaps you pasted in the wrong Base 64 string or the link you are following"
-" is bad."
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:57
-msgid "The I2P host could also be offline."
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
 msgstr ""
 
-#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:101
-#, java-format
-msgid "You may want to {0}retry{1}."
-msgstr ""
+#: ../java/build/Proxy.java:65
+msgid "Error: Request Denied"
+msgstr "Помилка: запит відхилено"
 
-#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
-msgid "Warning: Request Denied"
-msgstr ""
+#: ../java/build/Proxy.java:71
+msgid "Error: Local Access"
+msgstr "Помилка: Локальний доступ"
 
-#: ../java/build/Proxy.java:67
-msgid "You attempted to connect to a non-I2P website or location."
+#: ../java/build/Proxy.java:72
+msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+#: ../java/build/Proxy.java:73
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr "Не використовуйте проксі для доступу до консолі роутеру, localhost чи будь-якого хосту у локальній мережі."
+
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
-msgstr ""
+msgstr "Попередження: вихідний проксі не налаштовано"
 
-#: ../java/build/Proxy.java:75
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:76
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
-msgstr ""
+msgstr "Будь ласка, налаштуйте вихідний проксі у I2PTunnel."
 
-#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:83
-msgid "Warning: Destination Key Conflict"
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:91
 msgid ""
-"The addresshelper link you followed specifies a different destination key "
-"than a host entry in your host database."
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+msgid "Warning: Invalid Destination"
+msgstr "Локальний адрес призначення"
+
+#: ../java/build/Proxy.java:101
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"The website destination specified was not valid, or was otherwise "
+"unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:102
 msgid ""
-"You can resolve the conflict by considering which key you trust, and either "
-"discarding the addresshelper link, discarding the host entry from your host "
-"database, or naming one of them differently."
+"Perhaps you pasted in the wrong Base 64 string or the link you are following"
+" is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:87
-msgid "Proxy Authorization Required"
-msgstr "Авторизація outproxy"
+#: ../java/build/Proxy.java:103
+msgid "The I2P host could also be offline."
+msgstr ""
 
-#: ../java/build/Proxy.java:88
-msgid "I2P HTTP Proxy Authorization Required"
-msgstr "Авторизація outproxy"
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
 
-#: ../java/build/Proxy.java:89
-msgid ""
-"This proxy is configured to require a username and password for access."
-msgstr "Цей проксі налаштований конечно вимагати ім'я користувача і пароль для доступу."
+#: ../java/build/Proxy.java:113
+msgid "The request uses a bad protocol."
+msgstr ""
 
-#: ../java/build/Proxy.java:90
-#, java-format
+#: ../java/build/Proxy.java:114
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+msgstr ""
+
+#: ../java/build/Proxy.java:115
+msgid "Other protocols such as FTP are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:123
 msgid ""
-"Please enter your username and password, or check your {0}router "
-"configuration{1} or {2}I2PTunnel configuration{3}."
-msgstr "Будь ласка, ввести ваш логін і пароль, або перевірити {0}router configuration{1} або {2}I2PTunnel configuration{3}."
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "Вихідний проксі HTTP недоступний, бо використовує опції шифрування, які не підтримуються вашим I2P або версією Java."
 
-#: ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
 #, java-format
 msgid ""
-"To disable authorization, remove the configuration "
-"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
-"tunnel."
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
-msgid "Warning: Eepsite Unreachable"
-msgstr "Увага: Eep-сайт недоступний"
-
-#: ../java/build/Proxy.java:99
-msgid "The eepsite was not reachable."
-msgstr "Eep-сайт не доступний."
-
-#: ../java/build/Proxy.java:100
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
-"yet well-integrated with peers."
-msgstr "Eep-сайт вимкнений, мережа перевантажена, або ваш роутер недостатньо інтегрований із пірами."
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
 
-#: ../java/build/Proxy.java:103
-msgid "Information: New Host Name"
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
 msgstr ""
 
-#: ../java/build/Proxy.java:109
-msgid "Information: New Host Name with Address Helper"
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
 msgstr ""
 
-#: ../java/build/Proxy.java:110
-msgid ""
-"The address helper link you followed is for a new host name that is not in "
-"your address book."
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:111
-msgid "You may save this host name to your local address book."
+#: ../java/build/Proxy.java:135
+msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:136
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Якщо ви маєте Base 64 адресу, то {0}додайте її до адресної книги{1}."
+
+#: ../java/build/Proxy.java:137
 msgid ""
-"If you save it to your address book, you will not see this message again."
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
 msgstr ""
 
-#: ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:138
+#, java-format
 msgid ""
-"If you do not save it, the host name will be forgotten after the next router"
-" restart."
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid ""
-"If you do not wish to visit this host, click the \"back\" button on your "
-"browser."
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
+msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:115 ../java/build/Proxy.java:121
-msgid "Warning: Bad Address Helper"
+#: ../java/build/Proxy.java:147
+msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:122
-#, java-format
-msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+#: ../java/build/Proxy.java:148
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:123
-msgid "It seems to be garbage data, or a mistyped Base 32 address."
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:124
+#: ../java/build/Proxy.java:156
 msgid ""
-"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
-"or Base 64 key."
+"The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:131
-msgid "Warning: Non-HTTP Protocol"
-msgstr ""
+#: ../java/build/Proxy.java:157
+msgid ""
+"The outproxy is probably down, but there could also be network congestion."
+msgstr "Можливо, вихідний проксі не працює, або мережа перенавантажена."
 
-#: ../java/build/Proxy.java:132
-msgid "The request uses a bad protocol."
-msgstr ""
+#: ../java/build/Proxy.java:168
+msgid "The HTTP Outproxy was not found."
+msgstr "Вихідний проксі для HTTP не знайдено."
 
-#: ../java/build/Proxy.java:133
-msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+#: ../java/build/Proxy.java:169
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:134
-msgid "Other protocols such as FTP are not allowed."
+#: ../java/build/Proxy.java:173
+msgid "Proxy Authorization Required"
+msgstr "Авторизація outproxy"
+
+#: ../java/build/Proxy.java:174
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Авторизація outproxy"
+
+#: ../java/build/Proxy.java:175
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr "Цей проксі налаштований конечно вимагати ім'я користувача і пароль для доступу."
+
+#: ../java/build/Proxy.java:176
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr "Будь ласка, ввести ваш логін і пароль, або перевірити {0}router configuration{1} або {2}I2PTunnel configuration{3}."
+
+#: ../java/build/Proxy.java:177
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "This seems to be a bad destination:"
 msgstr "Скоріше всього це поганий адрес призначення:"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper не може допомогти Вам з місцем призначення як це!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:662
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -368,53 +425,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Для того щоб перейти по локальному посиланню з локальної адресної книги, натисніть ось<a href=\"{0}\">тут</a>. Для переходу по новому addresshelper-посиланню, натисніть будь-ласка <a href=\"{1}\">тут</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1151
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Адрес"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1155
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1159
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Адреса призначення"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1165
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "Продовжити до {0} без збереження"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Зберегти {0} в адресну книгу роутера и продовжити перехід до eep-сайту"
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1173
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Зберегти {0} в основну адресну книгу і продовжити перехід до еер-сайту"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1174
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Зберегти {0} в приватну адресну книгу і продовжити перехід до еер-сайту."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1290
-msgid "HTTP Outproxy"
-msgstr "Вихідний HTTP проксі"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1326
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" "
-"service:"
-msgstr "\"Jump\" сервіси, які, можливо, знають необхідне Вам addresshelper-посилання."
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
 
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1334
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "{0} jump service"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
@@ -428,7 +473,7 @@ msgstr "Додано через address helper"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:187
 msgid "router"
-msgstr ""
+msgstr "роутер"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:189
 msgid "master"
diff --git a/apps/i2ptunnel/locale-proxy/messages_vi.po b/apps/i2ptunnel/locale-proxy/messages_vi.po
index c37938923ba0d196d3523d75dfc75a1c87393847..453e28f4e04fb5afe0dda25d2202b51882bfa7a1 100644
--- a/apps/i2ptunnel/locale-proxy/messages_vi.po
+++ b/apps/i2ptunnel/locale-proxy/messages_vi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -28,9 +28,10 @@ msgstr ""
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr ""
@@ -39,9 +40,10 @@ msgstr ""
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr ""
 
@@ -49,9 +51,10 @@ msgstr ""
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr ""
@@ -60,9 +63,10 @@ msgstr ""
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr ""
@@ -71,9 +75,10 @@ msgstr ""
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr ""
@@ -121,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -160,217 +165,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr ""
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "tên hay điểm đến"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr ""
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr ""
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr ""
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr ""
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr ""
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr ""
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr ""
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "Điểm đến nội bộ"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr ""
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr ""
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr ""
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr ""
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr ""
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr ""
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
 msgstr ""
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
 msgstr ""
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
 msgstr ""
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr ""
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr ""
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr ""
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr ""
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr ""
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr ""
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr ""
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
 msgstr ""
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr ""
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr ""
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr ""
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr ""
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr ""
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "Cho phép Outproxy"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "Cho phép Outproxy"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr ""
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr ""
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -386,7 +414,7 @@ msgstr "tên hay điểm đến"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -394,41 +422,41 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "Để truy cập vào điểm đến trong cơ sở dữ liệu máy chủ, bấm <a href=\"{0}\">vào đây</a>. Để truy cập vào địa chỉ giúp đỡ xung đột, bấm <a href=\"{1}\">vào đây</a>."
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "Máy chủ"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "Đích đến"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_zh.po b/apps/i2ptunnel/locale-proxy/messages_zh.po
index f626555fe1a314b363614819e444ac5373b9c5d0..d3f277f4073304223e432d58e7f331b1a75e63a9 100644
--- a/apps/i2ptunnel/locale-proxy/messages_zh.po
+++ b/apps/i2ptunnel/locale-proxy/messages_zh.po
@@ -10,13 +10,13 @@
 # walking <waling@mail.i2p>, 2013
 # walking <walking@i2pmail.org>, 2011
 # wwj402 <wwj402@gmail.com>, 2013
-# YF <yfdyh000@gmail.com>, 2014
+# YF <yfdyh000@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-14 12:01+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 03:54+0000\n"
 "Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -33,9 +33,10 @@ msgstr "信息:新站点地址"
 #: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38
 #: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57
 #: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75
-#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98
-#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121
-#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:84 ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:141
+#: ../java/build/Proxy.java:150 ../java/build/Proxy.java:162
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204
 msgid "Router Console"
 msgstr "路由控制台"
@@ -44,9 +45,10 @@ msgstr "路由控制台"
 #: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39
 #: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58
 #: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76
-#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99
-#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122
-#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:96
+#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:142
+#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:163
 msgid "I2P Router Console"
 msgstr "I2P 路由控制台"
 
@@ -54,9 +56,10 @@ msgstr "I2P 路由控制台"
 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40
 #: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59
 #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77
-#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100
-#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123
-#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:97
+#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:119
+#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:143
+#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:164
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Configuration"
 msgstr "配置"
@@ -65,9 +68,10 @@ msgstr "配置"
 #: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41
 #: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60
 #: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78
-#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101
-#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124
-#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:98
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:120
+#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:144
+#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:165
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Help"
 msgstr "帮助"
@@ -76,9 +80,10 @@ msgstr "帮助"
 #: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42
 #: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61
 #: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79
-#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102
-#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125
-#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146
+#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:99
+#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:121
+#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:145
+#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:166
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
 msgid "Addressbook"
 msgstr "地址簿"
@@ -126,9 +131,9 @@ msgstr "您所打开的地址簿连接指定的目标密钥与您的地址簿中
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "可能有人正试图通过此链接伪装成此站点,或有人使用了相同的站点网址。"
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "有人可能在试图冒充另一个网站,或者人们给两个网站赋予了同一个名称。"
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -165,217 +170,240 @@ msgid "You attempted to connect to a non-I2P website or location."
 msgstr "您尝试连接的网站非I2P站点或位置。"
 
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
-#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
-msgid "Warning: Eepsite Unreachable"
-msgstr "警告:I2P 站点不可达"
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
+msgid "Website Unreachable"
+msgstr "网站不可达"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "该匿名网站不可达,因为找不到其租契。"
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "该网站不可达,因为找不到其租契。"
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "该匿名网站可能已下线,但也可能是由于网络拥堵。"
+"The website is probably down, but there could also be network congestion."
+msgstr "该网站可能已下线,但也可能是由于网络拥堵。"
 
-#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83
-#: ../java/build/Proxy.java:95
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:104
 #, java-format
 msgid "You may want to {0}retry{1}."
 msgstr "您可能希望{0}重试{1}。"
 
-#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84
-#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119
-#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:139
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:172
 msgid "Could not find the following destination:"
 msgstr "无法直到如下目标:"
 
-#: ../java/build/Proxy.java:56
+#: ../java/build/Proxy.java:63
+msgid ""
+"The website was not reachable, because it uses encryption options that are "
+"not supported by your I2P or Java version."
+msgstr "此网站不可达,因为您使用的 I2P 或者 Java 版本不支持它使用的加密选项。"
+
+#: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
+msgid "Could not connect to the following destination:"
+msgstr "无法连接到以下目标:"
+
+#: ../java/build/Proxy.java:65
 msgid "Error: Request Denied"
 msgstr "错误:请求被拒绝"
 
-#: ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:71
 msgid "Error: Local Access"
 msgstr "错误:本地访问"
 
-#: ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:72
 msgid "Your browser is misconfigured."
 msgstr "您的浏览器配置有误。"
 
-#: ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:73
 msgid ""
 "Do not use the proxy to access the router console, localhost, or local LAN "
 "destinations."
 msgstr "请不要使用代理访问路由控制台,localhost 或局域网地址。"
 
-#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80
 msgid "Warning: No Outproxy Configured"
 msgstr "警告:没有配置出口代理"
 
-#: ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:81
 msgid ""
 "Your request was for a site outside of I2P, but you have no HTTP outproxy "
 "configured."
 msgstr "请求的站点在 I2P 网络之外,但您没有配置 HTTP 出口代理。"
 
-#: ../java/build/Proxy.java:73
+#: ../java/build/Proxy.java:82
 msgid "Please configure an outproxy in I2PTunnel."
 msgstr "请到 I2PTunnel 中配置出口代理。"
 
-#: ../java/build/Proxy.java:81
-msgid "The eepsite was not reachable."
-msgstr "此 I2P 站点不可达"
+#: ../java/build/Proxy.java:90
+msgid "The website was not reachable."
+msgstr "该网站不可达。"
 
-#: ../java/build/Proxy.java:82
+#: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "此 I2P 站点已经下线,遇到网络拥堵,或您的路由尚未完全整合至 I2P 网络中。"
+msgstr "该网站已离线,可能由于网络拥堵,或者您的路由器未良好的与网络整合。"
 
-#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
 msgstr "警告:无效目标"
 
-#: ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "指定站点的目标密钥无效,或无法到达。"
+msgstr "指定的网站目标无效,或者不可达。"
 
-#: ../java/build/Proxy.java:93
+#: ../java/build/Proxy.java:102
 msgid ""
 "Perhaps you pasted in the wrong Base 64 string or the link you are following"
 " is bad."
 msgstr "或许您粘贴的 Base64 字符串有误或您打开的链接有问题。"
 
-#: ../java/build/Proxy.java:94
+#: ../java/build/Proxy.java:103
 msgid "The I2P host could also be offline."
 msgstr "也可能是 I2P 站点目前已下线。"
 
-#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112
 msgid "Warning: Non-HTTP Protocol"
 msgstr "警告:非 HTTP 协议"
 
-#: ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:113
 msgid "The request uses a bad protocol."
 msgstr "请求使用了无效协议。"
 
-#: ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:114
 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
 msgstr "I2P HTTP 代理只支持HTTP和HTTPS请求。"
 
-#: ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:115
 msgid "Other protocols such as FTP are not allowed."
 msgstr "其他协议例如FTP不被支持。"
 
-#: ../java/build/Proxy.java:107
-msgid "Warning: Eepsite Unknown"
-msgstr "警告:未知 I2P 站点"
+#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:122
+msgid "Outproxy Unreachable"
+msgstr "出口代理不可达"
 
-#: ../java/build/Proxy.java:113
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "警告:地址簿中未找到该 I2P 站点"
+#: ../java/build/Proxy.java:123
+msgid ""
+"The HTTP outproxy was not reachable, because it uses encryption options that"
+" are not supported by your I2P or Java version."
+msgstr "此 HTTP 出口代理不可达,因为您使用的 I2P 或者 Java 版本不支持它使用的加密选项。"
 
-#: ../java/build/Proxy.java:114
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "此 I2P 站点未存在于您路由器的地址簿中。"
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:170
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr "您可以{0}重试{1},程序将从您在 {2}此处{3} 定义的出口代理列表中随机选择一个进行连接(如果您设置了多项代理)。"
 
-#: ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:171
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list "
+"{0}here{1}."
+msgstr "如果问题持续存在,您可能需要{0}在此{1}编辑出口代理列表。"
+
+#: ../java/build/Proxy.java:127
+msgid "Website Unknown"
+msgstr "网站未知"
+
+#: ../java/build/Proxy.java:133
+msgid "Website Not Found in Addressbook"
+msgstr "未在地址簿中找到网站"
+
+#: ../java/build/Proxy.java:134
+msgid "The website was not found in your router's addressbook."
+msgstr "未在您的地址簿中找到此网站。"
+
+#: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
 msgstr "请检查链接或找到其对应的 Base32 或 Base64 地址。"
 
-#: ../java/build/Proxy.java:116
+#: ../java/build/Proxy.java:136
 #, java-format
 msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
 msgstr "如果您拥有 Base64 地址,请{0}将其添加至您的地址簿{1}。"
 
-#: ../java/build/Proxy.java:117
+#: ../java/build/Proxy.java:137
 msgid ""
 "Otherwise, find a Base 32 or address helper link, or use a jump service link"
 " below."
 msgstr "否则,请找到其对应的 Base32 地址或地址助手链接,或使用下面列出的跳转服务之一。"
 
-#: ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:138
 #, java-format
 msgid ""
 "Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
 "subscriptions{3} to your addressbook."
 msgstr "经常碰到此页面?请参见 {0}常见问题集 FAQ{1} 查看如何为您的地址簿 {2}添加订阅{3}。"
 
-#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:146
 msgid "Warning: Invalid Request URI"
 msgstr "警告:请求的 URI 无效。"
 
-#: ../java/build/Proxy.java:127
+#: ../java/build/Proxy.java:147
 msgid "The request URI is invalid, and probably contains illegal characters."
 msgstr "请求的 URI 无效或包含非法字符。"
 
-#: ../java/build/Proxy.java:128
+#: ../java/build/Proxy.java:148
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
 msgstr "如果您点击的是链接,请检查 URI 结尾是否有浏览器错误添加的多余字符。"
 
-#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135
-#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147
-msgid "Warning: Outproxy Not Found"
-msgstr "警告:未找到出口代理"
+#: ../java/build/Proxy.java:149 ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Outproxy Not Found"
+msgstr "出口代理未找到"
 
-#: ../java/build/Proxy.java:136
+#: ../java/build/Proxy.java:156
 msgid ""
 "The HTTP outproxy was not reachable, because its lease set was not found."
 msgstr "HTTP 出口代理不可达,因为找不到其租契。"
 
-#: ../java/build/Proxy.java:137
+#: ../java/build/Proxy.java:157
 msgid ""
 "The outproxy is probably down, but there could also be network congestion."
 msgstr "出口代理可能已下线,但也可能是由于网络拥堵。"
 
-#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150
-#, java-format
-msgid ""
-"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
-"the pool you have defined {2}here{3} (if you have more than one configured)."
-msgstr "您可以{0}重试{1},程序将从您在 {2}此处{3} 定义的出口代理列表中随机选择一个进行连接(如果您设置了多项代理)。"
-
-#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151
-#, java-format
-msgid ""
-"If you continue to have trouble you may want to edit your outproxy list "
-"{0}here{1}."
-msgstr "如果问题持续存在,您可能需要{0}在此{1}编辑出口代理列表。"
-
-#: ../java/build/Proxy.java:148
+#: ../java/build/Proxy.java:168
 msgid "The HTTP Outproxy was not found."
 msgstr "未找到 HTTP 出口代理。"
 
-#: ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:169
 msgid ""
 "It is offline, there is network congestion, or your router is not yet well-"
 "integrated with peers."
 msgstr "它已经下线,遇到网络拥堵,或您的路由尚未完全整合至 I2P 网络中。"
 
-#: ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:173
 msgid "Proxy Authorization Required"
 msgstr "出口代理认证"
 
-#: ../java/build/Proxy.java:154
+#: ../java/build/Proxy.java:174
 msgid "I2P HTTP Proxy Authorization Required"
 msgstr "出口代理认证"
 
-#: ../java/build/Proxy.java:155
+#: ../java/build/Proxy.java:175
 msgid ""
 "This proxy is configured to require a username and password for access."
 msgstr "代理配置要求提供用户名和密码才能访问。"
 
-#: ../java/build/Proxy.java:156
+#: ../java/build/Proxy.java:176
 #, java-format
 msgid ""
 "Please enter your username and password, or check your {0}router "
 "configuration{1} or {2}I2PTunnel configuration{3}."
 msgstr "请输入您的用户名和密码,否则请检查您的 {0} 路由配置 {1} 或 {2} I2PTunnel 配置 {3}。"
 
-#: ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:177
 #, java-format
 msgid ""
 "To disable authorization, remove the configuration "
@@ -391,7 +419,7 @@ msgstr "目标似乎无效:"
 msgid "i2paddresshelper cannot help you with a destination like that!"
 msgstr "i2paddresshelper 对您输入的目标无能为力!"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:668
 #, java-format
 msgid ""
 "To visit the destination in your host database, click <a "
@@ -399,42 +427,42 @@ msgid ""
 "click <a href=\"{1}\">here</a>."
 msgstr "要访问您地址簿中设置的目标,请点击<a href=\"{0}\">这里</a>。要访问地址助手返回的目标,请点<a href=\"{1}\">这里</a>。"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
 msgid "Destination lease set not found"
 msgstr "找不到目标租赁"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1167
 msgid "Host"
 msgstr "主机"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
 msgid "Base 32"
 msgstr "Base 32"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1175
 msgid "Destination"
 msgstr "目标"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
 msgid "Continue to {0} without saving"
 msgstr "继续{0},而不保存"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1186
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "保存{0}至“路由器地址簿”并访问该 I2P 站点。"
+msgid "Save {0} to router address book and continue to website"
+msgstr "保存 {0} 到路由器地址簿并继续访问网站"
 
 #. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1189
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "保存{0}至“主地址簿”并访问该 I2P 站点。"
+msgid "Save {0} to master address book and continue to website"
+msgstr "保存 {0} 到主地址簿并继续访问网站"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1190
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "保存{0}至“私有地址簿”并访问该 I2P 站点。"
+msgid "Save {0} to private address book and continue to website"
+msgstr "保存 {0} 到私有地址簿并继续访问网站"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale/messages_ar.po b/apps/i2ptunnel/locale/messages_ar.po
index 7fe71ab557f0d04b50c6c20dca42b67d3d402718..dcb91fd669338f51cf6cc78eeb16806655ecc628 100644
--- a/apps/i2ptunnel/locale/messages_ar.po
+++ b/apps/i2ptunnel/locale/messages_ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "داخلي"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -36,152 +36,158 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "توقيف النفق"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "تم حفظ تغيرات الاعدادات"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "فشل في حفظ الاعدادات"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "نفق جديد"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "منفذ غير محدد"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "مستخدم عادي"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC برنامج"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "خادم عادي"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP خادم"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 بروكسي"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC بروكسي دردشة"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "اتصال/SSL/HTTPS بروكسي"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC خادم"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P  لوحة تحكم الأنفاق- حرر اعدادات النفق"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "حرر اعدادات بروكسي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "اعدادات بروكسي جديدة"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -190,537 +196,538 @@ msgstr "اعدادات بروكسي جديدة"
 msgid "Name"
 msgstr "اسم "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "نوع"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "وصف"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "الهدف"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "نفطة الوصول"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "مطلوب"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "متصل ب"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "بروكسي خارجي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "وجهة النفق"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 غير منصوح باستعماله"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "المستخدمين المشاركين"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(شارك النفق مع باقي المستخدمين و irc/httpclients؟ التغيير بحاجة الى اعادة التشغيل)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "بدأ تلقائي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "اعدادات متقدمة للشبكة"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "اعدادات النفق"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "طول"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "فرق"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "عد"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "بروفايل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "اتصال تفاعلي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "تأخر الاتصال"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr " I2CP عنوان"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "منفذ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "عطل النفق حتى الحاجة اليه"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "فعا"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "قلل قدر الأنفاق عند الانتظار"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "خفض عدد الأنفاق"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "دقائق الانتظار"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "قفل النفق عند الانتظار"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "مفتاح جديد عند الفتح"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "ألغي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "مفتاح خاص"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "ملف"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "وجهة محلية"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "اسم مستخدم"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "كلمة السر"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "اعدادات البروكسي الخارجي"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "خيارات خاصة"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "الغاء"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "خذف"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "حفظ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "حرر اعدادات الخادم"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "اعدادت خادم جديد"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "اسم موقع جديد"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(دعه فارغا من أجل البروكسي الخارجي)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "ملف مفتاح الخاص"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "أضف الى دفتر العناوين"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "مفتاح التشفير"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "أنشئ مفتاح جديد"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "أنشئ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(يجب ايقاف النفق)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "قائمة بيضاء"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "قائمة سوداء"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "حد الاتصال الداخلي (0=unlimited)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "لكل مستخدم"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "لكل دقيقة"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "لكل ساعة"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "لكل يوم"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "المجموع"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr ""
@@ -746,8 +753,8 @@ msgid "Restart All"
 msgstr "أعد تشغيل الجمبع"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "نفق الخادم I2P "
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -804,8 +811,8 @@ msgid "Start"
 msgstr "أبدأ"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "نفق جديد للخادم"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_cs.po b/apps/i2ptunnel/locale/messages_cs.po
index c920d42ab12e7f9fe0e1f613229108387fa19b95..00255d49191386ea7dab2464a11539a78b8f0e63 100644
--- a/apps/i2ptunnel/locale/messages_cs.po
+++ b/apps/i2ptunnel/locale/messages_cs.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-13 16:13+0000\n"
-"Last-Translator: A5h8d0wf0x <littleslyfoxie28@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "vnitřní"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -33,152 +33,158 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "snížit šířku pásma a spolehlivost"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "standartní šířka pásma a spolehlivost"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "vyšší šířka pásma a spolehlivost"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Neplatně odeslaný formulář, nejspíše jste použili tlačítka 'Zpět' nebo 'Znovu načíst' ve vašem prohlížeči. Prosím odešlete formulář znovu."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Nastavení pro všechny tunely bylo opětovně nahráno."
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Startuji tunel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Zastavuji tunel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Změny nastavení byly uloženy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Nepodařilo se uložit nastavení"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nový tunel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port není nastaven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standardní klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Klient pro IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standardní server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host není nastaven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Správce I2P tunelů - editovat klientský tunel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Editovat nastavení proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nové nastavení proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -187,537 +193,538 @@ msgstr "Nové nastavení proxy"
 msgid "Name"
 msgstr "Jméno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Typ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Popis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Cíl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Přístupové místo (access point)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "požadováno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Dosažitelné (kým)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Výstupní proxy (Outproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "Zašrtněte zaškrtávací políčko pro 'ANO'"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Cíl tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "není doporučeno b32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Sdílený klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Sdílet tunely s ostatními klienty a klienty irc/http? Změny vyžadují restart proxy klienta)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Automatické spuštění"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Rozšířená síťová nastavení"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(POZN.: když je klientská proxy nastavena aby sdílela tunely, tak tyto nastavení platí pro všechny sdílené klienty proxy!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Nastavení možností tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Délka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Uložit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Změnit nastavení serveru"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nové nastavení serveru"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Jméno webové stránky"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(nechejte prázdné pro výstupní proxiny)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Soubor s privátním klíčem"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Přidat do lokální knihy kontaktů (addressbook)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Šifrovací klíč"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Vygenerovat nový klíč"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generovat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(nejdříve je třeba zastavit tunel)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Seznam těch s omezeným přístupem"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Seznam povolených (whitelist)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Seznam zakázaných (blacklist)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Seznam přístupů"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limit příchozích spojení (0 = bez omezení)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Na klienta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Během minuty"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Během hodiny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Během dne"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Celkově"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maximální počet současných spojení (0 = bez omezení)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr ""
@@ -743,8 +750,8 @@ msgid "Restart All"
 msgstr "Spustit vše znovu (restartovat)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Tunely I2P serveru"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -801,7 +808,7 @@ msgid "Start"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
+msgid "New hidden service"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
diff --git a/apps/i2ptunnel/locale/messages_da.po b/apps/i2ptunnel/locale/messages_da.po
index 378bb6712a5a082fc34e1b9aa5e72bd9b3a3f4e3..86a34fa12edab1aebac7cf61a667622f8506571f 100644
--- a/apps/i2ptunnel/locale/messages_da.po
+++ b/apps/i2ptunnel/locale/messages_da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/I2P/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,164 +19,170 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, 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:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ugyldig formularafsendelse, sandsynligvis fordi du brugte 'tilbage' eller 'reload' knappen i din browser. Prøv venligst at sende igen."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfiguration er genindlæst for alle tunneler"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Starter tunnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Stopper tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Konfiguration ændringer gemt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Det mislykkedes at gemme konfigurationen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Ny Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port er ikke indstillet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standard klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Klient for IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standard server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Server for IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Klient for Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Server for Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Vært er ikke indstillet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnel Maneger - Rediger Klient Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Rediger proxy indstillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nye proxy indstillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -185,537 +191,538 @@ msgstr "Nye proxy indstillinger"
 msgid "Name"
 msgstr "Navn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Adgangspunkt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "krævet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Kan nås med"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr ""
@@ -741,7 +748,7 @@ msgid "Restart All"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
+msgid "I2P Hidden Services"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
@@ -799,7 +806,7 @@ msgid "Start"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
+msgid "New hidden service"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
diff --git a/apps/i2ptunnel/locale/messages_de.po b/apps/i2ptunnel/locale/messages_de.po
index 8359af8431fbdacb4bfbb4991ba779f552c93191..6ec542f41c80113f30bfd6b252b0d09ffb26b2a3 100644
--- a/apps/i2ptunnel/locale/messages_de.po
+++ b/apps/i2ptunnel/locale/messages_de.po
@@ -12,7 +12,7 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 # foo <foo@bar>, 2009
-# Lars Schimmer <echelon@i2pmail.org>, 2014
+# Lars Schimmer <echelon@i2pmail.org>, 2014-2015
 # mixxy, 2011
 # nextloop <ga25day@mytum.de>, 2013
 # pirr <pirr@tormail.org>, 2012
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-23 09:19+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-10 14:10+0000\n"
 "Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -31,164 +31,170 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} eingehender, {0} ausgehender Tunnel"
 msgstr[1] "{0} eingehende, {0} ausgehende Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "niedrigere Bandbreite und Zuverlässlichkeit"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "standard Bandbreite und Zuverlässlichkeit"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "hohe Bandbreite und Zuverlässlichkeit"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Die Tunnel sind noch nicht initialisiert. Bitte aktualisiere die Seite in zwei Minuten."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ungültige Formulareingabe - wahrscheinlich haben Sie den \"Zurück\"-Knopf Ihres Browsers betätigt. Bitte neuladen!"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Falls dieses Problem weiterhin besteht: Stellen Sie sicher, dass in Ihrem Browser Cookies aktiviert sind."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Einstellungen für alle Tunnel neugeladen"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Starte Tunnel ..."
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Beende Tunnel ..."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Änderungen der Einstellungen gespeichert"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Einstellungen nicht gespeichert"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Neuer Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port nicht gesetzt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "ungültiger Port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Warnung - Ports unter 1024 werden nicht empfohlen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr "Warnung - doppelt belegter Port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standardklient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS-Client"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC-Klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standardserver"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP-Server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS-4/4a/5-Proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS-IRC-Proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS-Proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC-Server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr-Klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr-Server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP Bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host nicht gesetzt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "ungültige Adresse"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P-Tunnel-Manager - Kliententunnel bearbeiten"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "Verwaltung der Versteckten Services"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Editiere Kliententunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Proxyeinstellungen bearbeiten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Neue Proxyeinstellungen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -197,537 +203,538 @@ msgstr "Neue Proxyeinstellungen"
 msgid "Name"
 msgstr "Name"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Typ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Ziel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Zugriffspunkt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "benötigt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Erreichbar von"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "SSL nutzen?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Ausgehende Proxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "SSL Outproxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Das Outproxy Plugin benutzen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Aktiviere das Kästchen für 'ja')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Ziel des Tunnels"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "Name, Name:Port oder Destination"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "B32-Adressen nicht empfohlen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "versch. Klienten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Soll dieser Tunnel mit anderen Klienten und IRC/HTTP-Klienten geteilt werden? Änderungen benötigen Neustart des Klientenproxys)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Automatischer Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "DCC aktivieren"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Erweiterte Netzwerkoptionen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(HINWEIS: Ist dieser Proxy konfiguriert, Tunnel mit anderen Klienten zu teilen, so gelten diese Optionen für alle Klienten des Proxys!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tunneloptionen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Länge"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 Hop Tunnel (keine Anonymität)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 Hop Tunnel (geringe Anonymität)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 Hop Tunnel (mittlere Anonymität)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 Hop Tunnel (hohe Anonymität)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "Hop-Tunnel (sehr geringe Leistung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Varianz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0-Hop-Varianz (keine zufällige Längenveränderung, konsistente Leistung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 Hop Varianz (mittlere zufällige Verlängerung, verringert die Leistung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 Hops Varianz (hohe zufällige Verlängerung, verringerte Leistung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 Hop Varianz (geringe zufällige Längenänderung, Standardleistung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 Hops Varianz (nicht empfohlen)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "Hops Varianz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Anzahl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Anzahl an Ersatztunneln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 Ersatztunnel (0 Redundanz, keine zusätzliche Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 Ersatztunnel in jede Richtung (geringe Redundanz, geringe Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 Ersatztunnel in jede Richtung (mittlere Redundanz, mittlere Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 Ersatztunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "Ersatztunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "Interaktive Verbindung"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "Mengenverbindung (Download/Webseiten/BitTorrent)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Verbindung verzögern"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "für Verbindungen mit Anfragen/Antworten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "I2CP-Adresse des Routers"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Aufbau des Tunnels verzögern, bis dieser benötigt wird"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "aktiviert"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Anzahl an Tunneln im Leerlauf reduzieren"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Reduzierte Tunnelanzahl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minuten Inaktivität"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "nicht genutzte Tunnel schließen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Neue Schlüssel beim Wiederöffnen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "deaktiviert"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Dauerhafter privater Schlüssel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Datei"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "lokales Ziel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Lokales Base 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr "Reiche die User-Agent Kopfzeile hindurch"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr "Reiche die Referer Kopfzeile hindurch"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr "Reiche die Accept Kopfzeile hindurch"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr "Erlaube SSL für I2P Adressen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr "Signaturtyp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr "Nur Experten!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "lokale Autorisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Passwort"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Outproxy Autorisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "List der Sprung-URLs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Eigene Optionen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Speichern"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P-Tunnel-Manager - Servertunnel bearbeiten"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "Editiere Versteckte Services"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Servereinstellungen ändern"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Neue Servereinstellungen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Name der Webseite"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(für ausgehende Proxies leer lassen)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "private Schlüsseldatei"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "zum lokalen Adressbuch hinzufügen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Signatur des Namens"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Leaseset verschlüsseln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Schlüssel zum verschlüsseln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Erzeuge neuen Schlüssel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunnel muss zuerst beendet sein)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Zugang beschränken"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Zugangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Sperrliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Zugangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr "Blockiere den Zugang von In-Proxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr "Individuelle lokale Adresse je Klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "Optimierung für Multihoming"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Begrenzung eingehender Verbindungen (0=unbegrenzt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "pro Klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "pro Minute"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "pro Stunde"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "pro Tag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Gesamt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "max. Anzahl gleichzeitiger Verbindungen (0=unbegrenzt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST Limit (0 = unlimitiert)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Je Zeitabschnitt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Minutenbann"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST Limit Perioden (Minuten)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr "Nur für Experten! Ändert die B32 Adresse!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P-Tunnel-Manager - Liste"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Statusnachrichten"
@@ -753,8 +760,8 @@ msgid "Restart All"
 msgstr "Alle neustarten"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P-Servertunnel"
+msgid "I2P Hidden Services"
+msgstr "I2P Versteckte Services"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -811,8 +818,8 @@ msgid "Start"
 msgstr "Start"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Neuer Servertunnel"
+msgid "New hidden service"
+msgstr "Neuer Versteckter Service"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_en.po b/apps/i2ptunnel/locale/messages_en.po
index af2ff602448f5ea3ad917a234e83df2e8525a333..ef02aa2869df5a1e2f76714da87b0283740cf46d 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: 2014-10-30 20:10+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+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,164 +18,170 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:437
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:447
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, 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:527
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:531
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -184,537 +190,538 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:561
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:571
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:531
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:575
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:586
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:608
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:596
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:612
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:581
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr ""
@@ -740,7 +747,7 @@ msgid "Restart All"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
+msgid "I2P Hidden Services"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
@@ -798,7 +805,7 @@ msgid "Start"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
+msgid "New hidden service"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
diff --git a/apps/i2ptunnel/locale/messages_es.po b/apps/i2ptunnel/locale/messages_es.po
index 3ad74630a62e51870d49280ab1a891ff86052882..25e985abde60e8e7fd3fd64570a4c36806130a23 100644
--- a/apps/i2ptunnel/locale/messages_es.po
+++ b/apps/i2ptunnel/locale/messages_es.po
@@ -11,14 +11,14 @@
 # foo <foo@bar>, 2009
 # punkibastardo <punkibastardo@gmail.com>, 2011, 2012
 # punkibastardo <punkibastardo@gmail.com>, 2011
-# strel, 2013-2014
+# strel, 2013-2015
 # Trolly, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 17:14+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 22:46+0000\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -27,164 +27,170 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} túnel de entrada {0} túnel de salida"
 msgstr[1] "{0} túneles de entrada {0} túneles de salida"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "ancho de banda bajo y seguridad"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "ancho de banda estándar y seguridad"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "alto ancho de banda y seguridad"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Todavía no se han inicializado los túneles, recargue en dos minutos."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "El formulario presentado es inválido, probablemente porque has utilizado el botón 'atrás' o 'recargar' de tu navegador. Por favor, ¡vuelve a enviarlo!"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Si el problema persiste, verifique que tiene activadas las cookies en su navegador."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configuración recargada para todos los túneles"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Inicializando el túnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Deteniendo el túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Cambios en la configuración guardados"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "No se pudo guardar la configuración"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nuevo túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Puerto no establecido"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Puerto no válido"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Advertencia: no se recomienda usar puertos inferiores al 1024"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr "Advertencia - Puerto duplicado"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Cliente estándar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "Cliente HTTP/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Cliente IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Servidor estándar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "Proxy SOCKS 4/4a/5"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "Proxy IRC SOCKS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "Proxy CONNECT/SSL/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Servidor de IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Cliente Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Servidor Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host no establecido"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Dirección no válida"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Gestor del túneles I2P - Editar túnel de cliente"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "Administrador de servicios ocultos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Editar túnel de cliente"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Editar configuración de proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nueva configuración de proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -193,537 +199,538 @@ msgstr "Nueva configuración de proxy"
 msgid "Name"
 msgstr "Nombre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Tipo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Descripción"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Objetivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Punto de Acceso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "requerido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Accesible por"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "¿Utiliza SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Outproxis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "Proxys SSL salientes"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Usar complemento de proxy saliente ('Outproxy')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Marca la casilla para \"SÍ\")"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Túnel del Destino"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nombre, nombre:puerto, o destino"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 no recomendado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Túnel Compartido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(¿Compartir túneles con otros clientes y clientes de IRC/http? Cambiar esto requiere reiniciar el proxy de cliente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Autoarranque"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Habilitar DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Opciones de red avanzadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTA: Si este proxy de cliente está configurado para compartir túneles, estas opciones se aplicarán a todos los proxys de cliente compartidos.)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opciones de Túnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Longitud"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "Túnel de 0 saltos (sin anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "Túnel de 1 salto (bajo anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "Túnel de 2 saltos (anonimato medio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "Túnel de 3 saltos (alto anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "saltos de túnel (rendimiento muy pobre)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variación"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "Variación de 0 saltos (sin aleatoriedad, rendimiento constante)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "Variación de + 0-1 salto (aleatoriedad media aditiva, rendimiento substractivo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "Variación de + 0-2 saltos (aleatoriedad alta aditiva, rendimiento substractivo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "Variación de +/- 0-1 salto (aleatoriedad estándar, rendimiento estándar)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "Variación de +/- 0-2 saltos (no recomendado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "Variación de saltos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Cantidad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Cantidad de respaldo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 túneles de respaldo (redundancia 0, no aumenta el uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 túnel de respaldo en cada dirección (redundancia baja, uso bajo de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 túneles de respaldo en cada dirección (redundancia media, uso de recursos medio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 túneles de respaldo en cada dirección (alta redundancia, uso de recursos alto)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "túneles de respaldo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "conexión interactiva"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "conexión en masa (descargas/web/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Retrasar Conexión"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "para las conexiones de solicitud/respuesta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Dirección I2CP del router"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Puerto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Retrasar apertura del túnel hasta que sea necesario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Reducir la cantidad de túneles cuando está inactivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Número de túneles reducido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minutos de inactividad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Cerrar los túneles cuando se está inactivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nuevas claves al reabrir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Clave privada persistente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Archivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "destino local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Local de base 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr "Pasar la cabecera 'User-Agent' a través"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr "Pasar la cabecera 'Referer' a través"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr "Pasar cabeceras 'Accept' a través"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr "Permitir SSL en las direcciones I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr "Tipo de firma"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr "¡Sólo expertos!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorización local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorización outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Lista de URL de salto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Opciones personalizadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Guardar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Gestor del túneles I2P - Editar túnel servidor"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "Editar servicio oculto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Editar configuración del servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nueva configuración del servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nombre de la página"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(dejar en blanco para puertas de salida)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "archivo de clave privada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Agregar a la libreta de direcciones local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Firma del Hostname"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Cifrar Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Clave de cifrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Generar nueva clave"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(El túnel debe detenerse primero)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Lista de acceso restringido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Lista blanca"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista de acceso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr "Bloquear acceso desde Internet mediante inproxys"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr "Dirección local única por cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "Optimizar para multihoming (multiproveedor)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Límites de conexiones entrantes (0 = sin límite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Por cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "por minuto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Por hora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Por día"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Número máximo de conexiones simultáneas (0 = sin límite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Límites de POST (0=ilimitado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Por periodo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Minutos de exclusión"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Periodo de limitación de POST (minutos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr "¡Sólo expertos! ¡Cambia la base32 (B32)!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Gestor de túneles I2P - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Mensajes de estado"
@@ -749,8 +756,8 @@ msgid "Restart All"
 msgstr "Reiniciar todos"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Túneles de servidor I2P"
+msgid "I2P Hidden Services"
+msgstr "Servicios ocultos de I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -807,8 +814,8 @@ msgid "Start"
 msgstr "Iniciar"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Nuevo servidor de túnel"
+msgid "New hidden service"
+msgstr "Nuevo servicio oculto"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_fr.po b/apps/i2ptunnel/locale/messages_fr.po
index d504621e67dfb72ccaaecf37d78e3852d02ba0c0..6ea9eec4e5b7861cd98d7006c5a2848f6ee2d146 100644
--- a/apps/i2ptunnel/locale/messages_fr.po
+++ b/apps/i2ptunnel/locale/messages_fr.po
@@ -9,13 +9,13 @@
 # foo <foo@bar>, 2009
 # Boxoa590, 2013
 # Boxoa590, 2012
-# Towinet, 2013-2014
+# Towinet, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-09-01 08:56+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 14:41+0000\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,1162 +24,1182 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "interne"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} entrant, {0} sortant tunnels"
 msgstr[1] "{0} entrants, {0} sortants tunnels"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "bande passante et fiabilité plus basses"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "basse passante et fiabilité standards"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "basse passante et fiabilité plus élevées"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Les tunnels sont pas encore initialisés, s'il vous plaît rechargez dans deux minutes."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Échec de soumission du formulaire: vous avez peut-être utilisé le bouton \"Page précédente\" ou \"Recharger\" de votre navigateur. Merci de soumettre à nouveau."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Si le problème persiste, vérifiez que vous avez activé les cookies dans votre navigateur."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configuration rechargée pour tous les tunnels"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Démarrage du tunnel"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Arrêt du tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Modification de configuration enregistrée"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Échec d'enregistrement de la configuration"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nouveau tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port non défini"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Port invalide"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Avertissement - les ports en dessous de 1024 ne sont pas recommandés"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr "Avertissement - port en double"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Client standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "Client HTTP/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Client IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Serveur standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Serveur HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "Mandataire SOCKS 4/4a/5"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "Mandataire IRC SOCKS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "Mandataire CONNECT/SSL/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Serveur IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Client flux"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Serveur flux"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "bidir HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Hôte non défini"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Adresse incorrecte"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Gestionnaire de tunnels I2P: Modifiez le tunnel client"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "Gestionnaire de services cachés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Éditer tunnel client"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Modifiez les réglages de mandataire"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Paramètres de nouveau mandataire"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Nom"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Description"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Cible"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Point d'accès"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "requis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Joignable par"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr "Utiliser SSL ?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Mandataires sortants"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "Proxies sortants SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Utiliser plug-in proxy sortant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Cochez la case pour démarrage automatique en même temps que le routeur)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Destination de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nom, nom:port, ou destination"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 déconseillée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Client partagé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Partager les tunnels avec d'autres clients et des clients http/irc ? La modification requiert le redémarrage du client mandataire)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Démarrage automatique"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Active DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
-msgstr "Options de réseau avancées"
+msgstr "Options avancées de réseau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(ATTENTION : quand ce mandataire client est configuré pour partager les tunnels, ces options sont appliquées à tous les mandataires clients partagés)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Options de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Longueur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 tunnel d'étape (aucun anonymat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 tunnel d'étape (bas anonymat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 tunnels d'étape (moyen anonymat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 tunnels d'étape (haut anonymat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "Tunnel de saut (performances médiocres)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variance"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "Variance à 0 saut (pas d'aléa, performances stables)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "Variance à + 0 ou 1 saut (aléa moyen,  performances diminuées)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "Variance à + 0 à 2 sauts (aléa élevé,  performances diminuées)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "Variance à +/- 0 ou 1 saut (aléas légers,  performances diminuées)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "Variance à +/- 0 à 2 sauts (déconseillée)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "variance de saut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Nombre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Secours"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "Aucun tunnel de secours (pas de tolérance de pannes, pas de consommation de ressources) "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 tunnel de secours par direction (légère tolérance de pannes, faible consommation de ressources)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 tunnels de secours par direction (tolérance de pannes moyenne, consommation de ressources moyenne)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 tunnels de secours par direction (tolérance de pannes élevée, consommation de ressources élevée)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "Tunnels de secours"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "connexion interactive"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "connexion à fort transfert (téléchargements/sites web/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Retard à la connexion"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "pour les connexions demande/réponse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Adresse I2CP du routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Hôte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Réduire le nombre de tunnels quand inactif"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Retarder l'ouverture jusqu'à l'utilisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Activer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Réduire le nombre de tunnels quand inactif"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Réduire à"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minutes d'inactivité"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Fermer les tunnels quand inactif"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nouvelles clés à la réouverture"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr "Retarder l'ouverture jusqu'à l'utilisation"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Clé privée persistante"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fichier"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Destination locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Base locale 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr "Passer l'en-têtes \"User-Agent\" à travers"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr "Passer l'en-tête \"Referer\" à travers"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr "Passer les en-têtes \"Accept\" à travers"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr "Permettre le SSL aux adresses I2P"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr "Type de signature"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr "Experts seulement !"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorisation locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Identifiant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorisation de mandataire sortant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Liste d'URL de sauts"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Options personnelles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Gestionnaire de tunnels I2P: modifier le tunnel serveur"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "Éditer service caché"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Modifier les paramètres du serveur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Paramètres de nouveau serveur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr "Utiliser SSL ?"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nom du site web"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(pour les mandataires sortants le laisser vide)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Fichier de clé privée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Ajouter au carnet d'adresses local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Signature du nom d'hôte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Jeu de baux crypté"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Clé de cryptage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Générer une nouvelle clé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Générer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Le tunnel doit préalablement être arrêté)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Contrôle d'accès"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Liste blanche"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Liste d'accès"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr "Bloquer \"Access\" par l'intermédiaire d'Inproxies"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr "Adresse locale unique par client"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "Optimiser pour multihoming"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limite de connexions entrantes (0=pas de limite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Par client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Par minute"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Par heure"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Par jour"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Connexions simultanées maximum (0=pas de limite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Limites de POST (0=illimité)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Par période"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Minutes ban"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Période de limite de POST (minutes)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Type de nouveau certificat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Aucun"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr "Pénalité"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Durée de calcul de pénalisation"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Estimer"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Masqué"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Signé (signé par)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr "Experts seulement ! Cela modifie la B32 !"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Modifier le certificat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Modifier"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "Gestionnaire de tunnels I2P - Liste"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Messages d'état"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Actualiser"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Assistant de configuration de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Arrêter tous"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Démarrer tous"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Redémarrer tous"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "Tunnels serveurs I2P"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr "Services cachés I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Pointe vers"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Aperçu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "État"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Adresse Base32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Aucun aperçu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 msgstr "Démarrage..."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "Actif"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Démarrer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Nouveau tunnel serveur"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr "Nouveau service caché"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Créer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
 msgstr "Tunnels clients I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Interface"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Pause"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Mandataire sortant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Destination"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
 msgstr "plugin interne"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "aucun"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
 msgstr "Nouveau tunnel client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
 msgstr "Gestionnaire tunnel I2P - Assistant de configuration de création de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
 msgstr "Tunnel serveur ou client ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Type de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Nom de tunnel et description"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "Destination du tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
 msgstr "Adresse et port de reliure (binding)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Démarrage automatique de tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Assistant complété"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
 msgstr "Cet assistant va vous guider à travers les différentes options disponibles pour créer des tunnels dans I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
 msgstr "La première chose à décider est de savoir si vous voulez créer un serveur ou un tunnel client."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
 msgstr "Si vous avez besoin de vous connecter à un service distant, tel qu'un serveur IRC à l'intérieur de I2P ou un code repository (site d'hébergement de code source), alors vous aurez besoin d'un tunnel CLIENT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
 msgstr "D'autre part, si vous souhaitez héberger un service afin que d'autres se connectent à vous, alors vous aurez besoin de créer un tunnel SERVEUR."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
 msgstr "Tunnel serveur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
 msgstr "Tunnel client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
 msgstr "Il y a plusieurs types de tunnels parmi lesquels choisir :"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
 msgstr "Tunnel de base pour la connexion à un service unique à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
 msgstr "Essayez ceci si aucun des types de tunnel ci-dessous ne convient à vos besoins, ou vous ne savez pas de quel type de tunnel vous avez besoin."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
 msgstr "Tunnel qui agit comme un proxy HTTP pour atteindre des eepsites à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
 msgstr "Configurer votre navigateur pour utiliser ce tunnel comme un proxy http, ou définir votre variable «http_proxy» pour l'environnement de ligne de commande dans les applications GNU / Linux."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
 msgstr "Les sites web en dehors de I2P peuvent aussi être atteints si un proxy HTTP sortant est connu de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
 msgstr "Tunnel client sur mesure  spécifique pour les connexions IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
 msgstr "Avec ce type de tunnel, votre client IRC sera capable de se connecter à un réseau IRC à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
 msgstr "Chaque réseau IRC dans I2P que vous souhaitez connecter, va nécessiter son propre tunnel (voir aussi, SOCKS IRC)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
 msgstr "Un tunnel qui implémente le protocole SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
 msgstr "Ceci permet à la fois aux connexions TCP et UDP d'être faites à travers un proxy sortant SOCKS au sein de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
 msgstr "Un tunnel client implémentant le protocole SOCKS, qui est adapté pour le raccordement aux réseaux IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
 msgstr "Avec ce type de tunnel, les réseaux IRC dans I2P peuvent être atteint en tapant l'adresse I2P dans votre client IRC, et en configurant le client IRC pour utiliser ce tunnel SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
 msgstr "Cela signifie que seul un tunnel I2P est nécessaire plutôt qu'un tunnel séparé par réseau IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
 msgstr "Les réseaux IRC en dehors I2P peuvent également être atteints si un proxy sortant SOCKS au sein de I2P est connu, mais cela dépend de si oui ou non le proxy sortant a été bloqué par le réseau IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
 msgstr "Un tunnel client qui implémente la commande HTTP CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
 msgstr "Cela permet que des connexions TCP puissent être faites à travers un proxy sortant HTTP, en supposant que le proxy prenne en charge la commande CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
 msgstr "Un tunnel client personnalisée pour Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
 msgstr "Un tunnel de serveur de base pour héberger un service générique à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
 msgstr "Un tunnel de serveur qui est adapté aux connexions HTTP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
 msgstr "Utilisez ce type de tunnel si vous souhaitez héberger un eepsite."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
 msgstr "Un tunnel serveur personnalisé qui peut à la fois servir des données HTTP et se connecter à d'autres serveurs tunnels."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
 msgstr "Ce type de tunnel est principalement utilisé lors de l'exécution d'un serveur Seedless."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
 msgstr "Un tunnel serveur personnalisé afin d'héberger des réseaux IRC à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
 msgstr "Habituellement, un tunnel séparé doit être créé pour chaque serveur IRC devant être accessible à l'intérieur de I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
 msgstr "Un tunnel personnalisées serveur pour Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
 msgstr "Choisir un nom et une description pour votre tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
 msgstr "Ceux-ci peuvent être tout ce que vous voulez - ils sont simplement là pour faciliter l'identification du tunnel dans la console routeur."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
 msgstr "Si vous connaissez des proxies sortants pour ce type de tunnel (HTTP ou SOCKS), les remplir ci-dessous."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
 msgstr "Séparez plusieurs proxys par des virgules."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
 msgstr "Tapez la destination du service I2P auquel ce tunnel client doit se connecter."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
 msgstr "Cela pourrait être la clé destination entièrement en base 64, ou une URL I2P de votre carnet d'adresses."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
 msgstr "Ceci est l'adresse IP sur laquelle votre service est exécuté, c'est généralement sur ​​la même machine, c'est pourquoi 127.0.0.1 est pré-rempli."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
 msgstr "Il s'agit du port sur lequel le service accepte les connexions."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
 msgstr "Il s'agit du port par lequel le tunnel client sera accessible localement."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
 msgstr "C'est aussi le port du client pour le serveur tunnel HTTPBidir."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
 msgstr "Comment voulez-vous que ce tunnel soit accessible ? Par cette machine seulement, votre sous-réseau entier, ou l'Internet externe ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
 msgstr "Vous souhaiterez probablement juste permettre 127.0.0.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
 msgstr "Le routeur I2P peut démarrer automatiquement ce tunnel pour vous lors du démarrage du routeur."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
 msgstr "Cela peut être utile pour les tunnels fréquemment utilisés (en particulier les tunnels serveur), mais pour les tunnels qui sont seulement utilisées occasionnellement, cela signifierait que le routeur I2P crée et maintient des tunnels inutiles."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
 msgstr "L'assistant a recueilli suffisamment d'informations pour créer votre tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
 msgstr "Après avoir cliqué sur le bouton Sauvegarder ci-dessous, l'assistant va configurer le tunnel et vous ramènera à la page principale d'I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
 msgstr "Parce que vous avez choisi de démarrer automatiquement le tunnel lorsque le routeur démarre, vous n'avez pas à aller plus loin."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
 msgstr "Le routeur va démarrer le tunnel une fois qu'il a été mis en place."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
 msgstr "Parce que vous avez choisi de ne pas démarrer automatiquement le tunnel, vous devrez le démarrer manuellement."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
 msgstr "Vous pouvez le faire en cliquant sur le bouton Démarrer sur la page principale qui correspond au nouveau tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
 msgstr "Voici un résumé des options que vous avez choisies :"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
 msgstr "Parallèlement à ces réglages de base, il y a un certain nombre d'options avancées pour la configuration du tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
 msgstr "L'assistant va définir des valeurs par défaut plus raisonnables pour ces derniers, mais vous pouvez consulter et/ou modifier celles-ci en cliquant sur le nom du tunnel dans la page principale I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Sauvegarder tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Suivant"
diff --git a/apps/i2ptunnel/locale/messages_hu.po b/apps/i2ptunnel/locale/messages_hu.po
index f2d7cdc4d5f02b68776431dcc4867b11b630ad7c..9380d230747edc87182c317ad0ba2450105f6011 100644
--- a/apps/i2ptunnel/locale/messages_hu.po
+++ b/apps/i2ptunnel/locale/messages_hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,164 +18,170 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "Belső"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, 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:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Űrlap küldése sikertelen, valószínűleg a 'vissza' vagy 'újratöltés' gombokat használtad a böngésződben. Kérlek, hogy küldd újra."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Az összes alagútra vonatkozó beállítás újratöltve"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Alagút indítása"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Alagút leállítása"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "A változtatás a beállításokon mentésre kerül"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Beállítások mentése sikertelen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Új Alagút"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port nincs beállítva"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Normál kliens"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC kliens"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Normál szerver"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP szerver"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC szerver"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr kliens"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr szerver"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Hoszt nincs beállítva"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Alagút Kezelő - Kliens Alagút Szerkesztése"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Proxy beállítások szerkesztése"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Új proxy beállítások"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -184,537 +190,538 @@ msgstr "Új proxy beállítások"
 msgid "Name"
 msgstr "Név"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Típus"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Leírás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Cél"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Elérési Pont"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "szükséges"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Elérhető"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Kimenő proxyk"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "('IGEN' beállításhoz jelöld be)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Alagút Célállomás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 nem javasolt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Megosztott Kliens"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Alagút megosztása más kliensekkel és IRC vagy HTTP kliensekkel? A változtatáshoz a kliens proxy újraindítása szükséges)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Automatikus Indítás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "DCC Engedélyezése"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Haladó hálózati opciók"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(FIGYELEM: ha ez a kliens proxy alagutak megosztására van beállítva, ezek a beállítások érvényesek az összes megosztott proxy kliensre!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Alagút Beállítások"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Hossz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "ugrásos alagút (rendkívül alacsony teljesítmény)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Szórás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 ugrású szórás (véletlenszerűség nélkül, állandó teljesítmény)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 ugrású szórás (közepes mennyiségű véletlenszerűség, teljesítmény-romlással járhat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 ugrású szórás (nagy mennyiségű véletlenszerűség, teljesítmény-romlással járhat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 ugrású szórás (normál mennyiségű véletlenszerűség nélkül, normál teljesítmény)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 ugrású szórás (nem javasolt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "ugrás szórás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Mennyiség"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Mentések Száma"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 mentési alagút (nincs felesleg, nincs hozzáadott erőforrás használat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 mentési alagút minden irányban (kevés felesleg, alacsony erőforrás használat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 mentési alagút minden irányban (közepes mennyiségű felesleg, közepes mértékű erőforrás használat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 mentési alagút minden irányban (nagy mennyiségű felesleg, magas erőforrás használat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "mentési alagút"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktív csatlakozás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "Tömeges csatlakozás (letöltések / weboldalak / BitTorrent)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Csatlakozás Késleltetése"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "Kérés/válasz csatlakozásokhoz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Router I2CP Cím"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Hoszt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Az alagút nyitás késleltetése szükségessé válásig"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Alagutak mennyiségének csökkentése üres állapotban"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Csökkentett számú alagút"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Üresjárat percben"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Alagutak bezárása üresjárat esetén"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Újranyitáskor Új Kulcsok"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Kikapcsol"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Állandó privát kulcs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fájl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Helyi célállomást"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Helyi Hitelesítés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Kimenő proxy Hitelesítés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Ugrás URL Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Egyéni beállítások"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Mégse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Mentés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P Alagút Kezelő - Szerver Alagút Szerkesztése"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Szerver Beállítások Szerkesztése"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Új szerver beállításai"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Weboldal neve"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(hagyd üresen kimenő proxyknak)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Privát kulcsfile"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Hozzáadás a helyi címjegyzékhez"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Hosztnév Aláírás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Leaseset Titkosítása (Leaseset - magában foglalja a bejövő átjárókat (gateway) adott célállomáshoz, azaz a routerek és alagutak Bejövő pontjait, melyhez kliens csatlakozik, hogy elérjen adott szolgáltatást)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Titkosító Kulcs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Új Kulcs Létrehozása"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Létrehozás"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Először az alagútnak le kell állnia)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Korlátozott Elérés Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Engedélyezett-Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Tiltott-Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Elérési Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Bejövő csatlakozási korlát (0=korlátlan)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Kliensenként"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Percenként"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Óránként"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Naponként"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Összesn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maximális egyidejű csatlakozás (0=korlátlan)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P Alagút Kezelő - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Állapot Üzenetek"
@@ -740,8 +747,8 @@ msgid "Restart All"
 msgstr "Mindet Újraindít"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P Szerver Alagutak"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -798,8 +805,8 @@ msgid "Start"
 msgstr "Indítás"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Új szerver alagút"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_it.po b/apps/i2ptunnel/locale/messages_it.po
index 01462c3b3b7ca33349c0ebb991f92daa7c6d1c66..a029c02f6252458b2ae59ebca5fb4ea3860409da 100644
--- a/apps/i2ptunnel/locale/messages_it.po
+++ b/apps/i2ptunnel/locale/messages_it.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -25,164 +25,170 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} tunnel in entrata, {0} in uscita"
 msgstr[1] "{0} tunnel in entrata, {0} in uscita"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "Larghezza di banda e affidabilità minore"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "Larghezza di banda e affidabilità standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "Larghezza di banda e affidabilità maggiore"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunnel non ancora inizializzati, ricarica tra due minuti."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Sottomissione di form invalido, probabilmente perchè hai usato il bottone 'indietro' o 'aggiorna' del tuo browser. Ripetere perfavore."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Se il problema persiste, verifica di avere i cookies abilitati nel tuo browser."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configurazione ricaricata per tutti i tunnel"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Avviando tunnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Fermando tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Cambiamenti alla configurazione salvati"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Fallimento nel salvataggio della configurazione"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nuovo Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Porta non impostata"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Porta non valida"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Attenzione - È meglio non utilizzare porte inferiori alla 1024"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Client standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "Client HTTP/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Client IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Server standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Server HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "Proxy SOCKS 4/4a/5 "
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "Proxy SOCKS IRC "
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "Proxy CONNECT/SSL/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Server IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Client streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Server streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host non impostato"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Indirizzo non valido"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Gestore Tunnel I2P - Modifica Tunnel Client"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Modifica impostazioni proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nuove impostazioni proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -191,537 +197,538 @@ msgstr "Nuove impostazioni proxy"
 msgid "Name"
 msgstr "Nome"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Tipo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Obiettivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Punto di Accesso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "necessario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Raggiungibile da"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Vuoi usare SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "Proxy di uscita SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Usa plugin del proxy in uscita"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Seleziona il Box per 'SI')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Destinazione Tunnel "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nome, nome:porta, o destinazione"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 non consigliato"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Client Condiviso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Condividere tunnel con altri client e client irc/http? Il cambiamento richiede il riavvio del client proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Avvio Automatico"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Abilita DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Opzioni di rete avanzate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTA: quando questo client proxy è configurato per condividere i tunnel, queste opzioni saranno valide per tutti i client proxy condivisi!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opzioni Tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 tunnel  hop (nessun anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 tunnel  hop (anonimato basso)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 tunnel  hop (anonimato medio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 tunnel  hop (anonimato alto)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "tunnel hop (prestazioni molto basse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Varianza"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "varianza 0 hop  (nessuna randomizzazione, prestazioni coerenti)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "varianza + 0-1 hop (randomizzazione additiva media, prestazioni sottrattive)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "varianza + 0-2 hop (randomizzazione additiva alta, prestazioni sottrattive)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "varianza +/- 0-1 hop (randomizzazione standard, prestazioni standard)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "hop varianza +/- 0-2 (non consigliata)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "varianza hop"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Conteggio"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Conteggio Backup "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 tunnel backup (ridondanza zero, nessun utilizzo di risorse aggiuntivo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 tunnel backup in ogni direzione (ridondanza bassa, utilizzo di risorse basso)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 tunnel backup in ogni direzione (ridondanza media, utilizzo di risorse medio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 tunnel backup in ogni direzione (ridondanza alta, utilizzo di risorse alto)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "tunnel di backup"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "connessione interattiva"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "connessione di massa (download/siti web/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Ritarda Connessione"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "per connessioni richiesta/risposta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Indirizzo I2CP Router"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Porta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Ritarda l'apertura di tunnel fino a che non è richiesta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Riduci la quantità di tunnel quando inattivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Riduci conteggio tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minuti di inattività"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Chiudi i tunnel quando inattivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nuove Chiavi alla riapertura"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Disabilita"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Chiave privata persistente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "File"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Destinazione locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Base 32 (locale)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorizzazione Locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Nome Utente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Password"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorizzazione Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Lista URL salto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Opzioni personalizzate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Salva"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Gestore Tunnel I2P - Modifica Tunnel Server"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Modifica impostazioni server"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nuove impostazioni server"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nome sito web"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(lascia vuoto per gli outproxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "File chiave privata"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Aggiungi alla rubrica locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Firma Hostname"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Codifica Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Chiave cifratura"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Genera nuova chiave"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Genera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Il tunnel deve prima essere fermato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Lista di accesso ristretto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Eccezioni"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Lista Nera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista di accesso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limite connessioni in ingresso (0=illimitate)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Per client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Per minuto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Per ora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Per giorno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Totale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Massimo numero di connessioni concorrenti (0=illimitate)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Limiti POST (0=illimitati)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Per periodo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Minuti di ban"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Periodo limiti POST (minuti)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Gestore Tunnel I2P - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Messaggi di stato"
@@ -747,8 +754,8 @@ msgid "Restart All"
 msgstr "Riavvia tutto"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Tunnel dei server I2P"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -805,8 +812,8 @@ msgid "Start"
 msgstr "Avvia"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Nuovo server tunnel"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_ja.po b/apps/i2ptunnel/locale/messages_ja.po
index 01bb76a5383f5495aa12a5d760eb5f1b8d3aa71a..453da80fd673b893ff2690240051ea62f1a492a5 100644
--- a/apps/i2ptunnel/locale/messages_ja.po
+++ b/apps/i2ptunnel/locale/messages_ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -19,163 +19,169 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "内部"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "トンネルを停止中"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "設定の変更は保存されました"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "設定を保存できませんでした"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "新しいトンネル"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "ポート未設定"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "無効なポート"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "標準クライアント"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC クライアント"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "標準サーバー"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP サーバー"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 プロキシ"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC プロキシ"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS プロキシ"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC サーバー"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr クライアント"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr サーバー"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP 双方向"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "ホスト未設定"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "無効なアドレス"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P トンネルマネージャー - クライアントのトンネルを編集"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "プロキシ設定を編集"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "新しいプロキシ設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -184,537 +190,538 @@ msgstr "新しいプロキシ設定"
 msgid "Name"
 msgstr "名前"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "タイプ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "説明"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "ターゲット"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "アクセスポイント"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "必須"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "次からアクセス可能:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "SSLを使用しますか?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "アウトプロキシ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "アウトプロキシのプラグインを使用"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(「はい」のボックスにチェックを入れてください)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "トンネル送信先"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 は非推奨です"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "共有クライアント"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(他のクライアント及び irc/http クライアントとトンネルを共有しますか?変更にはクライアントプロキシの再起動が必要です)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "自動開始"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "高度なネットワークオプション"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "トンネルオプション"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "長さ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "トンネルをホップ(非常に乏しいパフォーマンス)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "分散"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 ホップ分散 (非ランダム化、一貫したパフォーマンス)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 ホップ分散 (中間的な追加的ランダム化、パフォーマンス減退)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 ホップ分散 (高い追加的ランダム化、パフォーマンス減退)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 ホップ分散 (標準的ランダム化、標準的パフォーマンス)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 ホップ分散 (非推奨)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "ホップ分散"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "回数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "バックアップ回数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "ホスト"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "ポート"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "有効"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "無効"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "ファイル"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "パスワード"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "削除"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "保存"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "ホワイトリスト"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "アクセスリスト"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr ""
@@ -740,7 +747,7 @@ msgid "Restart All"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
+msgid "I2P Hidden Services"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
@@ -798,7 +805,7 @@ msgid "Start"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
+msgid "New hidden service"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
diff --git a/apps/i2ptunnel/locale/messages_nb.po b/apps/i2ptunnel/locale/messages_nb.po
index 5f2d8902213d306ce6ec005fd3076eb3e7d03616..82b0e1ae18732d519e0ea7234111c12fe9711b76 100644
--- a/apps/i2ptunnel/locale/messages_nb.po
+++ b/apps/i2ptunnel/locale/messages_nb.po
@@ -6,13 +6,14 @@
 # Translators:
 # Mikal <mikalv@mikalv.net>, 2013
 # Shpetim <shpetim@privacysolutions.no>, 2014
+# zzzi2p, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-13 00:50+0000\n"
-"Last-Translator: Shpetim <shpetim@privacysolutions.no>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-14 18:50+0000\n"
+"Last-Translator: zzzi2p\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,1162 +21,1182 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "Internt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} inngående, {0} utgående tunneler"
+msgstr[1] "{0} inngående, {0} utgående tunneler"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "lavere bredbånd og pålitelighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "standard bredbånd og pålitelighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "høyere bredbånd og pålitelighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunneler er ikke initialisert ennå, vennligst oppdater i to minutter."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ugyldig skjemainnsending, sannsynligvis fordi du brukte 'tilbake' eller 'reload \"-knappen i nettleseren. Vennligst send inn på nytt."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Hvis problemet vedvarer, må du kontrollere at du har aktivert informasjonskapsler i nettleseren din."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfigurasjon oppdatert for alle tunneler"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Starter tunnel"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Stopper tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Konfigurasjons endringer lagret"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Feilet med å lagre konfigurasjon"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Ny tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port er ikke satt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Ugyldig port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Advarsel - porter mindre enn 1024 er ikke anbefalt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr "Advarsel - identisk port"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standard klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS klienten"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standard tjener"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP tjener"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC tjener"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr tjener"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Vert er ikke satt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Ugyldig adresse"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnel håndterer - Rediger klient tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Rediger Klient Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Rediger proxy instillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Ny proxy instillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Navn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Beskrivesle"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Tilgangspunkt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "krevd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Tilgjengelig av"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr "Bruke SSL?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Ut-proxyer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Merk av boksen for 'JA')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Tunnel destinasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "navn, navn:port, eller destinasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 er ikke anbefalt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Delt klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Dele tunneler med andre klienter og irc/httpklineter? Endring krever restart av klient proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Automatisk start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Slå på DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Avansert nettverks alternativer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTAT: når denne klient proxyen er konfigurert til å dele tunneler, vil de alternativene gjelde for alle delte proxy klienter)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tunnel alternativer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Lengde"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "hopp tunnel (veldig dårlig ytelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "varians"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 hopp varianse (ingen randomisering, konsistent ytelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 hopp varianse (medium additiv randomisering, subtraktiv ytelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 hopp varianse (høy additiv randomisering, subtraktiv ytelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 hopp varianse (standard randomisering, standard ytelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 hopp varianse (anbefales ikke)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hopp varianse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Antall"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Antall backup"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 backup tunneler (0 redundans, ingen ekstra ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 backup tunnel begge veier (lav redundans, lav ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 backup tunneler begge veier (medium redundans, medium ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 backup tunneler begge veier (høy redundans, høy ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "backup tunneler"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktiv tilkobling"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "bulk forbindelse (nedlastning/websider/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "forsink tilkobling"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "Ved forespørsel / respons tilkoblinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Rutert I2CP Adresse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Vert"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Reduser tunnel kvantitet når inaktiv"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Utsett opprettelse av tunnel frem til det er nødvendig"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Skru på"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Reduser tunnel kvantitet når inaktiv"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Redusert tunnel teller"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "inaktive minutter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Lukk tunneller når de er inaktiv"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nye nøkler ved gjennåpning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Skru av"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr "Utsett opprettelse av tunnel frem til det er nødvendig"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Vedvarende privat nøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Lokal destinasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr "For eksperter!"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "lokal autorisasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Passord"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "utproxy autorisasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Hopp URL liste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "egendefinerte alternativer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Slett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Lagre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P Tunnel Håndterer - Rediger Tjener Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Rediger tjener instillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "ny tjener instillinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr "Bruke SSL?"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Webside navn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(la stå tom for ut proxyer)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Privat nøkkel fil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Legg til i lokal adressebok"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Tjenernavn signatur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "kryptere Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Krypterings nøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Generer ny nøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generere"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunnelen må bli stoppet først)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Begrenset Tilgangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "hviteliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "svarteliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Tilgangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Inngående tilkoblings grense (0=ingen grense)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Per klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Per minutt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Per time"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Per dag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maks samtidige tilkoblinger (0=ingen grense)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Ny sertifikat type"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Ingen"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr "Hashcash (innsats)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Hashcash Calc tid"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Anslå"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Skjult"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Signert (Signert av)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr "For eksperter! Endrer B32!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Rediger sertifikat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Rediger"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P Tunnel Håndterer - Liste"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Status meldinger"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Tunnel veiviser"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Stopp alt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Start alt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Restart alt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "I2P Tjener tunneler"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Peker på"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "Status"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Base32 Adresse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Ingen Forhåndsvisning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 msgstr "Starter..."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "Kjører"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Ny tjener tunnel"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Opprett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
 msgstr "I2P Klient tuneller"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Standby"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Ut-proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Destinasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
 msgstr "intern plugin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "Ingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
 msgstr "Ny klient tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
 msgstr "I2P Tunnel Håndterer - Tunnel opprettelse veiviser"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
 msgstr "Tjener eller klient tunnel?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Tunnel type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Tunnel navn og beskrivelse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "Tunnel destinasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
 msgstr "Bindende adresse og port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Tunnel automatisk oppstart"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Veiviser fullført"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
 msgstr "Denne veiviseren vil ta deg gjennom de ulike alternativene for å lage tunneler i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
 msgstr "Det første du må bestemme er om du ønsker å opprette en server eller en klient tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
 msgstr "Hvis du trenger å koble til en ekstern tjeneste, for eksempel en IRC-server innenfor I2P eller en kode depot, må du ha en klient tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
 msgstr "På den annen side, vil hvis du ønsker å være vert for en tjeneste for andre å koble til må du opprette en server tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
 msgstr "Tjener tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
 msgstr "Klient tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
 msgstr "Det finnes typer tunneler for å velge mellom:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
 msgstr "Grunnleggende tunnel for å koble til en enkelt tjeneste i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
 msgstr "Prøv dette hvis ingen av tunnel typene under passer dine behov, eller du ikke vet hva slags tunnel du trenger."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
 msgstr "Tunnel som fungerer som en HTTP proxy for å nå eepsites inne i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
 msgstr "Still inn nettleseren din for å bruke denne tunnelen som http proxy, eller angi \"http_proxy\" miljøvariabelen for kommandolinje-applikasjoner i GNU / Linux"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
 msgstr "Nettsteder utenfor I2P kan også nås hvis en HTTP proxy innen I2P er kjent."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
 msgstr "Tilpasset klient tunnel spesifikk for IRC-tilkoblinger."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
 msgstr "Med denne tunnel typen, vil din IRC klient kunne koble seg til et IRC nettverk inne i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
 msgstr "Hver IRC-nettverk i I2P som du ønsker å koble til vil kreve en egen tunnel. (Se også, SOCKS IRC)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
 msgstr "En tunnel som implementerer SOCKS protokollen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
 msgstr "Dette gjør at både TCP og UDP-tilkoblinger skal sendes gjennom en SOCKS ut proxy innen I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
 msgstr "En klient tunnel implementering av SOCKS-protokollen, som er tilpasset for tilkobling til IRC-nettverk."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
 msgstr "Med denne tunnel typen, kan IRC-nettverk i I2P nås ved å skrive inn I2P adresse i IRC-klient, og konfigurere IRC-klient for å bruke denne SOCKS tunnelen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
 msgstr "Dette betyr at bare en I2P tunnel kreves stedet for en separat tunnel per IRC nettverk."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
 msgstr "IRC-nettverk utenfor I2P kan også nås dersom en SOCKS outproxy innen I2P er kjent, men det avhenger av hvorvidt ut-proxyen har blitt blokkert av IRC-nettverket."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
 msgstr "En klient tunnel som implementerer HTTP CONNECT kommandoen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
 msgstr "Dette gjør TCP-tilkoblinger skal gjøres gjennom en HTTP ut-proxy, forutsatt at proxyen støtter CONNECT kommandoen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
 msgstr "Et tilpasset klient tunnel for Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
 msgstr "En grunnleggende tjener tunnel for en generisk tjeneste inne i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
 msgstr "En tjener tunnel som er tilpasset for HTTP tilkoblinger."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
 msgstr "Bruk denne tunnelen hvis du vil publisere en eepsite"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
 msgstr "Et tilpasset server tunnel som både kan tjene HTTP data og koble til andre server tunneler."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
 msgstr "Denne tunnelen typen er hovedsakelig brukt når du kjører en Seedless tjener"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
 msgstr "En tilpasset server tunnel for IRC netverks tjenere inne i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
 msgstr "Vanligvis trenger man en egen tunnel som skal opprettes for hver IRC server som skal være tilgjengelig inne i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
 msgstr "En tilpasset tjener tunnel for Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
 msgstr "Velg et navn og beskrivelse for din tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
 msgstr "Disse kan være alt du vil - de er bare for enkel identifisering tunnelen i router konsollet."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
 msgstr "Hvis du vet om noen ut-proxyer for denne type tunnel (enten HTTP eller SOCKS), fyll dem ut nedenfor."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
 msgstr "Skille flere proxyer med komma."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
 msgstr "Skriv inn I2P målet for tjenesten som denne klienten tunnelen skal kobles til."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
 msgstr "Dette kan være en full base 64 destinasjon, eller I2P URL fra din adressebok."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
 msgstr "Dette er IP addressen din tjeneste kjører på, vanligvis er det samme maskin som denne, så 127.0.0.1 er automatisk fylt ut."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
 msgstr "Dette er porten tjenesten tar imot tilkoblinger på."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
 msgstr "Dette er porten som klienten tunnelen vil nås fra lokalt."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
 msgstr "Dette er også klient porten for HTTPBidir tjener tunnelen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
 msgstr "Hvordan vil du at denne tunnelen skal åpnes? Ved bare denne maskinen, hele subnett, eller ekstern internett?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
 msgstr "Du vil mest sannsynlig bare gi tilgang til 127.0.0.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
 msgstr "I2P ruteren kan automatisk starte denne tunnelen for deg når ruteren er i gang."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
 msgstr "Dette kan være nyttig for ofte brukte tunneler (spesielt server tunneler), men for tunneler som bare brukes innimellom vil det bety at I2P ruteren skaper og opprettholder unødvendige tunneler."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
 msgstr "Veiviseren har nå samlet nok informasjon til å lage din tunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
 msgstr "Ved å klikke på Lagre-knappen nedenfor, vil veiviseren sette opp tunnelen, og tar deg tilbake til hovedsiden for I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
 msgstr "Fordi du valgte å starte automatisk tunnelen når ruteren starter, trenger du ikke å gjøre noe mer."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
 msgstr "Ruteren vil starte tunnelen med en gang den har blitt satt opp."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
 msgstr "Fordi du valgte å ikke starte automatisk tunnelen, må du manuelt starte den."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
 msgstr "Du kan gjøre dette ved å klikke på Start-knappen på hovedsiden som tilsvarer den nye tunnelen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
 msgstr "Nedenfor er en oppsummering av de alternativene du har valgt:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
 msgstr "Ved siden av disse grunninnstillingene, er det en rekke avanserte alternativer for tunnel konfigurasjon."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
 msgstr "Veiviseren vil sette rimelig fornuftige standardverdier for disse, men du kan vise og / eller redigere disse ved å klikke på tunnelens navn i på hovedsiden til I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Forige"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Lagre tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Ferdig"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Neste"
diff --git a/apps/i2ptunnel/locale/messages_nl.po b/apps/i2ptunnel/locale/messages_nl.po
index d5a8344d551cd5b493e358298833e96c8bd38d51..15958b1168efa2e78a6bd4fa0261691ce1231e61 100644
--- a/apps/i2ptunnel/locale/messages_nl.po
+++ b/apps/i2ptunnel/locale/messages_nl.po
@@ -7,12 +7,13 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
 # Desirius <martinjefmeyers@gmail.com>, 2014
+# skoning <skoning@onenetbeyond.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,164 +22,170 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} inkomende, {0} uitgaande tunnel"
 msgstr[1] "{0} inkomende, {0} uitgaande tunnels"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "verlaag bandbreedte en betrouwbaarheid"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "standaard bandbreedte en betrouwbaarheid"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "hogere bandbreedte en betrouwbaarheid"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
-msgstr ""
+msgstr "Tunnels zijn nog niet klaar, ververs over twee minuten."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ongeldige formulier verzonden, waarschijnlijk doordat je de 'back' of 'reload' button van je browser hebt gebruikt. Verzend opnieuw."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
-msgstr ""
+msgstr "Als dit probleem blijft bestaan, kijk dan of uw browser cookies toestaat."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configuratie van alle tunnels opnieuw geladen"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Opstarten van tunnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Stoppen van tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Configuratie wijzigingen opgeslagen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Opslaan van de configuratie mislukt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nieuwe Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Poort niet opgegeven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Ongeldige poort"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Waarschuwing - poorten lager dan 1024 worden niet aangeraden"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
-msgstr ""
+msgstr "Waarschuwing - dubbele poort"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standaard client"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS cliënt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC client"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standaard server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr client"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host niet opgegeven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Ongeldig adres"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnel Manager - Bewerk Client Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Bewerk proxy instellingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nieuwe proxy instellingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -187,536 +194,537 @@ msgstr "Nieuwe proxy instellingen"
 msgid "Name"
 msgstr "Naam"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Doel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Toegangspunt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "vereist"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Bereikbaar voor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "SSL gebruiken?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Uitgaande proxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "SSL Outproxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Gebruik Outproxy Plugin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Markeer de Box voor 'JA')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Tunnel Destinations"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "naam, naam:poort, of bestemming"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 niet aanbevolen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Gedeelde Client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Deel tunnels met andere clients en irc/httpclients? Wijziging vereist herstart van de client proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Auto Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "DCC inschakelen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Geavanceerde netwerk opties"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(OPMERKING: wanneer deze client proxy is geconfigureerd om tunnels te delen, dan zijn deze opties van toepassing voor alle gedeelde proxy clients!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tunnel Opties"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Lengte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 hop tunnel (geen anoniemiteit)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 hop tunnel (lage anonimiteit)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 hops tunnel (gemiddelde anonimiteit)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 hops tunnel (hoge anonimiteit)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "hop tunnel (zeer slechte prestatie)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variantie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 hop variantie (geen randomisatie, consistente prestatie)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 hop variantie (gemiddeld toegevoegde randomisatie, minder prestatie)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 hop variantie (hoge toegevoegde randomisatie, minder prestatie)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 hop variantie (standaard randomisatie, standaard prestatie)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 hop variantie (niet aanbevolen)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hop variantie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Aantal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Backup Aantal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 backup tunnels (0 redundantie, geen additionele bronnen gebruikt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 backup tunnel in beide richting (lage redundantie, lage aantal bronnen gebruikt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 backup tunnels in beide richting (gemiddelde redundantie, gemiddeld aantal bronnen gebruikt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 backup tunnels in beide richting (hoge redundantie, hoog aantal bronnen gebruikt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "backup tunnels"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interactieve connectie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "bulk connection (downloads/websites/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Vertraagde Connectie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "voor request/response connecties"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Router I2CP Adres"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Poort"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Vertraag tunnel opening totdat het nodig is"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Ingeschakeld"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Verminder tunnel aantal in ruststand"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Verminder tunnel aantal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Rust minuten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Sluit tunnels wanneer in rust"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nieuwe Sleutels bij Heropenen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Uitgeschakeld"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Persistente private sleutel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Bestand"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Lokale destination"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
-msgstr ""
+msgstr "Lokale Base 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
-msgstr ""
+msgstr "Laat User-Agert header door"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
-msgstr ""
+msgstr "Laat Referer header door"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
-msgstr ""
+msgstr "Laat Accept headers door"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
-msgstr ""
+msgstr "Sta SSL toe naar I2P adressen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
-msgstr ""
+msgstr "Handtekening type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
-msgstr ""
+msgstr "Alleen experts!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Lokale Autorisatie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Uitgaande Proxy Autorisatie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Spring URL Lijst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Aangepaste opties"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Verwijder"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P Tunnel Manager - Bewerk Server Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Bewerk server instellingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nieuwe server instellingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Website naam"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(leeg laten voor uitgaande proxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Private sleutel bestand"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Toevoegen aan lokaal adresboek"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Hostnaam Handtekening"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Versleutel Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Encryptie Sleutel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Genereer Nieuwe Sleutel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Genereer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunnel moet eerst gestopt worden)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Beperkte Toegangs Lijst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Wittelijst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Zwartelijst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Toegangslijst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
-msgstr ""
+msgstr "Blokkeer Toegang via Inproxies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
+msgstr "Uniek Lokaal Adres per Cliënt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Inkomende connectie limieten (0=onbeperkt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Per client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Per minuut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Per uur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Per dag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Totaal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maximum gelijktijdige connecties (0=onbeperkt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST limiet (0=ongelimiteerd)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Per periode"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Ban minuten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST limiet periode (minuten)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P Tunnel Manager - Lijst"
+msgstr "Alleen experts! Verandert B32!"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
@@ -743,8 +751,8 @@ msgid "Restart All"
 msgstr "Herstart Alles"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P Server Tunnels"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -801,8 +809,8 @@ msgid "Start"
 msgstr "Start"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Nieuwe server tunnel"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
@@ -879,7 +887,7 @@ msgstr "Tunnel bestemming"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
-msgstr ""
+msgstr "Binden aan adres en poort"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
@@ -894,25 +902,25 @@ msgstr "Setup voltooid"
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
-msgstr ""
+msgstr "Deze wizard helpt u door de verschillende opties voor het maken van tunnels in I2P."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
-msgstr ""
+msgstr "Beslis als eerste of u een server of een client tunnel wilt maken."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
-msgstr ""
+msgstr "Als u wilt verbinden met een service, zoals een IRC server in I2P, of een code repository, dan heeft u een CLIENT tunnel nodig."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
-msgstr ""
+msgstr "Anderszijds, als u voor anderen een service wilt hosten, dan heeft u een SERVER tunnel nodig."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
@@ -928,25 +936,25 @@ msgstr "Er zijn verschillende types tunnel waar je uit kan kiezen:"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
-msgstr ""
+msgstr "Basis tunnel om naar een enkele service binnen I2P te verbinden."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
-msgstr ""
+msgstr "Probeer dit als geen van de tunneltypes bij u past, of als u niet weet wat voor een tunnel u nodig heeft."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
-msgstr ""
+msgstr "Tunnel die een HTTP proxy vormt om eepsites binnen I2P te bereiken."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
-msgstr ""
+msgstr "Stel uw browser in om deze tunnel als http proxy te gebruiken, of zet uw \"http_proxy\" environment variable voor command-line applicaties in GNU/Linux."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
@@ -956,23 +964,23 @@ msgstr "Websites buiten I2P kunnen ook bereikt worden als een HTTP proxy in I2P
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
-msgstr ""
+msgstr "Handmatige client tunnel specifiek voor IRC verbindingen."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
-msgstr ""
+msgstr "Met dit type tunnel kan uw IRC client verbinding maken met een IRC netwerk binnen I2P."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
-msgstr ""
+msgstr "Elk IRC netwerk in I2P waar u mee wilt verbinden heeft een eigen tunnel nodig. (Zie ook SOCKS IRC)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
-msgstr ""
+msgstr "Een tunnel die het SOCKS protocol implementeert."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
@@ -984,7 +992,7 @@ msgstr "Dit zorgt ervoor dat zowel TCP als UDP connecties gemaakt kunnen worden
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
-msgstr ""
+msgstr "Een tunnel die het SOCKS protocol implementeert, speciaal om met IRC netwerken te verbinden."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
@@ -1092,35 +1100,35 @@ msgstr "Dit kan de volle base 64 bestemming sleutel zijn, of een I2P URL uit je
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
-msgstr ""
+msgstr "Dit is het IP adres waarop je service runt. Dit is meestal op dezelfde machine, dus 127.0.0.1 is standaard ingevuld."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
-msgstr ""
+msgstr "Dit is de poort waar de service verbindingen op ontvangt."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
-msgstr ""
+msgstr "Dit is de poort waarop de client tunnel lokaal toegankelijk is."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
-msgstr ""
+msgstr "Dit is ook de client poort voor de HTTPBidir server tunnel."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
-msgstr ""
+msgstr "Voor wat moet deze tunnel toegankelijk zijn? Alleen deze machine, het hele subnet, of het internet?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
-msgstr ""
+msgstr "Waarschijnlijk wilt u alleen 127.0.0.1 toelaten"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
-msgstr ""
+msgstr "De I2P router kan deze tunnel automatisch starten voor u zodra de router wordt gestart."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
@@ -1163,7 +1171,7 @@ msgstr "Dit kan je doen door op de Start knop, op de hoofd pagina van de nieuwe
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
-msgstr ""
+msgstr "Hier onder een opsomming van de door u gekozen opties:"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
@@ -1176,7 +1184,7 @@ msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
-msgstr ""
+msgstr "De wizard zal redelijkerwijs de juiste waarden selecteren, maar u kunt ze bekijken en/of veranderen door op de naam van de tunnel op de I2PTunnel pagina te klikken."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
diff --git a/apps/i2ptunnel/locale/messages_nn.po b/apps/i2ptunnel/locale/messages_nn.po
index 8f3d9aefe24d3d60fb64c29ac6cc1b315935c1ea..d8aa4f6d9675e77b19333427da5a5a0d8a6574f2 100644
--- a/apps/i2ptunnel/locale/messages_nn.po
+++ b/apps/i2ptunnel/locale/messages_nn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-02-06 18:45+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/I2P/language/nn/)\n"
 "MIME-Version: 1.0\n"
@@ -19,1162 +19,1182 @@ msgstr ""
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, 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:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunellane har ikkje opna enno, ver venleg og last om att om to minutt."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ugyldig skjemainnsending, sannsynlegvis fordi du brukte «tilbake»- eller «oppfrisk»-knappen på nettlesaren din. Ver venleg og send om att."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Sjekk at nettlesaren din har støtte for informasjonskapslar viss du enno har problem."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfigurasjon lasta om att for alle tunellar"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Startar tunell"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Stoppar tunell"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Konfigurasjonsendringar lagra"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Klarte ikkje å lagra konfigurasjonen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Ny tunell"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port ikkje stilt inn"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Ugyldig port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Åtvaring – portar under 1024 er ikkje tilrådd"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standardklient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC-klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standardtenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP-tenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5-mellomtenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC-mellomtenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS-mellomtenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC-tenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr-klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr-tenar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP tovegs"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Tenar ikkje stilt inn"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Ugyldig adresse"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2p tunellhandterar – rediger klienttunell"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Rediger mellomtenarinnstillingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nye mellomtenarinnstillingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Namn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Type"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Skildring"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Tilgangspunkt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "kravd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Kan nåast frå"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Ut-mellomtenarar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Huk av for «JA»)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Tunellmålside"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 ikkje tilrådd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Delt klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Del tunellar med andre klientar og irc-/http-klientar? Endringa krev omstart av klientmellomtenaren.)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Autostart"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Skru på DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Avanserte nettverksval"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(MERK: Når denne klientmellomtenaren er konfigurert for å dela tunellar, gjeld vala for alle dei delte mellomtenarklientane!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tunellval"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Lengd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "hoppstunell (veldig dårleg yting)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Varians"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "Varians på 0 hopp (ingen randomisering, konstant yting)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ Varians på 0-1 hopp (middels aukande randomisering, minkande yting)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ Varians på 0-2 hopp (høg aukande randomisering, minkande yting)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- Varians på 0-1 hopp (vanleg randomisering, vanleg yting)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- Varians på 0-2 hopp (ikkje tilrådd)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hoppsvarians"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Tal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Ekstra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 ekstratunellar (0 redundans, ikkje meir ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 ekstratunell kvar veg (låg redundans, låg ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 ekstratunellar kvar veg (middels redundans, middels ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 ekstratunellar kvar veg (høg redundans, høg ressursbruk)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "ekstratunellar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktiv tilkopling"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "massetilkopling (nedlastingar/nettsider/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Forseink tilkopling"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "for førespurnad-/respons-tilkoplingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "I2CP-adresse til ruteren"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Tenar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Reduser tunellkvantitet når inaktiv"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Vent med tunellopning til det trengst"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Skru på"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Reduser tunellkvantitet når inaktiv"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Reduser tunnelmengd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minutt inaktiv"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Lukk tunellar når inaktiv"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nye nøklar ved gjenopning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Skru av"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr "Vent med tunellopning til det trengst"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Varig privat nøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Lokal målside"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Lokal autorisering"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Passord"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorisering av ut-mellomtenar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "URL-liste over vidaresendingstenester"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Eigne val"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Slett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Lagra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P tunellhandterar – rediger tenartunell"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Rediger tenarinnstillingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nye tenarinnstillingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Namn på nettstad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(blank for ut-mellomtenarar)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Privat nøkkelfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Legg til i lokal adressebok"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Signatur på tenarnamn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Krypter «leaseset» (tunellinngangar)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Krypteringsnøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Opprett ny nøkkel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Opprett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunellen må stoppast først)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Avgrensa tilgangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Kviteliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Svarteliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Tilgangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Inn-tilkoplingsgrense (0=inga grense)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Per klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Per minutt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Per time"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Per dag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "I alt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maks samtidige tilkoplingar (0=inga grense)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Ny sertifikattype"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Ingen"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr "Hashcash (arbeidsmengd)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Hashcash kalkuleringstid"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Estimat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Skjult"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Signert (signert av)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Endra sertifikat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Endra"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P tunellhandterar – liste"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Statusmeldingar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Tunellvegvisar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Stopp alle"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Start alle"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Omstart alle"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "I2P tenartunellar"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Peker på"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Førehandsvis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "Status"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Base32-adresse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Inga førehandsvising"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 msgstr "Startar …"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "Køyrer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
 msgstr "Stoppa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Ny tenartunell"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Opprett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
 msgstr "I2P klienttunellar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Ventemodus"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Ut-mellomtenar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Målside"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "ingen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
 msgstr "Ny klienttunell"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
 msgstr "I2P tunellhandterar – vegvisar for tunelloppretting"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
 msgstr "Tenar- eller klienttunell?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Tunelltype"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Tunellnamn og -skildring"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "Tunellmålside"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
 msgstr "Bindingsadresse og -port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Auto-start tunell"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Vegvisar fullført"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
 msgstr "Denne vegvisaren tek deg gjennom dei ulike tilgjengelege vala for å oppretta tunellar i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
 msgstr "Det første du må avgjera er om du ønskjer ein tenar- eller klienttunell."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
 msgstr "Viss du må kopla til ei ekstern teneste, t.d. ein IRC-tenar i I2P eller eit kodelager, så treng du ein KLIENT-tunell."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
 msgstr "Viss du derimot ønskjer å ha ei teneste som andre koplar seg opp mot, så treng du ein TENAR-tunell."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
 msgstr "Tenartunell"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
 msgstr "Klienttunell"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
 msgstr "Det finst fleire typar tunellar å velja mellom:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
 msgstr "Standardtunell for å kopla til ei einskild teneste i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
 msgstr "Prøv denne viss ingen av tunelltypane under passar, eller viss du ikkje veit kva for tunell du treng."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
 msgstr "Tunell som fungerer som ein HTTP-mellomtenar for å nå eepsider i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
 msgstr "La nettlesaren din brukar denne tunellen som ein HTTP-mellomtenar, eller still inn miljøvariabelen «http_proxy» for kommandolinjeprogram i GNU/Linux."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
 msgstr "Du kan òg nå nettsider utanfor I2P om du har ein kjend HTTP-mellomtenar i I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
 msgstr "Klienttunell spesielt innstilt for IRC-tilkoplingar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
 msgstr "Med denne tunelltypen vil IRC-klienten din kunna kopla til eit IRC-nettverk inni I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
 msgstr "Kvart IRC-nettverk i I2P som du ønskjer å kopla til må ha sin eigen tunell. (Sjå òg SOCKS IRC.)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
 msgstr "Ein tunell som implementerer SOCKS-protokollen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
 msgstr "Dette gjer det moleg å oppretta både TCP- og UDP-tilkoplingar gjennom ein SOCKS-basert ut-mellomtenar inni I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
 msgstr "Ein klienttunell som implementerer SOCKS-protokollen, som i tillegg er spesielt innstilt for IRC-nettverk."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
 msgstr "Med denne tunelltypen kan du nå IRC-nettverk inni I2P ved å skriva I2P-adressa i IRC-klienten og konfigurera IRC-klienten til å bruka denne SOCKS-tunellen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
 msgstr "Dette vil seia at du berre treng éin I2P-tunell totalt, i staden for éin tunell per IRC-nettverk."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
 msgstr "Du kan òg nå IRC-nettverk utanfor I2P viss du kjenner til ein SOCKS-basert ut-mellomtenar inni I2P, men det avheng av at ikkje ut-mellomtenaren er blokkert av IRC-nettverket."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
 msgstr "Ein klienttunell som implementerer HTTP CONNECT-kommandoen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
 msgstr "Dette gjer det mogleg å oppretta TCP-tilkoplingar gjennom ein HTTP-basert ut-mellomtenar, dersom mellomtenaren støtter CONNECT-kommandoen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
 msgstr "Ein klienttunell spesielt innstilt for Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
 msgstr "Ein enkel tenartunell for generelle tenester inni I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
 msgstr "Ein tenartunell som er spesielt innstilt for HTTP-tilkoplingar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
 msgstr "Bruk denne tunelltypen viss du vil ha ei eepside."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
 msgstr "Ein tenartunell som kan både servera HTTP-data og kopla til andre tenartunellar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
 msgstr "Denne tunelltypen er hovudsakleg nytta under køyring av ein Seedless-tenar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
 msgstr "Ein tenartunell for å ha IRC-nettverk inni I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
 msgstr "Vanlegvis må du oppretta éin separat tunell for kvar IRC-tenar som skal vera tilgjengeleg inni I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
 msgstr "Ein tenartunell som er spesielt innstilt for Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
 msgstr "Vel eit namn og ei skildring av tunnelen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
 msgstr "Dette kan vera kva som helst – det er berre for å gjera det enkelt for deg å identifisera tunellen i ruterkonsollen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
 msgstr "Fyll inn nedanfor viss du kjenner til utmellomtenarar for denne tunelltypen (anten HTTP eller SOCKS)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
 msgstr "Nytt komma til å skilja mellomtenarar frå kvarandre."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
 msgstr "Skriv inn I2P-målet til tenesten som denne klienttunellen skal kopla til."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
 msgstr "Dette kan vera den fulle målnøkkelen i base 64, eller ein I2P-URL frå adresseboka di."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
 msgstr "Dette er IP-adressa som tenesta di køyrer på. Dette er vanlegvis den same maskinen, så 127.0.0.1 er fylt inn på førehand."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
 msgstr "Dette er porten som tenesta tek i mot tilkoplingar på."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
 msgstr "Dette er porten som du koplar til klienttunellen lokalt med."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
 msgstr "Dette er òg klientporten for HTTPBidir-tenartunellen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
 msgstr "Kor vil du tillata at denne tunellen skal få tilgang frå? Berre denne maskinen, heile subnettet ditt, eller eksternt frå internett?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
 msgstr "Du vil sannsynlegvis berre tillata 127.0.0.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
 msgstr "I2P-ruteren kan automatisk starta denne tunellen for deg når ruteren startar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
 msgstr "Dette kan vera nyttig for tunellar du nyttar ofte (spesielt tenartunellar). For tunellar som berre blir nytta av og til vil det tyda at I2P-ruteren opprettar og vedlikehaldar tunellar du ikkje treng."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
 msgstr "Vegvisaren har no samla inn nok informasjon for å oppretta tunellen din."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
 msgstr "Når du klikkar Lagra under vil vegvisaren oppretta tunellen og senda deg tilbake til hovudsida for I2P-tunellar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
 msgstr "Sidan du valte å starta tunellen automatisk når ruteren startar treng du ikkje gjera noko meir."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
 msgstr "Ruteren vil starta tunellen ved oppstart."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
 msgstr "Fordi du valte å ikkje starta tunellen automatisk må du starta han for hand."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
 msgstr "Du kan gjera dette ved å klikka Start-knappen på hovudsida som samsvarer med den nye tunellen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
 msgstr "Nedanfor er ei oppsummering av vala dine:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
 msgstr "I tillegg til desse grunnleggande innstillingane finst ei rekkje avanserte val for tunellkonfigurasjon."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
 msgstr "Vegvisaren vil velja fornuftige standardverdiar for desse, men du kan visa og/eller redigera desse ved å klikka på tunellnamnet i hovudsida for I2P-tunnellar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Førre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Lagra tunell"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Avslutt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Neste"
diff --git a/apps/i2ptunnel/locale/messages_pl.po b/apps/i2ptunnel/locale/messages_pl.po
index 508d04dd30e4296d772c8f443c5aafc87377e1df..bef612c6735822882659fee66bd52fc563d9fa6d 100644
--- a/apps/i2ptunnel/locale/messages_pl.po
+++ b/apps/i2ptunnel/locale/messages_pl.po
@@ -7,15 +7,16 @@
 # PolishAnon <b790979@klzlk.com>, 2012
 # Warton <businesshehe@yahoo.com>, 2011, 2012
 # Karolina <karolina@bitwylesne.pl>, 2014
+# polacco <polacco@i2pmail.org>, 2014-2015
 # seb, 2013-2014
 # Smert i2p <Smert@safe-mail.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-28 14:43+0000\n"
-"Last-Translator: Karolina <karolina@bitwylesne.pl>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-17 21:05+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,1163 +24,1183 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "wewnętrzny"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{0} wejściowy, {0} wyjściowy tunel"
+msgstr[1] "{0} wejściowe, {0} wyjściowe tunele"
+msgstr[2] "{0} wejściowych, {0} wyjściowych tuneli"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
-msgstr ""
+msgstr "niższa przepustowość i niezawodność"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
-msgstr ""
+msgstr "standardowa przepustowość i niezawodność"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
-msgstr ""
+msgstr "wyższa przepustowość i niezawodność"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunele nie zostały jeszcze zaktualizowane, odśwież proszę za dwie minuty."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Niepoprawne wysłanie formy, prawdopodobnie dlatego, że użyłes przycisku 'wstecz' lub 'odśwież' w swojej przeglądarce. Prosze wyślij ponownie."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Jeśli problem występuje nadal, sprawdź, czy obsługa ciasteczek jest włączona w Twojej przeglądarce."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfiguracja przeładowana dla wszystkich tunelii"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Uruchamianie tunelu"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Zatrzymywanie tunelu"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Zapisano zmiany w konfiguracji"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Nie udało się zapisać zmian"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nowy tunel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Nie ustawiono portu"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Niepoprawny port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Ostrzeżenie - porty mniejsze, niż 1024 nie są polecane"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr "Uwaga – powtarzający się port"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standardowy klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "klient HTTP/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Klient IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standardowy serwer"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Serwer HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Serwer IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Klient Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Serwer Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Nie ustawiono hosta"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Niepoprawny adres"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Menedżer Tuneli I2P - Edytuj tunel klienta"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "Zarządzanie ukrytymi usługami"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Edytuj tunel kliencki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Edytuj ustawienia proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nowe ustawienia proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Typ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Opis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Cel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Punkt Dostępu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "wymagany"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Dostępne przez"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr "Używać SSL?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Serwery outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
-msgstr ""
+msgstr "Proxy wyjściowe SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Użyj Wtyczki Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Zaznacz kwadracik na 'TAK')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Cel Tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nazwa, nazwa:port lub adres docelowy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 niezalecane"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Klient współdzielony"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Współdzielić tunel z innymi klientami oraz z klientami irc/http? Zmiana wymaga restartu proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Auto Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Włącz DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Zaawansowane opcje sieciowe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(ZAUWAŻ: gdy ten klient proxy jest skonfigurowany do dzielenia się tunelami, wtedy te opcje są dla wszystkich klientów proxy!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opcje tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Długość"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 hop tunel (brak anonimowości)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 hop tunel (niska anonimowość)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 hop tunel (średnia anonimowość)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 skokowy tunel? (wysoka anonimowość)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "tunel skoku (bardzo mała wydajność)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Zmienność"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 skoków zmiennych (brak randomizacji, stała wydajność)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 zmienność przeskoków (średni dodatek randomizacji, subtraktywna wydajność)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
-msgstr ""
+msgstr "zmienność plus 0-2 skoki (dodatnia losowość, mniejsza wydajność)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
-msgstr ""
+msgstr "zmienność plus/minus 0-1 skok (standardowa losowość, standardowa wydajość)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
-msgstr ""
+msgstr "zmienność plus/minus 0-2 skoki (nie zalecane)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "Zmienność przeskoków"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Policz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Zapasowe Podliczenie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
-msgstr ""
+msgstr "0 tuneli zapasowych (dodatkowe zasoby nie używane)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
-msgstr ""
+msgstr "1 tunel zapasowy w obu kierunkach (małe użycie zasobów)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
-msgstr ""
+msgstr "2 tunele zapasowe w obu kierunkach (średnie użycie zasobów)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
-msgstr ""
+msgstr "3 tunele zapasowe w obu kierunkach (duże użycie zasobów)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "tunele zapasowe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktywne połączenie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
-msgstr ""
+msgstr "połączenia masowe (strony www, pobieranie plików, BitTorrent)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Opóźniona Zawartość"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "do połączeń żądań/odpowiedzi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
-msgstr "Adres Routera I2CP"
+msgstr "Adres I2CP węzła I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Zredukuj ilość tuneli podczas bezczynności"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Otwórz tunel dopiero wtedy, gdy jest potrzebny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Włącz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Zredukuj ilość tuneli podczas bezczynności"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
-msgstr ""
+msgstr "Zredukowana ilość tuneli"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minut bezczynności"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Zamknij tunele podczas bezczynności"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nowe Klucze przy ponownym otwarciu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
-msgstr ""
+msgstr "Trwały klucz prywatny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Plik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Cel localny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
-msgstr ""
+msgstr "Lokalny adres Base32"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr "Przekazuj nagłówek User-Agent"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr "Przekazuj nagłówek Referer"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr "Przekazuj nagłówek Accept"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr "Zezwalaj na SSL do adresów I2P"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr "Rodzaj podpisu"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr "Tylko dla zaawansowanych!"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Lokalna autoryzacja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Użytkownik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Hasło"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autoryzacja Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
-msgstr ""
+msgstr "Lista adresów usług skoków (jump)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Dodatkowe opcje"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Menedżer Tuneli I2P - Edytuj tunel serwera"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "Edytuj ukrytą usługę"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Edytuj ustawienia serwera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nowe ustawienia serwera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr "Używać SSL?"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nazwa strony"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(pozostaw puste dla outproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Klucz prywatny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Dodaj do książki adresowej"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Sygnatura Nazwy Hosta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
-msgstr ""
+msgstr "Zaszyfrowany LeaseSet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Klucz szyfrujący"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Generuj nowy klucz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generuj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunel musi być najpierw zatrzymany)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Lista Zastrzeżonego Dostępu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Biała Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Czarna Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista Dostępu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr "Zablokuj dostęp przez proxy wejściowe"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr "Niepowtarzalny adres lokalny dla każdego klienta"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "Optymalizacja dla hostingu zwielokrotnionego."
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limity przychodzących połączeń (0=bez limitu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Na klienta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Na minutę"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Na godzinę"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Dziennie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Łącznie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maksymalna ilość równoczesnych połączeń (0=brak limitu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
-msgstr ""
+msgstr "Ograniczenie ilości zapytań HTTP POST (0 = bez ograniczeń)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
-msgstr ""
+msgstr "Na okres"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
-msgstr ""
+msgstr "Długość trwania bana w minutach"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Nowy typ certyfikatu"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Żaden"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr ""
+msgstr "Okres obowiązywania ograniczenia zapytań HTTP POST (w minutach)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Hashcash Czas Obliczeń"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr "Tylko dla zaawansowanych! Zmienia B32!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Oszacuj"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Ukryty"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Podpisany (podpisany przez)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Modyfikuj certyfikat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Modyfikuj"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "Menedżer Tuneli I2P - Lista"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Wiadomości o Statusie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Kreator Tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Zatrzymaj wszystkie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Uruchom wszystkie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Restartuj wszystkie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "Tunele serwerów I2P"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr "Ukryte usługi I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Wskazuje na"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Podgląd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "Status"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Adres Base32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Brak podglądu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 msgstr "Rozpoczynam..."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "Uruchomiony"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Uruchom"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Nowy tunel serwera"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr "Nowa ukryta usługa"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Utwórz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
-msgstr "Tunele klientów I2P"
+msgstr "Tunele klienckie I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Interfejs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Uśpij"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Cel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
-msgstr ""
+msgstr "wewnętrzna wtyczka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "żadne"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
-msgstr "Nowy tunel klienta"
+msgstr "Nowy tunel kliencki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
-msgstr "Menager Tunelu I2P - Kreator Tunelu"
+msgstr "Zarządzanie ukrytymi usługami I2P – Kreator Tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
-msgstr "Tunel serwer czy tunel klient?"
+msgstr "Tunel serwerowy czy kliencki?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Typ tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Nazwa tunelu i opis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "Miejsce przeznaczenia tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
-msgstr ""
+msgstr "Przypisanie adresu i portu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Auto-Start Tunnelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Kreator zakończony"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
-msgstr ""
+msgstr "Kreator pozwoli Ci wybrać wiele opcji dostępnych przy tworzeniu tunelu w I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
-msgstr ""
+msgstr "Pierwsza rzecz to zdecydowanie, czy chcesz utworzyć tunel dla klienta czy dla serwera."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
-msgstr ""
+msgstr "Jeśli potrzebujesz połączyć się do zdalnej usługi w sieci I2P, np. do serwera IRC lub repozytorium kodu, musisz utworzyć tunel kliencki."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
-msgstr ""
+msgstr "Z drugiej strony, jeśli chcesz uruchomić usługę dla innych (np. ukrytą stronę www, repozytorium git), musisz utworzyć tunel serwerowy."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
-msgstr "Tunnel Serwera"
+msgstr "Tunnel serwerowy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
-msgstr "Tunnel Klienta"
+msgstr "Tunnel kliencki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
-msgstr ""
+msgstr "Jest kilka rodzajów tuneli:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
-msgstr ""
+msgstr "Podstawowy tunel do łączenie się z pojedynczą usługą wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
-msgstr ""
+msgstr "Wypróbuj ten tunel, jeśli żaden z poniższych nie odpowiada Twoim wymaganiom lub nie wiesz, jakiego tunelu potrzebujesz."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
-msgstr ""
+msgstr "Tunel, który działa jako proxy HTTP umożliwiające dostęp do ukrytych stron wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
-msgstr ""
+msgstr "Ustaw swoją przeglądarkę, by używała tego tunelu jako proxy HTTP. By programy konsolowe (np. Wget) używały tego proxy, ustaw zmienną powłoki \"http_proxy\"."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
-msgstr ""
+msgstr "Strony spoza I2P również mogą być dostępne, jeśli znany jest serwer proxy HTTP wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
-msgstr ""
+msgstr "Specjalny tunel kliencki dostosowany do połączeń z IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
-msgstr ""
+msgstr "Dzięki tunelowi tego rodzaju Twój klient IRC będzie mógł połączyć się z serwerem IRC wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
-msgstr ""
+msgstr "Każda sieć IRC wewnątrz I2P będzie potrzebowałą oddzielnego tunelu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
-msgstr ""
+msgstr "Tunel, który implementuje protokół SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
-msgstr ""
+msgstr "Pozwala to na tworzenie połączeń TCP oraz UDP wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
-msgstr ""
+msgstr "Tunel kliencki implementujący protokół SOCKS, z przeznaczeniem do łączenia z sieciami IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
-msgstr ""
+msgstr "Z tym rodzajem tunelu, po skonfigurowaniu klienta IRC do używania tego tunelu SOCKS, możliwe jest łączenie się z różnymi sieciami IRC poprzez wpisanie adresu I2P w kliencie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
-msgstr ""
+msgstr "To znaczy, że wystarczy jeden tunel I2P; osobne tunele dla każdej sieci IRC nie są potrzebne."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
-msgstr ""
+msgstr "Jeśli znane jest wyjściowe proxy, można łączyć się również z sieciami IRC spoza I2P, o ile dana sieć nie zablokowała tego proxy."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
-msgstr ""
+msgstr "Tunel kliencki, który implementuje polecenie HTTP CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
-msgstr ""
+msgstr "To pozwala na połączenia TCP poprzez wyjściowe proxy HTTP, pod warunkiem, że serwer proxy obsługuje polecenie HTTP CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
-msgstr ""
+msgstr "Specjalny tunel kliencki dla Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
-msgstr ""
+msgstr "Podstawowy tunel serwerowy do hostowania usług wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
-msgstr ""
+msgstr "Tunel serwerowy specjalnie dla połączeń HTTP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
-msgstr ""
+msgstr "Użyj tego rodzaju tunelu, jeśli chcesz hostować ukrytą stronę www."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
-msgstr ""
+msgstr "Tunel serwerowy, który może przyjmować połączenia HTTP i łączyć się z innymi tunelami serwerowymi."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
-msgstr ""
+msgstr "Ten rodzaj tunelu używany jest głównie przy korzystaniu z serwera Seedless."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
-msgstr ""
+msgstr "Tunel serwerowy specjalny dla serwerów IRC wewnątrz I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
-msgstr ""
+msgstr "Zazwyczaj dla każdego serera IRC wewnątrz I2P musi być utworzony oddzielny tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
-msgstr ""
+msgstr "Specjalny tunel serwerowy dla Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
-msgstr ""
+msgstr "Wybierz nazwę i opis dla swojego tunelu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
-msgstr ""
+msgstr "To może być cokolwiek – używane jest tylko do ławtwiejszej identyfikacji w konsoli węzła."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
-msgstr ""
+msgstr "Jeśli znasz jakieś proxy wyjściowe dla tego typu tunelu (czy to HTTP, czy też SOCKS), wpisz je poniżej."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
-msgstr ""
+msgstr "Jeśli podajesz kilka proxy, rozdziel je przecinkiem."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
-msgstr ""
+msgstr "Wpisz miejsce docelowe usługi, z którą ma łączyć tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
-msgstr ""
+msgstr "Powinien być to pełny klucz miejsca przeznaczenia w formacie Base64 albo adres i2p z Twojej książki adresowej."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
-msgstr ""
+msgstr "To jest adres IP, pod którym dostępna jest Twoja usługa. Zazwyczaj jest to ten sam host, więc 127.0.0.1 jest wpisane automatycznie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
-msgstr ""
+msgstr "To jest port, na którym usługa nasłuchuje przychodzących połączeń."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
-msgstr ""
+msgstr "To jest port, przez który tunel będzie dostępny lokalnie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
-msgstr ""
+msgstr "To jest również port klienta dla dwukierunkowego tunelu serwerowego HTTPBidir."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
-msgstr ""
+msgstr "Czy tunel ma być dostępny tylko z tego komputera, podsieci czy z całego internetu?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
-msgstr ""
+msgstr "Najprawdopodobniej będziesz chciał(a) dopuścić tylko 127.0.0.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
-msgstr ""
+msgstr "Przy uruchamianiu węzła I2P, tunel ten może być automatycznie uruchamiany."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
-msgstr ""
+msgstr "Może być to przydatne dla często używanych tuneli (szczególnie serwerowych). Dla tuneli rzadko używanych może to prowadzić do sytuacji, w której węzeł I2P tworzy i utrzymuje zbędne tunele."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
-msgstr ""
+msgstr "Kreator zebrał wystarczającą ilość informacji, by utworzyć Twój tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
-msgstr ""
+msgstr "Po kliknięciu poniższego guzika \"Zapisz\", Kreator utworzy tunel i przeniesie Cię do Zarządzania ukrytymi usługami I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
-msgstr ""
+msgstr "Ponieważ wybrano automatyczne uruchamianie tunelu, nie musisz nic już więcej robić."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
-msgstr ""
+msgstr "Węzeł I2P uruchomi tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
-msgstr ""
+msgstr "Ponieważ nie wybrano automatycznego uruchamiania tunelu, trzeba będzie to zrobić ręcznie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
-msgstr ""
+msgstr "Możesz to zrobić klikając na stronie głównej guzik \"start\" odpowiedniego tunelu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
-msgstr ""
+msgstr "Poniżej jest podsumowanie wybranych przez Ciebie opcji:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
-msgstr ""
+msgstr "Poza podstawowymi ustawieniami jest jeszcze wiele ustawień zaawansowanych."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
-msgstr ""
+msgstr "Kreator wybierze zadowalające wartości domyślne dla każdej z opcji, ale możesz później je zmienić wybierając odpowiedni tunel na głównej stronie Zarządzania ukrytymi usługami I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Zapisz Tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Zakończ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Następny"
diff --git a/apps/i2ptunnel/locale/messages_pt.po b/apps/i2ptunnel/locale/messages_pt.po
index 54a0b704ea19378149c11aefee2f20797f861cc5..8a655b37f0114c69fc1c8c7b6a0881cb37ca23b8 100644
--- a/apps/i2ptunnel/locale/messages_pt.po
+++ b/apps/i2ptunnel/locale/messages_pt.po
@@ -6,14 +6,14 @@
 # Translators:
 # kgtm <fabio.h.f.antunes@gmail.com>, 2014
 # Rafael Ferrari, 2013
-# Tulio Simoes Martins Padilha, 2013
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
 # wicked, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -22,164 +22,170 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} túnel de entrada, {0} de saída"
 msgstr[1] "{0} túneis de entrada, {0} de saída"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "Baixar largura de banda e confiabilidade"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "largura de banda e confiabilidade padrão"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "aumentar largura de banda e confiabilidade"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Os túneis ainda não foram iniciados, por favor esperar dois minutos."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Envio de formulário inválido, provavelmente porque você usou o 'voltar' ou 'recarregar' no seu navegador. Por favor reenvie."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Se o problema persistir, verificar se o seu navegador está aceitando cookies."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configuração recarregada em todos os túneis"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Iniciar túnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Parar túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "As configurações foram guardadas"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Falha a guardar as configurações"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Novo Túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Porto não definido"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Porta inválida"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Aviso - portas abaixo de 1024 não são recomendadas"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Cliente padrão"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Cliente IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Servidor Padrão"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Servidor IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Cliente Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Servidor Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host por definir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Endereço inválido"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Gestor de Túnel I2P - Editar o Cliente do Túnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Editar as definições da proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Novas definições da proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -188,537 +194,538 @@ msgstr "Novas definições da proxy"
 msgid "Name"
 msgstr "Nome"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Tipo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Descrição"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Alvo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Ponto de Acesso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "obrigatório"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Ao alcance de"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Usar SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Proxys de saída"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Marque a Caixa para 'SIM')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Destino do Túnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nome, nome:porta, ou destino"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 não é recomendado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Cliente Partilhado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Compartilhe túneis com outros clientes e IRC / httpclients? Mudança requer a reinicialização do proxy do cliente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Inicio Automático"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Habilitar DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Opções avançadas da rede"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTA: quando esse cliente proxy é configurado para partilhar túneis, então, essas opções são para todos os clientes proxy compartilhados!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opções de Túnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Comprimento"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 saltos túnel (sem anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 saltos túnel (baixo anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 saltos túnel (médio anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 saltos túnel (grande anonimato)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "túnel de salto (muito baixa performance)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variação"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 variações de salto (sem randomização, performance constante)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 variações de salto (randomização aditivada media, performance subtraída)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 variações de salto (randomização aditivada alta, performance subtraída)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 variações de salto (randomização padrão, performance padrão)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 variações de salto (não recomendado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "variação de salto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Contar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Contagem de Backups"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 túneis backup (0 de redundância, sem uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 túnel backup em cada direção (baixa redundância, baixo uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 túneis backup em cada direção (média redundância, médio uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 túneis backup em cada direção (alta redundância, alto uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "túneis backup"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "conexão interativa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "conexão em lotes (downloads/websites/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Atrasar Conexão"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "para conexões do tipo request/response"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Endereço I2CP do Roteador"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Porta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Atrasar a abertura do túnel até ser requisitado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Reduzir quantidade de túneis quando inativo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Quantidade de túneis reduzida"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Tempo de inatividade"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Fechar os túneis quando inativo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Novas chaves ao reabrir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Chave privada permanente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Arquivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Destino local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Base 32 do endereço local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorização Local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Usuário"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Senha"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorização do proxy de saída"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Lista de URLs de salto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Opções personalizadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Salvar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Gerenciamento de Túneis I2P - Editar túneis de servidor"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Editar configurações de servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nova configuração de servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nome do website"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(deixar em banco para proxy de saída)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Arquivo de chave particular"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Adicionar ao livro de endereços local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Assinatura do Hostname"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Encriptar o Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Chave de encriptação"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Gerar Nova Chave"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Gerar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(O túnel precisa ser parado primeiro)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Lista de acesso restrito"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Lista branca"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista de acesso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limite de conexões de entrada (0=sem limite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Por cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Por minuto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Por hora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Por dia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Max. de conexões simultâneas (0 = ilimitado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Limite de submissões HTTP POST (0 = ilimitado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Por período"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Minutos de proibição"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Período de limite submissões HTTP POST (minutos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Gerenciamento de Túneis I2P - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Mensagens de status"
@@ -744,8 +751,8 @@ msgid "Restart All"
 msgstr "Reiniciar Todos"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Túneis de servidor I2P"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -802,8 +809,8 @@ msgid "Start"
 msgstr "Iniciar"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Novo túnel de servidor"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_pt_BR.po b/apps/i2ptunnel/locale/messages_pt_BR.po
index ec407bb863321005209506c048732bb2e4f9c433..a9949f783a5bc995694822d4aa3527b67d8272e8 100644
--- a/apps/i2ptunnel/locale/messages_pt_BR.po
+++ b/apps/i2ptunnel/locale/messages_pt_BR.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,164 +21,170 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "internal"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, 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:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Os túneis não foram inicializados ainda, por favor, recarregue em dois minutos."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Forma de submissão inválida, porque provavelmente você usou o botão \"para trás\" ou \"recarregar\" no navegador. Submite de novo."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Se o problema persistir, verifique se o seu navegador está configurado para permitir cookies."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configuração regarregada para todos os túneis"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Inicializando túnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Parando túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "As alterações na configuração foram salvas"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Falha ao salvar configurações"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Novo túnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Porta não especificada"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Porta inválida"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Aviso - portas abaixo de 1024 não são recomendadas"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Cliente padrão"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Cliente IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Servidor padrão"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "servidor HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "servidor IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Cliente streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Servidor streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host não especificado"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Endereço inválido"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Gerenciador de túneis I2P - Editar túnel cliente"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Editar especificações de proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Novas especificações de proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -187,537 +193,538 @@ msgstr "Novas especificações de proxy"
 msgid "Name"
 msgstr "Nome"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Tipo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Descrição"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Alvo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Ponto de acesso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "necessário"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Ao alcance de"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Usar SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Proxies de saída"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Selecione a caixa para 'SIM')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Destino do túnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nome, nome:porta ou destino"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 não recomendado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Cliente compartilhado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Compartilhar túneis com outros clientes e clientes irc/http? Alterar requer a reinicialização do proxy de cliente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Inicialização automática"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Permitir DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Opções de rede avançadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTA: quando este client proxy é configurado para compartilhar túneis, estas opções se aplicam para todos os proxy clients compartilhados!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opções de túneis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Comprimento"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "Túnel hop (execução ruim)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variação"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "Variação de hop 0 (sem randomização, execução consistente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "Variação de hop + 0-1 (randomização adicional média, execução subtrativa)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "Variação de hop + 0-2 (randomização adicional alta, execução subtrativa)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "Variação de hop +/- 0-1 (randomização padrão, execução padrão)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "Variação de hop +/- 0-2 (não recomendada)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "Variação de hop"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Contagem"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Contagem de backup"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 túneis de backup (redundância 0, sem recursos adicionais)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 túnel de backup (redundância mínima, utilização de recursos baixa)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 túneis de backup em cada direção (redundância média, utilização de recursos média)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 túneis de backup em cada direção (redundância alta, utilização de recursos alta)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "túneis de backup"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "conexão interativa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "conexão em massa (downloads/websites/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Atrasar Conexão"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "para conexões de pedidos/respostas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Endereço I2CP do roteador"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Porta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Túnel atrasado aberto até ser requerido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Permitir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Reduzir quantidade de túneis quando inativo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Quantidade de túnel reduzida"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minutos inativos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Fechar túneis quando morto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Novas Chaves em Reabrir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Chave privada persistente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Arquivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Destino local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorização local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Senha"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorização de proxy de saída"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Pular lista de URLs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Opções personalizadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Deletar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Salvar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Gerenciador de túneis I2P - Editar túnel servidor"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Editar especificações de servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Novas especificações de servidor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Nome do website"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(deixar em branco para proxies de saída)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Arquivo de chave privada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Adicionar ao livro de endereços local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Assinatura do nome do host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Criptografar Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Chave criptográfica"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Gerar uma nova chave"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Gerar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(O túnel deve ser interrompido primeiro)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Liste de acessos restritos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Lista de previlégios"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Lista de proibições"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista de acessos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limites da conexão entrante (0=ilimitado)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Por cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Por minuto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Por hora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Por dia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Conexões concorrentes máximas (0=ilimitada)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Por período"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Gerenciador de túneis I2P - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Mensagens de Estado"
@@ -743,8 +750,8 @@ msgid "Restart All"
 msgstr "Reinicializar todos"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Túneis de servidor I2P"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -801,8 +808,8 @@ msgid "Start"
 msgstr "Inicializar"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Novo túnel servidor"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_ro.po b/apps/i2ptunnel/locale/messages_ro.po
index 32dad11e812e39b32ce05df84a568f415a2b9b5c..d66b78f44dfd1780a1f183c67456db6198d7e31d 100644
--- a/apps/i2ptunnel/locale/messages_ro.po
+++ b/apps/i2ptunnel/locale/messages_ro.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-02-06 18:45+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "Intern"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -31,1150 +31,1170 @@ msgstr[0] "{0} de intrare, {0} tuneluri de ieșire "
 msgstr[1] "{0} de intrare, {0} tuneluri de ieșire"
 msgstr[2] "{0} de intrare, {0} tuneluri de ieșire"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "lățime de bandă și fiabilitate joasa"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "lățime de bandă și fiabilitate standarda,"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "lățime de bandă și fiabilitate inalta,"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tuneluri încă nu sunt inițializate , vă rugăm să reîncărcați în două minute."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Transmiterea formularului invalid, probabil pentru că ați folosit butonul \"reload\" sau \"inapoi\" din browser-ul dumneavoastră. Vă rugăm retrimiteți."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Dacă problema persistă, verificați dacă aveți activate cookie-urile în browser-ul dumneavoastră."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Configurare reîncărcata pentru toate tunelurile"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Pornirea tunelului"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Oprirea tunelului"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Schimbarea configuraţiei salvat"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Eșec la salvarea configurației"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Tunel nou"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Portul nu este setat"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Port incorect"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Atenție - nu sunt recomandate porturi mai mici de 1024"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Client standart"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Client IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Server standard"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Server HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECTEAZA/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Server IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Client Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Server streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Gazdă nu este setata"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Adresă nevalidă"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnel manager - Editare Client Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Editați setările proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Opțiuni proxy noi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Nume"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Tip"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Descriere"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Destinație"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Punct de acces"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "necesar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "accesibil cu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr "Utilizați SSL?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Bifați căsuța pentru \"DA\")"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "destinație tunel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "nume, nume: port, sau destinație"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "B32 nu este recomandat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "client comun"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Cota de tuneluri cu alți clienți și irc / httpclients? Schimbarea necesită repornirea de proxy client)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Start automat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Activează DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Opțiuni avansate de rețea"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(NOTĂ: când acest proxy client este configurat pentru a partaja tuneluri, atunci aceste opțiuni sunt pentru toti clientii proxy comune!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Opțiuni tunel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Durată"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 tunel hop (fara anonimat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 tunel hop (anonimat mic)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 tunel hop (anonimat mediu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 tunel hop (anonimat maxim)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "tunel hop (performanță foarte slabă)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Varianță"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "variație 0 hop (fără randomizare, performanță consistenta)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 hop variație (randomizare aditiv mediu, performanță substractiva)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 hop variație (randomizare ridicat aditiva, performanță substractiva)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+ / - 0-1 hop varianța (randomizare standarda, performanță Standard)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+ / - 0-2 hop variație (nu se recomandă)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hop variație"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Număr"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Numar de rezervă"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 tuneluri de rezerva (0 redundanță, utilizarea resurselor nu e adăugata)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 tunel de rezervă pentru fiecare direcție (redundanță scăzuta, utilizarea redusă a resurselor)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 tunele de rezervă pentru fiecare direcție (redundanță maxima, utilizarea maxima a resurselor)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 tunel de rezervă pentru fiecare direcție (redundanță maxima, utilizarea maxima a resurselor)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "tuneluri de rezervă"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "conexiune interactiva"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "conexiune în vrac (download-uri / site-uri / BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "întârziere Connectarii"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "pentru conexiuni de cerere/răspuns"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Router I2CP Adresa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Gazdă"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Reducerea cantitatii tunelilor atunci când este inactiva"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Întârziere tunelului deschis până este necesar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Activează"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Reducerea cantitatii tunelilor atunci când este inactiva"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Scăderea numărului de tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "minute inactive"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Inchiderea tunelurilor când e  inactiv"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Tastele noi la fiecare redeschidere"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Deactivare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr "Întârziere tunelului deschis până este necesar"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Cheie privată persistenta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fișier"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Destinația locala"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Autorizare locala"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Numele utilizatorului"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Parolă"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Outproxy Autorizare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Sari la Lista de URL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Opțiuni personalizate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Renunță"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Salvează"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Manager de tunele I2P - Editraza tunel de server"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Editați setările de server"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Setările de server noi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr "Utilizați SSL?"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Numele site-ului"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(lăsați gol pentru outproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Fișier cheie privată"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Adauga la agenda locala"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Semnătura hostname"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Criptarea Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Cheie de criptare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Generează o cheie noua"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generează"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunnelul mai întâi trebuie să fie oprit )"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Lista de acces restricționat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Listă de excepții"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Listă de blocare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Lista de acces"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limitele de conectare la intrare (0 = nelimitat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "pe client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "pe minut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "pe ora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "pe zi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Conexiuni concurente max (0 = nelimitat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Limitele POST (0 = nelimitat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "pe perioadă"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "ban minute"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Perioada limita POST (minute)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Nou tip de certificat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Niciunul"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr "Hashcash (efort)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Hashcash Calc Timp"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Estimare"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Ascuns"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Semnat (semnată de)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Modificare certificat"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Modifică"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "Managerul tunelului I2P"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Mesaje de status"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Reîmprospătează"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Expert tunel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Oprește toate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Pornește toate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Repornește toate"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "I2P server Tunele"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Puncte la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Previzualizare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "Stare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Adresa Base32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Nici o previzualizare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 msgstr "Pornire..."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Stop"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "În execuţie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
 msgstr "Oprit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Tunel de server nou"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Creează"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
 msgstr "I2P Tunnel client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Interfață"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Stare de veghe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Destinație"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "nici unul"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
 msgstr "Tunel client nou"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
 msgstr "I2P Tunnel manager - Expert Crearea Tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
 msgstr "Server sau tunel client?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Tipul tunerului"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Numele tunel și descrierea"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "destinație tunel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
 msgstr "Adresa de legare și de port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Tunel auto-start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Expertul finalizat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
 msgstr "Acest asistent vă va lua prin diferite opțiuni disponibile pentru crearea tunelurilor în I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
 msgstr "Primul lucru este de a decide dacă doriți să creați un server sau un tunel client."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
 msgstr "Dacă aveți nevoie pentru a vă conecta la un serviciu de la distanță, cum ar fi un server de IRC în interiorul I2P sau un depozit de cod, atunci veți avea nevoie de un tunel CLIENT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
 msgstr "Pe de altă parte, dacă doriți să găzduiti un serviciu pentru alții veți avea nevoie pentru a crea un server de tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
 msgstr "Tunnel serverului"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
 msgstr "Tunnel client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
 msgstr "Există mai multe tipuri de tuneluri pentru a alege din:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
 msgstr "Tunel de bază pentru conectarea la un singur serviciu în interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
 msgstr "Încercați acest lucru dacă nici unul dintre tipurile de tunel de mai jos se potrivesc cerințelor dumneavoastră, sau nu stiti ce tip de tunel de care aveți nevoie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
 msgstr "Tunel care actioneaza ca un proxy HTTP pentru a ajunge la eepsites din interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
 msgstr "Setati browser-ul pentru a utiliza acest tunel ca un proxy HTTP, sau pentru a seta variabila de mediu \"http_proxy\", pentru aplicații de linie de comandă în GNU / Linux."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
 msgstr "Site-uri din afara I2P poate fi atins în cazul în care un proxy HTTP în I2P este cunoscut."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
 msgstr "Tunel client personalizate specific pentru conexiuni de IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
 msgstr "Cu acest tip tunel, clientul tau de IRC va fi capabil să se conecteze la o retea IRC din interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
 msgstr "Fiecare rețea de IRC în I2P la care doriți să vă conectați pentru a va necesita propriul tunel. (A se vedea de asemenea, SOCKS IRC)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
 msgstr "Un tunel care implementează protocolul SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
 msgstr "Acest lucru permite conexiunile cit TCP atât si UDP să se facă printr-un SOCKS outproxy în I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
 msgstr "Un tunel client de punere în aplicare protocolul SOCKS, care este personalizat pentru conectarea la retele de IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
 msgstr "Cu acest tip tunel, retele de IRC din I2P poate ajunge tastând adresa I2P in clientul tau de IRC, și configurarea clientul IRC pentru a utiliza acest tunel SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
 msgstr "Aceasta înseamnă că este necesar doar un tunel I2P mai degrabă decât un tunel separat pentru fiecare rețea IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
 msgstr "Retele IRC din afara I2P pot fi ajunse, de asemenea, în cazul în care SOCKS outproxy în I2P este cunoscut, deși aceasta depinde dacă  outproxy a fost blocat sau nu de către rețeaua IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
 msgstr "Un tunel client care implementează comanda HTTP CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
 msgstr "Acest lucru permite conexiuni TCP pentru a fi efectuate printr-un outproxy HTTP, presupunând proxy acceptă comanda CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
 msgstr "Un tunel client personalizat pentru Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
 msgstr "Un tunel de server de bază pentru găzduirea un serviciu generic în interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
 msgstr "Un tunel de server, care este personalizat pentru conexiuni HTTP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
 msgstr "Utilizați acest tip tunel, dacă doriți să găzduiti un eepsite."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
 msgstr "Un tunel de server personalizat, care poate servi atât pentru date HTTP cit și pentru conectarea la alte tuneluri de server."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
 msgstr "Acest tip tunel este folosit în principal atunci când rulează un server de Seedless."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
 msgstr "Un tunel de server personalizat pentru găzduirea retelei de IRC în interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
 msgstr "De obicei, un tunel separat trebuie să fie creat pentru fiecare server de IRC, care să fie accesibil în interiorul I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
 msgstr "Un tunel server personalizat pentru Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
 msgstr "Alegeți un nume și o descriere pentru tunelul dumneavoastră."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
 msgstr "Acestea pot fi orice vrei - acestea sunt doar pentru a facilita identificarea tunelului în routerconsole."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
 msgstr "Dacă știți de orice outproxies pentru acest tip de tunel (fie HTTP sau SOCKS), completaile-le mai jos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
 msgstr "Mai multe proxy-uri separate prin virgula."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
 msgstr "Tapati în destinația I2P a serviciului cu care acest tunel client trebuie să se conecteze."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
 msgstr "Acest lucru ar putea fi   cheia base64 completa destinație, sau un URL I2P din agenda de adrese."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
 msgstr "Acesta este IP la care serviciul se execută, aceasta este, de obicei pe aceeași mașină, astfel 127.0.0.1 este autofilled."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
 msgstr "Acesta este portul pe care serviciul  accepta conexiuni."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
 msgstr "Acesta este portul la care tunelul client va fi accesat de la nivel local."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
 msgstr "Aceasta este, de asemenea, portul de client pentru tunelul de server HTTPBidir."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
 msgstr "Cum vrei ca acest tunel sa fie accesat? Doar de la  această mașină, întreaga subrețea, sau internet extern?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
 msgstr "Veți dori, cel mai probabil, pentru a permite doar 127.0.0.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
 msgstr "Router-ul I2P poate porni automat acest tunel pentru tine atunci când este pornit router-ul."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
 msgstr "Acest lucru poate fi util pentru tuneluri utilizate frecvent (mai ales tuneluri server), dar pentru tuneluri care sunt utilizate doar ocazional, aceasta ar însemna că router-ul I2P  creaza și menține tuneluri inutile."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
 msgstr "Expertul a colectat acum suficiente informații pentru a crea tunel dumneavoastră."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
 msgstr "La clic pe butonul Save de mai jos, expertul va configura tunelul, și te duce înapoi la pagina principală I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
 msgstr "Pentru că ați ales să pornească automat tunel când router-ul începe, nu trebuie să faci nimic mai mult."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
 msgstr "Router-ul va începe tunelul după ce a fost creat."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
 msgstr "Pentru că ați ales să nu se pornească automat tunel, va trebui să-l porniți manual."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
 msgstr "Puteți face acest lucru făcând clic pe butonul Start de pe pagina principală, care corespunde cu noul tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
 msgstr "Mai jos este un rezumat al opțiunilor alese de tine:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
 msgstr "Alături de aceste setări de bază, există o serie de opțiuni avansate de configurare tunel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
 msgstr "Expertul va stabili valorile implicite rezonabil sensibile pentru acestea, dar puteți vizualiza și/sau edita acestea, făcând clic pe numele tunelului pe pagina principală I2PTunnel."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Precedent"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Salvare Tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Sfârșit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Următorul"
diff --git a/apps/i2ptunnel/locale/messages_ru.po b/apps/i2ptunnel/locale/messages_ru.po
index ea58ca494c7d1fc103df23d1951dccdc48f6fed7..b02ded56db9ce386bc9e147bbb707e1e807c7858 100644
--- a/apps/i2ptunnel/locale/messages_ru.po
+++ b/apps/i2ptunnel/locale/messages_ru.po
@@ -12,17 +12,17 @@
 # Eugene, 2013
 # foo <foo@bar>, 2009
 # gmind, 2012-2013
-# gmind, 2013
+# gmind, 2013,2015
 # gmind, 2012
 # Nikolay Parukhin <parukhin@gmail.com>, 2014
 # sfix <anon-9b36b2e@lycos.com>, 2013
-# yume, 2014
+# yume, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 17:48+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 11:01+0000\n"
 "Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -31,12 +31,12 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "внутренний"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -44,152 +44,158 @@ msgstr[0] "{0} входящий, {0} исходящий туннель"
 msgstr[1] "{0} входящих, {0} исходящих туннеля"
 msgstr[2] "{0} входящих, {0} исходящих туннелей"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "меньшая пропускная способность и надёжность"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "обычная пропускная способность и надёжность"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "более высокая пропускная способность и надёжность"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Туннели ещё не инициализированы, перезагрузите страницу через 2 минуты."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Если проблема сохраняется, проверьте, что в Вашем браузере разрешены cookies."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Остановка туннеля"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Настройки сохранены"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Не удалось сохранить настройки"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Новый туннель"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Порт не задан"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "неверный порт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Внимание - порты с номером менее чем 1024 не рекомендуются"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr "Внимание - повторное использование порта"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Обычный клиент"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS клиент"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC-клиент"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Обычный сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP-сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 прокси"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC прокси"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS прокси"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC-сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr-клиент"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr-сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir (экспериментальный двунаправленный режим, инструкцию спрашивайте у sponge)"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Хост не задан"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Некорректный адрес"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Менеджер Туннелей I2P — Редактирование Клиентского Туннеля"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "Управление скрытыми сервисами"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "Редактировать клиентский туннель"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Редактирование настроек клиентского туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Настройки нового клиентского туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -198,537 +204,538 @@ msgstr "Настройки нового клиентского туннеля"
 msgid "Name"
 msgstr "Название"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Тип"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Описание"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Точка доступа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Точка доступа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "*"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Кому будет доступно (Сетевой интерфейс)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Использовать SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Список outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "Внешние SSL прокси"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Использовать модуль внешнего прокси"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(поставьте галочку для включения)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Адрес назначения туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "имя, имя:порт, или назначение"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 не рекомендуется"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Коллективный клиент"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Использовать туннели коллективно/совместно с другими прокси-клиентами? Изменение настройки потребует перезапуска туннеля)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Автозапуск"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Включить DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Расширенные сетевые настройки"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Параметры туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Длина"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "Тоннель 0 прыжков (без анонимизации)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "Тоннель с 1 прыжком (низкая анонимность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "Тоннель с 2 прыжками (средняя анонимность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "Тоннель с 3 прыжками (высокая анонимность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "хопов (очень низкая производительность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Разброс"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "нулевой разброс (без рандомизации, фиксированная производительность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 разброс (умеренно повышенная рандомизация, пониженная производительность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 разброс (сильно повышенная рандомизация, пониженная производительность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 разброс (стандартная рандомизация, стандартная производительность)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 разброс (не рекомендуется)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "разброс"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Количество"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Резервное количество"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "без резервных туннелей (отсутствие избыточности, отсутствие дополнительной нагрузки на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 резервный туннель в каждом направлении (низкая избыточность, низкая нагрузка на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 резервных туннеля в каждом направлении (умеренная избыточность, умеренная нагрузка на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 резервных туннеля в каждом направлении (высокая избыточность, высокая нагрузка на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "резервных туннелей"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Режим"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "оптимизировать для малых задержек (irc)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "оптимизировать для большого обьема (www/bittorrent)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Задержка соединения"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "оптимизация для соединений, начинающихся с запроса клиента/ответа сервера"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "I2CP Адрес Роутера"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Адрес"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Порт"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Отложить запуск до первого запроса"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Включить"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Снижать количество туннелей при простое"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Количество туннелей"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Минут простоя"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Закрыть туннели при простое"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Генерировать новый ключ при переоткрытии"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Выключить"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Постоянный секретный ключ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Файл"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Локальный адрес назначения"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Локальный Base32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr "Пропускать заголовок User-Agent через"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr "Пропускать заголовок Referer через"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr "Пропускать заголовки Accept через"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr "Разрешить SSL до I2P адресов"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr "Тип подписи"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr "Только для продвинутых пользователей!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Локальная авторизация"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Пароль"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Авторизация outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Список адресов jump-сервисов"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Дополнительные параметры"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Менеджер Туннелей I2P — Редактирование Серверного Туннеля"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "Настроить скрытые сервисы"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Редактирование настроек серверного туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Настройки нового серверного туннеля"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Имя веб-сайта"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(не заполнять для outproxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Файл секретного ключа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Добавить в локальную адресную книгу"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Подпись хоста"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Шифровать LeaseSet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Ключ шифрования"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Сгенерировать новый ключ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Сгенерировать"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Туннель перед этим следует остановить)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Ограниченный доступ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Белый список"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Чёрный список"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Список доступа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr "Блокировать доступ через входные прокси"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr "Уникальный локальный адрес для каждого клиента"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "Оптимизировать для множественной адресации"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Ограничение входящих соединений (0=неограниченно)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "На клиента"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "В минуту"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "В час"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "В сутки"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Всего"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Максимум одновременных соединений (0=неограниченно)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "Лимиты POST (0=без ограничений)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "В период"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Минут блокировки"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "Ограничение периода POST (минуты)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr "Только для продвинутых пользователей! Изменяет B32!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Менеджер Туннелей I2P — Список"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Сообщения о состоянии"
@@ -754,8 +761,8 @@ msgid "Restart All"
 msgstr "Перезапустить все"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Серверные I2P туннели"
+msgid "I2P Hidden Services"
+msgstr "Скрытые сервисы I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -812,8 +819,8 @@ msgid "Start"
 msgstr "Запустить"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Новый серверный туннель"
+msgid "New hidden service"
+msgstr "Новый скрытый сервис"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_sk.po b/apps/i2ptunnel/locale/messages_sk.po
index a493a42dd5bbc52572a789a9ea7308ee50f9fb5f..19b491bd1324d08261a3f18f98b1ff09af233f80 100644
--- a/apps/i2ptunnel/locale/messages_sk.po
+++ b/apps/i2ptunnel/locale/messages_sk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "interné"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -32,152 +32,158 @@ msgstr[0] "{0} pricházajúci, {0} odchádzajúci tunel"
 msgstr[1] "{0} pricházajúce, {0} odchádzajúce tunely"
 msgstr[2] "{0} pricházajúcich, {0} odchádzajúcich tunelov"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "nižšia šírka pásma a spoľahlivosť"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "štandardná šírka pásma a spoľahlivosť"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "vyššia šírka pásma a spoľahlivosť"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunely zatiaľ nie sú inicializované, o dve minúty to prosím načítajte znova."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Neplatné podanie formulára, zrejme preto, lebo ste vo vašom prehliadači použili tlačidlo 'naspäť' alebo 'obnoviť'. Prosím podajte ho znova."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Ak problém pretrváva, overte, či máte vo svojom prehliadači povolené cookies."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfigurácia pre všetky tunely bola znova načítaná"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Spúšťa sa tunel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Zastavuje sa tunel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Zmeny konfigurácie boli uložené"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Nepodarilo sa uložiť konfiguráciu"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Nový tunel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Port nie je nastavený"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Neplatný port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Varovanie - porty menšie ako 1024 nie sú odporúčané"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Štandardný klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Štandardný server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Host nie je nastavený"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Neplatná adresa"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Správca I2P tunelov - Upraviť klientský tunel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Upraviť nastavenia proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Nové nastavenia proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -186,537 +192,538 @@ msgstr "Nové nastavenia proxy"
 msgid "Name"
 msgstr "Názov"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Typ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Popis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Cieľ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Prístupový bod"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "vyžadované"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Dosiahnuteľný (kým/čím)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Použiť SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Východzie proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "SSL východzie proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Použiť plugin Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Zaškrtnite políčko pre 'ÁNO')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Cieľ tunela"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "názov, názov:port alebo cieľ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 sa neodporúča"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Zdieľaný klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Zdieľať tunely s ostatnými klientmi a irc/httpklientmi?\nZmena vyžaduje reštartovanie klientského proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Automatické spustenie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Povoliť DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Pokročilé nastavenia siete"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(POZNÁMKA: ak je tento klientský proxy nakonfigurovaný na zdieľanie tunelov, potom sa tieto nastavenia budú vzťahovať na všetkých zdieľaných proxy klientov!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Nastavenia tunela"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 hopových tunelov (žiadna anonymita)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 hopový tunel (nízka anonymita)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 hopové tunely (stredná anonymita)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 hopové tunely (vysoká anonymita)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "hopový tunel (veľmi slabý výkon)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Odchýlka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 hopová odchýlka (bez náhodnosti, konzistentný výkon)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 hopová odchýlka (stredne narastajúca náhodnosť, klesajúci výkon)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 hopová odchýlka (vysoko narastajúca náhodnosť, klesajúci výkon)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 hopová odchýlka (štandardná náhodnosť, štandardný výkon)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 hopová odchýlka (neodporúčané)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hopová odchýlka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Počet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Záložný počet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 záložných tunelov (0 redundancia, bez prídavného využitia zdrojov)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 záložný tunel každým smerom (nízka redundancia, nízke využitie zdrojov)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 záložné tunely každým smerom (stredná redundancia, stredné využitie zdrojov)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 záložné tunely každým smerom (vysoká redundancia, vysoké využitie zdrojov)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "záložné tunely"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktívne pripojenie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "hromadné pripojenie (sťahovania/webstránky/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Zdržať pripojenie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "pre pripojenia typu žiadosť/odpoveď"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "I2CP adresa routra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Pozdržať otvorenie tunelov až pokiaľ to nebude vyžadované"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Znížiť množstvo tunelov pri nečinnosti"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Znížený počet tunelov"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Minút v nečinnosti"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Zavrieť tunely pri nečinnosti"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nové kľúče pri znovuotvorení"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Zakázať"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Trvácny súkromný kľúč"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Súbor"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Lokálny cieľ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Local Base 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Lokálna autorizácia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Užívateľské meno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Heslo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autorizácia východzieho proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Zoznam URL skokov"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Vlastné nastavenia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Správca I2P tunelov - Upraviť serverový tunel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Upraviť nastavenia servera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Nové nastavenia servera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Názov webstránky"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(nechajte prázdne pre východzie proxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Súkromný súbor kľúča"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Pridať do lokálneho adresára"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Podpis hostnamu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Zašifrovať prenejatú sadu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Šifrovací kľúč"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Generovať nový kľúč"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generovať"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunel musí byť najprv zastavený)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Obmedzený prístupový zoznam"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Whitelist"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Blacklist"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Prístupový zoznam"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limit prichádzajúcich pripojení (0=nelimitované)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Na klienta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Na minútu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Na hodinu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Na deň"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Celkovo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maximum súbežných pripojení (0=nelimitované)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST limity (0=nelimitované)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Za obdobie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Dĺžka banu v minutách"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST limitovacia doba (minúty)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Správca I2P tunelov - zoznam"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Stavové hlásenia"
@@ -742,8 +749,8 @@ msgid "Restart All"
 msgstr "Reštartovať všetko"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P serverové tunely"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -800,8 +807,8 @@ msgid "Start"
 msgstr "Spustiť"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Nový serverový tunel"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_sv.po b/apps/i2ptunnel/locale/messages_sv.po
index bdaf89513a46251ffa10a8af4e044433c380e9fd..5eca051b860d0ddef1d48a5d529e3d372f48a982 100644
--- a/apps/i2ptunnel/locale/messages_sv.po
+++ b/apps/i2ptunnel/locale/messages_sv.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,164 +22,170 @@ msgstr ""
 "Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "Intern "
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0} inåtgående, {0} utåtgående tunnel"
 msgstr[1] "{0} inåtgående, {0} utåtgående tunnlar"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "lägre bandbredd och pålitlighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "standard bandbredd och pålitlighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "högre bandbredd och pålitlighet"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Tunnlar är inte startade än, var god ladda om sidan om två minuter."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Ogiltigt formulärbegäran, beror troligtvis på att du använde 'tillbaka' eller 'uppdatera' knappen. Försök att skicka igen."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Om problem kvartstår, bekräfta att du har cookies påslaget i din browser."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Konfigurationen har uppdaterats för alla tunnlar"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Startar tunnel"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Stannar tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Konfigurationsändringar sparade"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Det gick inte att spara konfigurationen"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Ny Tunnel"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Ingen port angiven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Ogiltig port"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Varning - port-nummer under 1024 är inte lämpligt"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Standard klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC-klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Standard server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS proxy"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr klient"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr server"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Ingen värd angiven"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Ogiltig adress"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnelhanterare - Redigera klienttunnlar"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Redigera proxyinställningar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Inställningar för ny proxy "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -188,537 +194,538 @@ msgstr "Inställningar för ny proxy "
 msgid "Name"
 msgstr "Namn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Typ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Anslutningspunkt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "krävs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Nåbar av"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "Använd SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Utgående proxier"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Markera boxen för 'Ja')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Tunnel Mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "namn, namn:port, eller destination"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 rekommenderas ej"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Delad Klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Dela tunnlarna med andra klienter och irc/HTTP-klienter? Ändring kräver omstart av klientproxyn)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Starta automatiskt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Aktivera DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Avancerade nätverksinstälningar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(OBS: när denna klientproxyn är konfigurerad för att dela tunnlar, då gäller dessa alternativ för alla delade proxyklienter!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tunnel Alternativ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Längd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0 hop tunnel (ingen anonymitet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1 hop tunnel (låg anonymitet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2 hot tunnel (medium anonymitet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3 hop tunnel (hög anonymitet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "Tunnel hopp (mycket låg prestanda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Variation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 hopp variation (ingen slumpmässighet, konstant prestanda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 hopp variation (medel slumpmässighet, minskad prestanda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 hopp variation (ökad slumpmässighet, minskad prestanda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 hopp variation (standard slumpmässighet, standardprestanda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 hopp variation (inte rekommenderat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "hopp variation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Antal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Antal reserver"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 reserv tunnlar i varje riktning (ingen redundans, ingen resursanvändning)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 reserv tunnel i varje riktning (låg redundans, låg resursanvändning)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 reserv tunnlar i varje riktning (medel hög redundans, medel hög resursanvändning)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 reserv tunnlar i varje riktning (hög redundans, hög resursanvändning)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "reservtunnlar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "interaktiv anslutning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "bulk-anslutning (hämtningar/webbplatser/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Fördröj Anslutning"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "för förfrågan/svar-anslutningar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Routerns I2CP adress"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Värd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Avvakta med att öppna tunnlar tills de behövs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Minska antalet tunnlar vid inaktivitet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Minskat antal tunnlar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Inaktiva minuter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Stäng tunnlar vid inaktivitet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Nya nycklar vid återöppnade"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Beständig privat nyckel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Fil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Lokalt mål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Lokal Autentisering"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Autentisering för Utproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "URL Hopp Lista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Anpassade alternativ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Radera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Spara"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P Tunnelhanterare - Redigera Servertunneln"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Redigera serverinställningar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Inställningar för en ny server "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Webbsidans namn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(lämna tomt för utproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Privat nyckelfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Lägg till i den lokala adressboken"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Värdnamnets Signatur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Kryptera Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Krypteringsnyckel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Skapa Ny Nyckel "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Generera"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunneln måste stoppas först)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Begränsad åtkomstlista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Vitlista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Svartlista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Åtkomstlista"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Begränsning av inkommande anslutningar (0 = obegränsat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Per klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Per minut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Per timme"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Per dag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Totalt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Maximalt antal samtidiga anslutningar (0 = obegränsat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST-begränsning (0=obegränsat)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "Per period"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Förbjud minuter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST-begränsningsperiod (minuter)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P Tunnelhanterare - Lista"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Status Meddelanden"
@@ -744,8 +751,8 @@ msgid "Restart All"
 msgstr "Starta Om Alla"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P Servertunnlar"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -802,8 +809,8 @@ msgid "Start"
 msgstr "Starta"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Ny severtunnel "
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_uk.po b/apps/i2ptunnel/locale/messages_uk.po
index cdc9388d740cae4ddeadbd27c9e69e76d86c742e..dc8a308b1ab1da005a31e41471349e2c33453927 100644
--- a/apps/i2ptunnel/locale/messages_uk.po
+++ b/apps/i2ptunnel/locale/messages_uk.po
@@ -7,13 +7,14 @@
 # Denis Blank <gribua@gmail.com>, 2011
 # Denis Blank <gribua@gmail.com>, 2012
 # LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-30 09:54+0000\n"
-"Last-Translator: LinuxChata\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +22,12 @@ msgstr ""
 "Language: uk_UA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "внутрішній"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
@@ -34,1150 +35,1170 @@ msgstr[0] "{0} вхідний, {0} вихідний тунель"
 msgstr[1] "{0} вхідних, {0} вихідних тунелів"
 msgstr[2] "{0} вхідних, {0} вихідних тунелів"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "нижча пропускна здатність і надійність"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "звичайна пропускна здатність і надійність"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "більш висока пропускна здатність і надійність"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Тунелі ще не створені, будь ласка перезавантажте за дві хвилини."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:198
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Якщо проблема не усунута, переконайтеся, що cookies увімкнені у вашому браузері."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Конфігурація для всіх тунелів перечитана"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Запуск тунелю"
 
 #. and give them something to look at in any case
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270
+#. FIXME name will be HTML escaped twice
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Зупинка тунелю"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Налаштування збережені"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Помилка під час зберігання налаштувань"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Новий тунель"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Порт не заданий"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "Невірний порт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Попередження - порти менше, ніж 1024 не рекомендуються"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
+msgid "Warning - duplicate port"
+msgstr "Увага - дубльований порт"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Звичайний клієнт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS клієнт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC клієнт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Звичайний сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 проксі"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC проксі"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS проксі"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr клієнт"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr сервер"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP bidir (експерементальний двухнаправлений режим, інструкцію запитуйте у sponge)"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Хост не заданий"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "Невірна адреса"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Менеджер Тунелів I2P - Редагування Клієнтського Тунелю"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
-msgstr "Редагування настройок проксі"
+msgstr "Редагування налаштувань проксі"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Нові налаштування проксі"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329
 msgid "Name"
 msgstr "Назва"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Тип"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Опис"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Ціль"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Точка доступу"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "необхідно"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Доступно цим"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
+msgid "Use SSL?"
+msgstr "Використовувати SSL?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Список вихідних проксі (Outproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "Зовнішні SSL проксі"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "Використовувати модуль зовнішнього проксі"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(Виберіть чекбокс 'ТАК')"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
-msgstr "Адреса Призначення  Тунелю"
+msgstr "Адреса призначення тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "ім'я, назва: порт, або призначення"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "b32 не рекомендується"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
-msgstr "Колективний Клієнт"
+msgstr "Колективний клієнт"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Використовувати тунелі спільно з іншими клієнтами і  irc/httpclients? Зміна налаштування потребує перезапуску тунелю)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Автозапуск"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "Включити DCC"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Розширені мережеві опції"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
-msgstr "Опції Тунелю"
+msgstr "Опції тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Довжина"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "Тунель 0 стрибків (без анонімності)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "Тунель з 1 стрибком (низька анонімність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "Тунель з 2 стрибками (середня анонімність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "Тунель з 3 стрибками (висока анонімність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
-msgstr "хоп тунель (дуже погана продуктивність (комп'ютера))"
+msgstr "хоп тунель (дуже погана продуктивність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Розбіжність"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "0 хоп розкид (без рандомізації, фіксована продуктивність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+0-1 хоп розкид (помірна збільшена рандомізація, понижена продуктивність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+0-2 хоп розкид (дуже збільшена рандомізація, понижена продуктивність)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 хоп розкид (стандартна рандомізація, стандартна продуктивнсть)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 хоп розкид (не рекомендовано)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "хоп розбіжність"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Кількість"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Резервна кількість"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 резервних тунелів (0 надлишок, відсутність додаткового навантаження на систему) "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 резервний тунель в кожному напрямку (низька надлишковість, низьке використання ресурсів системи)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 резервні тунелі в кожному напрямку (середня надмірність, середнє навантаження на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 резервні тунелі в кожному напрямку (висока надмірність, високе навантаження на систему)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "резервних тунелів"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Режим"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "оптимізувати для малих затримок (irc)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "оптимізувати для великого об'єму (завантаження/веб-серфінг/Бітторрент)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
-msgstr "Затримка Зєднання"
+msgstr "Затримка з’єднання"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "оптимізація для з'єднань, які починаються з запиту клієнта/відповіді сервера. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "I2CP Адрес Роутера"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
-msgstr "Адрес"
+msgstr "Хост"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Порт"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
-msgid "Reduce tunnel quantity when idle"
-msgstr "Зменьшувати кількість тунелів при простої"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
+msgid "Delay tunnel open until required"
+msgstr "Відкласти запуск до першого запиту"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Включити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
+msgid "Reduce tunnel quantity when idle"
+msgstr "Зменьшувати кількість тунелів при простої"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Зменшення числа тунелів"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Хвилин простою"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Закривати тунелі при простою"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Генерувати новий ключ при перезапуску"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
-msgid "Delay tunnel open until required"
-msgstr "Відкласти запуск до першого запиту"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Постійний секретний ключ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Файл"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Локальний адрес призначення"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "Локальний Base 32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
+msgid "Pass User-Agent header through"
+msgstr "Пропускати User-Agent заголовок через"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+msgid "Pass Referer header through"
+msgstr "Пропускати Referer заголовок через"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
+msgid "Pass Accept headers through"
+msgstr "Пропускати Accept заголовки через"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
+msgid "Allow SSL to I2P addresses"
+msgstr "Дозволяти SSL до I2P адрес"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
+msgid "Signature type"
+msgstr "Тип підпису"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
+msgid "Experts only!"
+msgstr "Тільки досвідчені користувачі"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
-msgstr "Локальна Авторизація"
+msgstr "Локальна авторизація"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Пароль"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Авторизація outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "URL спиок \"Jump\"-сервісів"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Вибіркові параметри"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Удалити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Менеджер I2P Тунелів — Редагування Серверного Тунелю."
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
-msgstr "Редагувати настройок сервера"
+msgstr "Редагувати налаштування сервера"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
-msgstr "Нові серверні настройки"
+msgstr "Нові налаштування сервера"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
-msgid "Use SSL?"
-msgstr "Використовувати SSL?"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Назва веб-сайту"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(залишити пустим для outproxy)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Файл секретного ключа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Добавити в локальну адресну книгу"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
-msgstr "Підпис Хоста"
+msgstr "Підпис хоста"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Шифрувати Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
-msgstr "Ключ Шифрування"
+msgstr "Ключ шифрування"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Згенерувати новий ключ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Згенерувати"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Спочатку необхідно зупинити тунель)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
-msgstr "Обмежений Доступ"
+msgstr "Обмежений доступ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Білий список"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Чоний список"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Список доступа"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+msgid "Block Access via Inproxies"
+msgstr "Блокувати доступ тільки через вхідні проксі"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
+msgid "Unique Local Address per Client"
+msgstr "Унікальна локальна адреса для кожного клієнта"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Обмеження вхідних зєднань (0=необмежено)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "На клієнта"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "В хвилину"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "В годину"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "На добу"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Всього"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Максимум одночасних зєднань (0=необмежено)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST ліміти (0=необмежений)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "За період"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "Хвилин блокування"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST обмеження періоду (хвилини)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516
-msgid "New Certificate type"
-msgstr "Новий тип сертифіката"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
-msgid "None"
-msgstr "Жоден"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
-msgid "Hashcash (effort)"
-msgstr "Hashcash (зусиль)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
-msgid "Hashcash Calc Time"
-msgstr "Час генерації hashcash"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
-msgid "Estimate"
-msgstr "Прогноз"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
-msgid "Hidden"
-msgstr "Прихований"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
-msgid "Signed (signed by)"
-msgstr "Підписаний (вказано ким підписано)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
-msgid "Modify Certificate"
-msgstr "Змінити Сертифікат"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
-msgid "Modify"
-msgstr "Змінтити"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
+msgid "Experts only! Changes B32!"
+msgstr "Тільки досвідчені користувачі! Змінює B32!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
-msgid "I2P Tunnel Manager - List"
-msgstr "Менеджер Тунелів I2P — Список"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:97
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Повідомлення про стан"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
 msgid "Refresh"
 msgstr "Оновити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 msgid "Tunnel Wizard"
 msgstr "Майстер тунелів"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:115
 msgid "Stop All"
 msgstr "Зупинити все"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:119
 msgid "Start All"
 msgstr "Запустити все"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:123
 msgid "Restart All"
 msgstr "Перезапустити все"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
-msgid "I2P Server Tunnels"
-msgstr "Серверні I2P тунелі"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
+msgid "I2P Hidden Services"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
 msgid "Points at"
 msgstr "Вказує на"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
 msgid "Preview"
 msgstr "Попередній перегляд"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
 msgid "Status"
 msgstr "Статус"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
 msgid "Base32 Address"
 msgstr "Base32-адрес"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
 msgid "No Preview"
 msgstr "Попередній перегляд недоступний"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
 msgid "Starting..."
 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
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
 msgid "Running"
 msgstr "Працює"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "Stopped"
-msgstr "Зупинений"
+msgstr "Зупинено"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
 msgid "Start"
 msgstr "Запустити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-msgid "New server tunnel"
-msgstr "Новий серверний тунель"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:576
+msgid "New hidden service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579
 msgid "Standard"
 msgstr "Стандартний"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438
 msgid "Create"
 msgstr "Створити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
 msgstr "Клієнтскі I2P тунелі"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 msgid "Interface"
 msgstr "Мережевий інтерфейс"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
 msgid "Standby"
 msgstr "Режим очікування"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
 msgid "Outproxy"
 msgstr "Outproxy (зовнішній проксі)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:392
 msgid "Destination"
 msgstr "Адреса призначення"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
 msgid "internal plugin"
 msgstr "внутрішній модуль"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
 msgid "none"
 msgstr "ні"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434
 msgid "New client tunnel"
 msgstr "Новий клієнтський тунель"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
 msgstr "I2P менеджер тунелів - Майстер створення тунелів"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570
 msgid "Server or client tunnel?"
 msgstr "Серверний або клієнтський тунель?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574
 msgid "Tunnel type"
 msgstr "Тип тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604
 msgid "Tunnel name and description"
 msgstr "Ім'я і опис тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613
 msgid "Tunnel destination"
 msgstr "Місце призначення тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629
 msgid "Binding address and port"
 msgstr "Прив'язка адреса і порту"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655
 msgid "Tunnel auto-start"
 msgstr "Авто-старт тунелю"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "Wizard completed"
 msgstr "Робота майстра завершена"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192
 msgid ""
 "This wizard will take you through the various options available for creating"
 " tunnels in I2P."
-msgstr ""
+msgstr "Цей майстер допоможе вам створити тунелі I2P з різними параметрами."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194
 msgid ""
 "The first thing to decide is whether you want to create a server or a client"
 " tunnel."
-msgstr ""
+msgstr "Спершу потрібно вирішити, клієнтський чи серверний тунель ви хочете створити."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:196
 msgid ""
 "If you need to connect to a remote service, such as an IRC server inside I2P"
 " or a code repository, then you will require a CLIENT tunnel."
-msgstr ""
+msgstr "Якщо ви хочете з’єднатись з віддаленим сервером, таким як IRC всередині I2P чи репозиторієм (GIT, SVN тощо) вам потрібен КЛІЄНТСЬКИЙ тунель."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198
 msgid ""
 "On the other hand, if you wish to host a service for others to connect to "
 "you'll need to create a SERVER tunnel."
-msgstr ""
+msgstr "І іншого боку, якщо ви хочете, щоб інші з’єднувались до вас, вам потрібно створити СЕРВЕРНИЙ тунель."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200
 msgid "Server Tunnel"
 msgstr "Серверний тунель"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202
 msgid "Client Tunnel"
 msgstr "Клієнтський тунель"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220
 msgid "There are several types of tunnels to choose from:"
-msgstr ""
+msgstr "Є кілька типів тунелів на вибір:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228
 msgid "Basic tunnel for connecting to a single service inside I2P."
-msgstr ""
+msgstr "Базовий тунель для підключення до одиночної служби всередині I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272
 msgid ""
 "Try this if none of the tunnel types below fit your requirements, or you "
 "don't know what type of tunnel you need."
-msgstr ""
+msgstr "Спробуйте це, якщо ніякий із вказаних типів тунелів вам не підходить, або ж ви не знаєте, що вибрати."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232
 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P."
-msgstr ""
+msgstr "Тунель, що грає роль HTTP-проксі для доступу до eep-сайтів всередині I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234
 msgid ""
 "Set your browser to use this tunnel as an http proxy, or set your "
 "\"http_proxy\" environment variable for command-line applications in "
 "GNU/Linux."
-msgstr ""
+msgstr "Налаштуйте ваш браузер на використання цього тунелю в якості HTTP-проксі або дайте відповідне значення змінній середовища \"http_proxy\" для консольних програм у GNU/Linux."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236
 msgid ""
 "Websites outside I2P can also be reached if an HTTP proxy within I2P is "
 "known."
-msgstr ""
+msgstr "Веб-сайти за межами I2P також доступні через відомий вам HTTP-проксі."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238
 msgid "Customised client tunnel specific for IRC connections."
-msgstr ""
+msgstr "Спеціальний клієнтський тунель для IRC з’єднань."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240
 msgid ""
 "With this tunnel type, your IRC client will be able to connect to an IRC "
 "network inside I2P."
-msgstr ""
+msgstr "З цим типом тунелю ваш IRC клієнт зможе з’єднатись з мережою IRC всередині I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242
 msgid ""
 "Each IRC network in I2P that you wish to connect to will require its own "
 "tunnel. (See Also, SOCKS IRC)"
-msgstr ""
+msgstr "Кожна IRC мережа всередині I2P, до якої ви б хотіли з’єднатись, потребує окремого тунелю. (Див. також SOCKS IRC)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244
 msgid "A tunnel that implements the SOCKS protocol."
-msgstr ""
+msgstr "Тунель, який реалізує протокол SOCKS."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246
 msgid ""
 "This enables both TCP and UDP connections to be made through a SOCKS "
 "outproxy within I2P."
-msgstr ""
+msgstr "Це дозволяє як TCP, так і UDP з’єднання через вихідний SOCKS-проксі у I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248
 msgid ""
 "A client tunnel implementing the SOCKS protocol, which is customised for "
 "connecting to IRC networks."
-msgstr ""
+msgstr "Клієнтський тунель, що реалізує протокол SOCKS, налаштований для з’єднання з мережами IRC."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250
 msgid ""
 "With this tunnel type, IRC networks in I2P can be reached by typing the I2P "
 "address into your IRC client, and configuring the IRC client to use this "
 "SOCKS tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252
 msgid ""
 "This means that only one I2P tunnel is required rather than a separate "
 "tunnel per IRC network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254
 msgid ""
 "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P "
 "is known, though it depends on whether or not the outproxy has been blocked "
 "by the IRC network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256
 msgid "A client tunnel that implements the HTTP CONNECT command."
-msgstr ""
+msgstr "Клієнтський тунель, що реалізує команду HTTP CONNECT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258
 msgid ""
 "This enables TCP connections to be made through an HTTP outproxy, assuming "
 "the proxy supports the CONNECT command."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260
 msgid "A customised client tunnel for Streamr."
-msgstr ""
+msgstr "Клієнтський тунель, що налаштовується для Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270
 msgid "A basic server tunnel for hosting a generic service inside I2P."
-msgstr ""
+msgstr "Базовий серверний тунель для хостингу загальних сервісів всередині I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274
 msgid "A server tunnel that is customised for HTTP connections."
-msgstr ""
+msgstr "Серверний тунель, налаштований для HTTP з’єднань."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276
 msgid "Use this tunnel type if you want to host an eepsite."
-msgstr ""
+msgstr "Використовуйте цей тип тунелю, якщо хочете розмістити eepsite у себе."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278
 msgid ""
 "A customised server tunnel that can both serve HTTP data and connect to "
 "other server tunnels."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280
 msgid "This tunnel type is predominantly used when running a Seedless server."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282
 msgid "A customised server tunnel for hosting IRC networks inside I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284
 msgid ""
 "Usually, a separate tunnel needs to be created for each IRC server that is "
 "to be accessible inside I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286
 msgid "A customised server tunnel for Streamr."
-msgstr ""
+msgstr "Налаштований серверний тунель для Streamr."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325
 msgid "Choose a name and description for your tunnel."
-msgstr ""
+msgstr "Введіть ім’я і опис для тунелю."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327
 msgid ""
 "These can be anything you want - they are just for ease of identifying the "
 "tunnel in the routerconsole."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357
 msgid ""
 "If you know of any outproxies for this type of tunnel (either HTTP or "
 "SOCKS), fill them in below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359
 msgid "Separate multiple proxies with commas."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412
 msgid ""
 "This is the IP that your service is running on, this is usually on the same "
 "machine so 127.0.0.1 is autofilled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435
 msgid "This is the port that the service is accepting connections on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
 "How do you want this tunnel to be accessed? By just this machine, your "
 "entire subnet, or external internet?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479
 msgid "You will most likely want to just allow 127.0.0.1"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521
 msgid ""
 "The I2P router can automatically start this tunnel for you when the router "
 "is started."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523
 msgid ""
 "This can be useful for frequently-used tunnels (especially server tunnels), "
 "but for tunnels that are only used occassionally it would mean that the I2P "
 "router is creating and maintaining unnecessary tunnels."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549
 msgid "The wizard has now collected enough information to create your tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551
 msgid ""
 "Upon clicking the Save button below, the wizard will set up the tunnel, and "
 "take you back to the main I2PTunnel page."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556
 msgid ""
 "Because you chose to automatically start the tunnel when the router starts, "
 "you don't have to do anything further."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558
 msgid "The router will start the tunnel once it has been set up."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562
 msgid ""
 "Because you chose not to automatically start the tunnel, you will have to "
 "manually start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564
 msgid ""
 "You can do this by clicking the Start button on the main page which "
 "corresponds to the new tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568
 msgid "Below is a summary of the options you chose:"
-msgstr ""
+msgstr "Нижче є вибрані вами параметри:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666
 msgid ""
 "Alongside these basic settings, there are a number of advanced options for "
 "tunnel configuration."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668
 msgid ""
 "The wizard will set reasonably sensible default values for these, but you "
 "can view and/or edit these by clicking on the tunnel's name in the main "
 "I2PTunnel page."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710
 msgid "Previous"
 msgstr "Попередній"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718
 msgid "Save Tunnel"
 msgstr "Зберегти тунель"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Finish"
 msgstr "Завершити"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730
 msgid "Next"
 msgstr "Далі"
diff --git a/apps/i2ptunnel/locale/messages_vi.po b/apps/i2ptunnel/locale/messages_vi.po
index 55efe3ba70fa0182fe5a3d836dff521bf6a8ecbd..9fa8eac32e86f1844d62b6184f9e55f679d2741a 100644
--- a/apps/i2ptunnel/locale/messages_vi.po
+++ b/apps/i2ptunnel/locale/messages_vi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,163 +20,169 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "nội bộ"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr "Mẫu đơn đệ nạp không đúng, có lẻ vì bạn dùng nút 'back' hay 'reload\" của trình duyệt. Xin vui lòng đệ nạp lại."
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 msgid "Configuration reloaded for all tunnels"
 msgstr "Nạp lại cấu hình cho mọi đường hầm"
 
 #. 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 msgid "Starting tunnel"
 msgstr "Bắt đầu đường hầm"
 
 #. 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "Ngưng đường hầm"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "Lưu giữ thay đổi cấu hình"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "Không lưu cấu hình được"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "Đường Hầm Mới"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "Cổng chưa cấu hình"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "Khách thường"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "Khách IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "Máy chủ thường"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "Máy chủ HTTP"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "Proxy SOCKS 4/4a/5"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "Proxy SOCKS IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "Proxy nối kết/SSL/HTTPS"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "Máy chủ IRC"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Khách Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Máy chủ Streamr"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "HTTP hai chiều"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "Máy chủ chưa cấu hình"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "Quảng Lý Hầm I2P - Chỉnh đổi hầm khách"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "Chỉnh đổi cấu hình proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "Cấu hình mới cho proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -185,537 +191,538 @@ msgstr "Cấu hình mới cho proxy"
 msgid "Name"
 msgstr "Tên"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "Loại"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "Mô tả"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "Điểm đến"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "Điểm Truy Cập"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "cần có"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "Với được qua"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "Proxy ra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "Chọn YES trong ô"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "Địa điểm Hầm đến"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "không nên dùng b32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "Chia khách"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(Chia sẻ hầm với những khách khác hay khách irc/http? Chỉnh đổi yêu cầu khởi động lại proxy khách)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "Tự động khởi động"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "Tùy chọn mạng cao cấp "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
 msgstr "(GHI CHÚ: khi proxy khách được cấu hình để chia sẻ hầm, thì những tùy chọn này cho tất cả khách proxy chia sẻ)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "Tùy chọn hầm"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "Độ dài"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "hầm bước nhảy (hiệu xuất rất tệ)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "Độ khác biệt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "Khác biệt 0 bước (không ngẫu nhiên, hiệu xuất vững)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "Khác biệt + 0-1 bước (độ ngẫu nhiên bổ xung trung bình, hiệu xuất trừ)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "Khác biệt + 0-2 bước (độ ngẫu nhiên bổ xung cao, hiệu xuất trừ)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "Khác biệt +/- 0-1 bước (độ ngẫu nhiên chuẩn, hiệu xuất chuẩn)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "Khác biệt +/- 0-2 bước (không nên)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "khác biệt bước"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "Số lượng"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "Số lượng trừ bị"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 hầm trừ bị (độ dư 0, không thêm tài nguyên)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 hầm trừ bị mỗi hướng (độ dư thấp, dùng tài nguyên thấp)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 hầm trừ bị mỗi hướng (độ dư trung bình, dùng tài nguyên trung bình)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 hầm trừ bị mỗi hướng (độ dư cao, dùng tài nguyên cao)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "hầm trừ bị"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "Hồ sơ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "đường nối tương tác"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "đường nối khổ to"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "Chờ nối kết"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "cho nối kết yêu cầu/phản hồi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "Địa chỉ Định Tuyến I2CP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "Máy chủ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "Cổng"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "Đợi mở đường hầm cho đến khi yêu cầu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "Mở"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "Giảm số lượng hầm khi rổi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "Số lượng đường hầm giảm"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "Số phút rảnh rổi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "Đóng đường hầm khi rảnh rổi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "Chìa khóa mới khi mở lại"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "Tắt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "Chìa khóa riêng bền dai"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "Tập tin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "Điểm đến nội bộ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "Cho phép nội bộ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "Cho phép Outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "Danh sách đường dẫn nhảy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "Tùy chọn tùy ý"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "Hủy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "Giữ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "Quản Lý Hầm I2P - Điều chỉnh Hầm Máy Chủ"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "Chỉnh sửa cấu hình máy chủ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "Cấu hình mới cho máy chủ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "Tên trang web"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(để trống cho outproxies)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "Tập tin khóa riêng"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "Thêm vô sổ địa chỉ địa phương"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "Chữ ký tên máy chủ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "Leaseset mã hóa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "Khóa mã hóa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "Tạo khóa mới"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "Kiến tạo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(Hầm phải ngưng trước)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "Sổ truy cập giới hạn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "Sổ trắng"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "Sổ đen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "Sổ truy cập"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Giới hạn đường nối vào (0=không giới hạn)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "Mỗi khách"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "Mỗi phút"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "Mỗi giờ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "Mỗi ngày"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "Tổng cộng"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Số đường nối tối đa cùng lúc (0=không giới hạn)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "Quản Lý Hầm I2P - Danh sách"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "Thông báo hiện trạng"
@@ -741,8 +748,8 @@ msgid "Restart All"
 msgstr "Khởi động lại tất cả"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "Đường hầm máy chủ I2P"
+msgid "I2P Hidden Services"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -799,8 +806,8 @@ msgid "Start"
 msgstr "Bắt đầu"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "Hầm chủ mới"
+msgid "New hidden service"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
diff --git a/apps/i2ptunnel/locale/messages_zh.po b/apps/i2ptunnel/locale/messages_zh.po
index 8a006bf409b2b32c7adf530ebf47b86b1adb8f36..d2cd0b082db9a4c6ec452b47649433730929f816 100644
--- a/apps/i2ptunnel/locale/messages_zh.po
+++ b/apps/i2ptunnel/locale/messages_zh.po
@@ -7,17 +7,18 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # linloveliang <oiiu19@yahoo.com>, 2013
 # xkimo_daeee <michael_ies@yahoo.com>, 2014
+# r1235613 <r1235613@gmail.com>, 2014
 # walking <walking@i2pmail.org>, 2011
 # walking <waling@mail.i2p>, 2013
 # walking <walking@i2pmail.org>, 2011
 # wwj402 <wwj402@gmail.com>, 2013
-# YF <yfdyh000@gmail.com>, 2014
+# YF <yfdyh000@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-14 11:46+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 03:50+0000\n"
 "Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -26,163 +27,169 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:411
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:421
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:474
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:484
 msgid "internal"
 msgstr "内部"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:560
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] "{0}入站, {0}出站隧道"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:564
 msgid "lower bandwidth and reliability"
 msgstr "较低的带宽和稳定性"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:503
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:566
 msgid "standard bandwidth and reliability"
 msgstr "标准带宽和稳定性"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:505
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:568
 msgid "higher bandwidth and reliability"
 msgstr "较高的带宽和稳定性"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:127
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:132
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "隧道尚未初始化,请两分钟后刷新。"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:200
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:205
 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:202
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:207
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "如果问题持续,请确认您的浏览器支持Cookie。"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:248
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:253
 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:262
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:267
 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:276
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:281
 msgid "Stopping tunnel"
 msgstr "正在关闭隧道"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:365
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:370
 msgid "Configuration changes saved"
 msgstr "配置修改成功"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:368
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:373
 msgid "Failed to save configuration"
 msgstr "配置保存失败"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500
 msgid "New Tunnel"
 msgstr "新建隧道"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:534
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:652
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:543
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:661
 msgid "Port not set"
 msgstr "端口未设置"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:654
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:663
 msgid "Invalid port"
 msgstr "无效端口"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "警告 - 不推荐低于 1024 的端口"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:529
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:538
 msgid "Warning - duplicate port"
 msgstr "警告 - 重复的端口"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:546
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
 msgid "Standard client"
 msgstr "标准客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:547
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
 msgid "HTTP/HTTPS client"
 msgstr "HTTP/HTTPS 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:548
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
 msgid "IRC client"
 msgstr "IRC 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:549
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
 msgid "Standard server"
 msgstr "标准服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:550
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:559
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:551
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:560
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS4/4A/5 代理"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:552
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:561
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC 代理"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:553
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:562
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS 代理"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:563
 msgid "IRC server"
 msgstr "IRC 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:555
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:564
 msgid "Streamr client"
 msgstr "Streamr 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:556
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:565
 msgid "Streamr server"
 msgstr "Streamr 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:557
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:566
 msgid "HTTP bidir"
 msgstr "双向http"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:646
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:655
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
 msgid "Host not set"
 msgstr "主机未设置"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:648
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:657
 msgid "Invalid address"
 msgstr "无效地址"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P 隧道管理器 - 编辑客户端隧道"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
+msgid "Hidden Services Manager"
+msgstr "隐藏服务管理器"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86
+msgid "Edit Client Tunnel"
+msgstr "编辑客户隧道"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114
 msgid "Edit proxy settings"
 msgstr "编辑代理设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:122
 msgid "New proxy settings"
 msgstr "新建代理设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:129
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:142
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
@@ -191,537 +198,538 @@ msgstr "新建代理设置"
 msgid "Name"
 msgstr "名称"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 msgid "Type"
 msgstr "类型"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:426
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333
 msgid "Description"
 msgstr "描述"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:176
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
 msgid "Target"
 msgstr "目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219
 msgid "Access Point"
 msgstr "接入点"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "required"
 msgstr "必要"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485
 msgid "Reachable by"
 msgstr "访问地址"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:212
 msgid "Use SSL?"
 msgstr "是否使用SSL?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361
 msgid "Outproxies"
 msgstr "出口代理"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
 msgid "SSL Outproxies"
 msgstr "SSL 出口代理"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
 msgid "Use Outproxy Plugin"
 msgstr "使用出口代理插件"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 msgid "(Check the Box for 'YES')"
 msgstr "(选中表示\"是\")"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381
 msgid "Tunnel Destination"
 msgstr "隧道目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385
 msgid "name, name:port, or destination"
 msgstr "名称, 名称:端口, 或目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389
 msgid "b32 not recommended"
 msgstr "请避免使用b32地址。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281
 msgid "Shared Client"
 msgstr "共享客户端"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(与其他客户端例如IRC/HTTP共享隧道?修改需要重新启动)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525
 msgid "Auto Start"
 msgstr "自动启动"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
 msgid "Enable DCC"
 msgstr "启用聊天直连(DCC)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "Advanced networking options"
 msgstr "高级网络设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
 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:276
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307
 msgid "Tunnel Options"
 msgstr "隧道选项"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "Length"
 msgstr "长度"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316
 msgid "0 hop tunnel (no anonymity)"
 msgstr "0跳隧道(非匿名)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
 msgid "1 hop tunnel (low anonymity)"
 msgstr "1跳隧道(低匿名性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324
 msgid "2 hop tunnel (medium anonymity)"
 msgstr "2跳隧道(中等匿名性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328
 msgid "3 hop tunnel (high anonymity)"
 msgstr "3跳隧道(高匿名性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336
 msgid "hop tunnel (very poor performance)"
 msgstr "跳点隧道(严重影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid "Variance"
 msgstr "随机变化"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:348
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "隧道长度恒定(随机性无,性能稳定)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:321
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "隧道长度+ 0-1(随机性中,影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "隧道长度+ 0-2(随机性高,影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "隧道长度+/- 0-1(随机性标准,正常性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "隧道程度+/- 0-2(不推荐)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "hop variance"
 msgstr "节点数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380
 msgid "Count"
 msgstr "计数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
 msgid "Backup Count"
 msgstr "备用数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "无备用隧道(无冗余,不增加资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "备用隧道对x1 (低冗余,低资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "备用隧道对x2 (中冗余,中资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "备用隧道对x3 (高冗余,高资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "backup tunnels"
 msgstr "备用隧道"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
 msgid "Profile"
 msgstr "连接类型"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
 msgid "interactive connection"
 msgstr "速度连接"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "效率连接(下载/WEB/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "Delay Connect"
 msgstr "连接延迟断开"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "for request/response connections"
 msgstr "单请求/响应连接"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
 msgid "Router I2CP Address"
 msgstr "路由器I2CP地址"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416
 msgid "Host"
 msgstr "主机"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437
 msgid "Port"
 msgstr "端口"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "Delay tunnel open until required"
 msgstr "仅在请求时打开"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:567
 msgid "Enable"
 msgstr "启用"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:565
 msgid "Reduce tunnel quantity when idle"
 msgstr "空闲时缩减隧道数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:571
 msgid "Reduced tunnel count"
 msgstr "削减后的隧道数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:575
 msgid "Idle minutes"
 msgstr "空闲时间(分钟)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483
 msgid "Close tunnels when idle"
 msgstr "空闲时关闭隧道"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:489
 msgid "New Keys on Reopen"
 msgstr "重新打开隧道时使用新密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Disable"
 msgstr "禁用"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505
 msgid "Persistent private key"
 msgstr "永久私有密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
 msgid "File"
 msgstr "文件"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276
 msgid "Local destination"
 msgstr "本地目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
 msgid "Local Base 32"
 msgstr "本地基数32"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533
 msgid "Pass User-Agent header through"
-msgstr ""
+msgstr "使用用户代理标头通过"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
 msgid "Pass Referer header through"
-msgstr ""
+msgstr "使用推荐人标头通过"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545
 msgid "Pass Accept headers through"
-msgstr ""
+msgstr "通过接受标头"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551
 msgid "Allow SSL to I2P addresses"
 msgstr "允许 SSL 到 I2P 地址簿"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618
 msgid "Signature type"
 msgstr "签名类型"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
 msgid "Experts only!"
 msgstr "仅供专家!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:592
 msgid "Local Authorization"
 msgstr "本地认证"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
 msgid "Username"
 msgstr "用户名"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:565
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
 msgid "Password"
 msgstr "密码"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:602
 msgid "Outproxy Authorization"
 msgstr "出口代理认证"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:619
 msgid "Jump URL List"
 msgstr "跳转服务列表"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:606
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:647
 msgid "Custom options"
 msgstr "自定义选项"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:610
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:651
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705
 msgid "Cancel"
 msgstr "取消"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:655
 msgid "Delete"
 msgstr "删除"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:657
 msgid "Save"
 msgstr "保存"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82
-msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P隧道管理器 - 编辑服务器隧道"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86
+msgid "Edit Hidden Service"
+msgstr "编辑隐藏服务"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114
 msgid "Edit server settings"
 msgstr "服务器隧道设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:118
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:122
 msgid "New server settings"
 msgstr "新建服务器设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
 msgid "Website name"
 msgstr "网站名称"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:259
 msgid "(leave blank for outproxies)"
 msgstr "(出口代理这里请置空)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "Private key file"
 msgstr "私钥文件"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
 msgid "Add to local addressbook"
 msgstr "添加至本地地址簿"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
 msgid "Hostname Signature"
 msgstr "主机名签名"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Encrypt Leaseset"
 msgstr "加密赁集"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "Encryption Key"
 msgstr "加密密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
 msgid "Generate New Key"
 msgstr "生成新密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Generate"
 msgstr "生成"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
 msgid "(Tunnel must be stopped first)"
 msgstr "(必须先停止隧道)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Restricted Access List"
 msgstr "限制访问列表"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Whitelist"
 msgstr "白名单"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "Access List"
 msgstr "访问列表"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
 msgid "Block Access via Inproxies"
-msgstr ""
+msgstr "以代理阻止访问"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Unique Local Address per Client"
 msgstr "每个客户端的唯一本地地址"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+msgid "Optimize for Multihoming"
+msgstr "为多宿主优化"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "入站连接限制(0=无限制)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542
 msgid "Per client"
 msgstr "按客户端"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Per minute"
 msgstr "按分钟"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 msgid "Per hour"
 msgstr "按小时"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Per day"
 msgstr "按天"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552
 msgid "Total"
 msgstr "总数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:533
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "最大并发连接数(0=无限制)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:540
 msgid "POST limits (0=unlimited)"
 msgstr "POST限制(0 =无限制)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
 msgid "Per period"
 msgstr "每个周期"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
 msgid "Ban minutes"
 msgstr "封禁的分钟数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
 msgid "POST limit period (minutes)"
 msgstr "POST限制周期(分钟)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:620
 msgid "Experts only! Changes B32!"
 msgstr "仅供专家!更改 B32!"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85
-msgid "I2P Tunnel Manager - List"
-msgstr "I2P隧道管理器 - 列表"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Status Messages"
 msgstr "状态信息"
@@ -747,8 +755,8 @@ msgid "Restart All"
 msgstr "全部重启"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
-msgid "I2P Server Tunnels"
-msgstr "I2P服务端隧道"
+msgid "I2P Hidden Services"
+msgstr "I2P 隐藏服务"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151
@@ -805,8 +813,8 @@ msgid "Start"
 msgstr "启动"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-msgid "New server tunnel"
-msgstr "新建服务器隧道"
+msgid "New hidden service"
+msgstr "新建隐藏服务"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436
@@ -825,7 +833,7 @@ msgstr "创建"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271
 msgid "I2P Client Tunnels"
-msgstr "I2P客户端隧道"
+msgstr "I2P 客户端隧道"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
@@ -1084,7 +1092,7 @@ msgstr "使用空格分隔多个代理。"
 msgid ""
 "Type in the I2P destination of the service that this client tunnel should "
 "connect to."
-msgstr "输入客户端隧道要连接的I2P服务目标地址。"
+msgstr "请输入该客户端隧道应连接的 I2P 服务目标。"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379
 msgid ""
@@ -1104,11 +1112,11 @@ msgstr "这是服务接收连接的端口。"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456
 msgid "This is the port that the client tunnel will be accessed from locally."
-msgstr "这是访问本地客户隧道用的端口。"
+msgstr "这是客户隧道将使用的本地端口。"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458
 msgid "This is also the client port for the HTTPBidir server tunnel."
-msgstr "这也是HTTPBidir服务隧道的客户端口。"
+msgstr "这也是 HTTPBidir 服务隧道的客户端端口。"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477
 msgid ""
diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
index fdf2a311403c6a91ef1addc44e437cc0671dac2f..c64d393b103a54d28ccaff5439c40210eb3c0da0 100644
--- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt
+++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
 
 Retrieved from the file
-	apache-tomcat-6.0.41-deployer.tar.gz
+	apache-tomcat-6.0.43-deployer.tar.gz
 
 minus the following files and directores:
 
diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar
index 32818aef3a8ad40454a8fc8a29bf2274d2bb120e..def835a2561dbc3e56e151e3cdb4cf48fb9332fd 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar
index e3bc712ba001d26696514519f50335a0fbea103d..9c779fd396379f38d12c6fc4f19d299e3fec48da 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar
index bc595102ecce57991c283b3b9fb40a3440781b19..c7f965777a2458f5f8db673bf150e30932a202fe 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar
index ff13de88e58f989e09db95572df900b54cd23d7d..f405513f54d6425fb96e70fcf87f0fcbf25201f4 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ
diff --git a/apps/jetty/apache-tomcat/README-i2p.txt b/apps/jetty/apache-tomcat/README-i2p.txt
index edeb05fcbb56801513b143f703420dea31a7c6ec..503879d85cc8ffc9e48559ee8680b05b670f4d9a 100644
--- a/apps/jetty/apache-tomcat/README-i2p.txt
+++ b/apps/jetty/apache-tomcat/README-i2p.txt
@@ -1,7 +1,7 @@
 This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 
 Retrieved from the file
-	apache-tomcat-6.0.41.tar.gz
+	apache-tomcat-6.0.43.tar.gz
 
 containing only a small subset of lib/tomcat-coyote.jar.
 
diff --git a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar
index da3061a5f169e598b76226bf6d79f9f38ee6dbef..1edfeca8512bb56f6dd6093029b7dbd6f04eec5a 100644
Binary files a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar and b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar differ
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index fd9a9a45f70822c26c058c7b3313a8251ed80239..43b9bec2641f4fe7c45a1dd3e5bbebf13b325958 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -10,7 +10,7 @@
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.6" />
     <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
-    <property name="tomcat.ver" value="6.0.41" />
+    <property name="tomcat.ver" value="6.0.43" />
     <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
     <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
 
@@ -277,8 +277,6 @@
     <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.tr" value="" />
-        <!-- old jetty 5 classes blow up the build if you forgot to do distclean -->
-        <delete dir="build/obj/org" />
         <copy todir="build/obj" file="resources/log4j.properties" />
         <jar destfile="./jettylib/jetty-i2p.jar" basedir="./build/obj" includes="**/*.class log4j.properties" >
             <manifest>
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index 5e54255f0d519074edd9dfc7314416b08b7f29b2..4eb0d6ed158ae5cde4baa467479f027ca374fb6f 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -26,6 +26,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import static net.i2p.app.ClientAppState.*;
 
+import java.io.InputStream;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.xml.XmlConfiguration;
@@ -68,9 +69,12 @@ public class JettyStart implements ClientApp {
     public void parseArgs(String[] args) throws Exception {
         Properties properties=new Properties();
         XmlConfiguration last=null;
+        InputStream in = null;
         for (int i = 0; i < args.length; i++) {
             if (args[i].toLowerCase().endsWith(".properties")) {
-                properties.load(Resource.newResource(args[i]).getInputStream());
+                in = Resource.newResource(args[i]).getInputStream();
+                properties.load(in);
+                in.close();
             } else {
                 XmlConfiguration configuration = new XmlConfiguration(Resource.newResource(args[i]).getURL());
                 if (last!=null)
diff --git a/apps/jetty/java/src/net/i2p/jetty/package.html b/apps/jetty/java/src/net/i2p/jetty/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0d02d8f87725a7d4c0ba231fb8da8c0c229b208
--- /dev/null
+++ b/apps/jetty/java/src/net/i2p/jetty/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Classes for starting Jetty, logging requests, and debug logging to the I2P router log.
+</p>
+</body>
+</html>
diff --git a/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
similarity index 90%
rename from apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java
rename to apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
index 1e3cdb70b1ea22963e966f763c4d55500614a4ac..4ec622f2047ccf72a32ea2c19771fd0355b86f25 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java
+++ b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
@@ -21,7 +21,7 @@
  *  
  * $Revision: 1.3 $
  */
-package i2p.susi.webmail;
+package net.i2p.servlet;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,13 +48,15 @@ import org.mortbay.servlet.MultiPartRequest;
  *
  *  The filter would have been added in web.xml,
  *  see that file, where it's commented out.
+ *  Filter isn't supported until Tomcat 7 (Servlet 3.0)
  *
- * @author user
+ *  @author user
+ *  @since 0.9.19 moved from susimail so it may be used by routerconsole too
  */
-class RequestWrapper {
+public class RequestWrapper {
 
 	private final HttpServletRequest httpRequest;
-	private MultiPartRequest multiPartRequest;
+	private final MultiPartRequest multiPartRequest;
 	private final Hashtable<String, String> cache;
 	private Hashtable<String, Integer> cachedParameterNames;
 
@@ -65,14 +67,16 @@ class RequestWrapper {
 		cache = new Hashtable<String, String>();
 		this.httpRequest = httpRequest;
 		String contentType = httpRequest.getContentType();
+		MultiPartRequest mpr = null;
 		if( contentType != null && contentType.toLowerCase(Locale.US).startsWith( "multipart/form-data" ) ) {
 			try {
-				multiPartRequest = new MultiPartRequest( httpRequest );
+				mpr = new MultiPartRequest( httpRequest );
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
+		multiPartRequest = mpr;
 	}
 
 	/**
diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/package.html b/apps/jetty/java/src/net/i2p/servlet/filters/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b34aa9e8deac23315cb2069540df4d9aafec395
--- /dev/null
+++ b/apps/jetty/java/src/net/i2p/servlet/filters/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+XSS filter, since 0.9.14.
+</p>
+</body>
+</html>
diff --git a/apps/jetty/java/src/net/i2p/servlet/package.html b/apps/jetty/java/src/net/i2p/servlet/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..689f508ab474c3e000050d873e79fa52429f14cc
--- /dev/null
+++ b/apps/jetty/java/src/net/i2p/servlet/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+RequestWrapper was a susimail class,
+moved from susimail to jetty-i2p.jar when we needed them in the router console also.
+As of 0.9.19.
+Requires org.mortbay classes also in this jar.
+Will be maintained as a public API until we move to Tomcat 7 (servlet 3.0).
+</p>
+</body>
+</html>
diff --git a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
similarity index 99%
rename from apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
rename to apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
index 88bc0296dc5901efdd6fdd412e480c2f5a3c5851..1c964b8f1974d9c84e5f445d15f7ecb06331195a 100644
--- a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
+++ b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
@@ -263,7 +263,7 @@ public class MultiPartRequest
     {
         // Get first boundary
         String line = _in.readLine();
-        if (!line.equals(_boundary))
+        if (line == null || !line.equals(_boundary))
         {
             //log.warn(line);
             throw new IOException("Missing initial multi part boundary");
diff --git a/apps/jetty/java/src/org/mortbay/servlet/package.html b/apps/jetty/java/src/org/mortbay/servlet/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..452eab1dd2887f44cdd45fe69a8bf96da37bb6ed
--- /dev/null
+++ b/apps/jetty/java/src/org/mortbay/servlet/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+Old Jetty 5 classes for multipart form requests, moved to susimail and modded when we moved to Jetty 6,
+then moved from susimail to jetty-i2p.jar when we needed them in the router console also.
+As of 0.9.19.
+Not a public API, not for direct use.
+These are requirements for net.i2p.servlet.RequestWrapper.
+</p>
+</body>
+</html>
diff --git a/apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java b/apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java
similarity index 100%
rename from apps/susimail/src/src/org/mortbay/util/ByteArrayPool.java
rename to apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java
diff --git a/apps/susimail/src/src/org/mortbay/util/LineInput.java b/apps/jetty/java/src/org/mortbay/util/LineInput.java
similarity index 100%
rename from apps/susimail/src/src/org/mortbay/util/LineInput.java
rename to apps/jetty/java/src/org/mortbay/util/LineInput.java
diff --git a/apps/susimail/src/src/org/mortbay/util/MultiMap.java b/apps/jetty/java/src/org/mortbay/util/MultiMap.java
similarity index 100%
rename from apps/susimail/src/src/org/mortbay/util/MultiMap.java
rename to apps/jetty/java/src/org/mortbay/util/MultiMap.java
diff --git a/apps/jetty/java/src/org/mortbay/util/package.html b/apps/jetty/java/src/org/mortbay/util/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..452eab1dd2887f44cdd45fe69a8bf96da37bb6ed
--- /dev/null
+++ b/apps/jetty/java/src/org/mortbay/util/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+Old Jetty 5 classes for multipart form requests, moved to susimail and modded when we moved to Jetty 6,
+then moved from susimail to jetty-i2p.jar when we needed them in the router console also.
+As of 0.9.19.
+Not a public API, not for direct use.
+These are requirements for net.i2p.servlet.RequestWrapper.
+</p>
+</body>
+</html>
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java
index 3e9f7f10224a61d41f7d6237f01e225c05285ee1..16c3776ed626bd689df925f97097c4d6608b2ca1 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java
@@ -6,8 +6,11 @@ import java.net.SocketTimeoutException;
 import net.i2p.I2PException;
 
 /**
- * Defines how to listen for streaming peer connections
- *
+ *  Streaming server socket returned by {@link I2PSocketManager#getServerSocket()}.
+ *  Defines how to listen for streaming peer connections.
+ *<p>
+ *  Note that this is not a standard Java {@link java.net.ServerSocket},
+ *  if you need one of those, use {@link I2PSocketManager#getStandardServerSocket()} instead.
  */
 public interface I2PServerSocket {
     /**
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
index f84fad967e8352db61744a2bee28b3058d854dc3..c2c3d83704b6662c6fb7f7f46785b0243448893e 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
@@ -9,9 +9,10 @@ import java.nio.channels.SelectableChannel;
 import net.i2p.data.Destination;
 
 /**
- * Minimalistic adapter between the socket api and I2PTunnel's way.
- * Note that this interface is a "subinterface" of the interface
- * defined in the "official" streaming api.
+ *  Streaming socket returned by {@link I2PSocketManager#connect(Destination)}.
+ *<p>
+ *  Note that this is not a standard Java {@link java.net.Socket},
+ *  if you need one of those, use {@link I2PSocketManager#connectToSocket(Destination)} instead.
  */
 public interface I2PSocket extends Closeable {
     /**
@@ -27,6 +28,12 @@ public interface I2PSocket extends Closeable {
     /**
      *  As of 0.9.9 will throw an IOE if socket is closed.
      *  Prior to that would return null instead of throwing IOE.
+     *<p>
+     *  Note that operations on the returned stream may return an
+     *  {@link IOException} whose <i>cause</i> as returned by
+     *  {@link IOException#getCause()} is an {@link I2PSocketException}.
+     *  If so, the client may retrieve a status code via
+     *  {@link I2PSocketException#getStatus()} to provide specific feedback to the user.
      *
      * @return an InputStream to read from the socket. Non-null since 0.9.9.
      * @throws IOException on failure
@@ -36,6 +43,12 @@ public interface I2PSocket extends Closeable {
     /**
      *  As of 0.9.9 will throw an IOE if socket is closed.
      *  Prior to that would return null instead of throwing IOE.
+     *<p>
+     *  Note that operations on the returned stream may return an
+     *  {@link IOException} whose <i>cause</i> as returned by
+     *  {@link IOException#getCause()} is an {@link I2PSocketException}.
+     *  If so, the client may retrieve a status code via
+     *  {@link I2PSocketException#getStatus()} to provide specific feedback to the user.
      *
      * @return an OutputStream to write into the socket. Non-null since 0.9.9.
      * @throws IOException on failure
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java
index db4f863ddacb925785d44078a041e0f5358b06de..5d5e97b65e17ecce08070e3d6cb269cd7afb30a7 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java
@@ -20,7 +20,18 @@ public class I2PSocketException extends SocketException {
     private static final String BUNDLE_NAME = "net.i2p.client.streaming.messages";
 
     /**
-     *  Use canned message for this status code
+     *  Router and I2CP status codes are 0 - 511. Start ours at 512.
+     *  @since 0.9.19
+     */
+    public static final int STATUS_CONNECTION_RESET = 512;
+
+    /**
+     *  Use canned message for this status code.
+     *
+     *  Standard codes from the router are 0-255, defined in MessageStatusMessage.
+     *  Standard codes from client-side I2CP are 256-511, defined in SendMessageStatusListener.
+     *  Standard codes from streaming are 512-767, defined here.
+     *
      *  @param status >= 0 from MessageStatusMessage or SendMessageStatusListener
      */
     public I2PSocketException(int status) {
@@ -105,6 +116,9 @@ public class I2PSocketException extends SocketException {
             case SendMessageStatusListener.STATUS_CANCELLED:
                 return _x("Local destination shutdown");
 
+            case STATUS_CONNECTION_RESET:
+                return _x("Connection was reset");
+
             case CUSTOM:
                 return super.getMessage();
 
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
index 60367d9227ffd3c7cbf69dca69aa7c464add683b..5d1819b702b5f7294475a94749bfe74e232a3cd0 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
@@ -73,6 +73,9 @@ public interface I2PSocketManager {
 
     /**
      *  Create a modified copy of the current options, to be used in a setDefaultOptions() call.
+     *
+     *  As of 0.9.19, defaults in opts are honored.
+     *
      *  @param opts The new options, may be null
      */
     public I2PSocketOptions buildOptions(Properties opts);
@@ -158,7 +161,31 @@ public interface I2PSocketManager {
      */
     public boolean ping(Destination peer, int localPort, int remotePort, long timeoutMs);
 
+    /**
+     * Ping the specified peer, returning true if they replied to the ping within 
+     * the timeout specified, false otherwise.  This call blocks.
+     *
+     * Uses the ports specified.
+     *
+     * @param peer Destination to ping
+     * @param localPort 0 - 65535
+     * @param remotePort 0 - 65535
+     * @param timeoutMs timeout in ms, greater than zero
+     * @param payload to include in the ping
+     * @return the payload received in the pong, zero-length if none, null on failure or timeout
+     * @throws IllegalArgumentException
+     * @since 0.9.18
+     */
+    public byte[] ping(Destination peer, int localPort, int remotePort, long timeoutMs, byte[] payload);
+
+    /**
+     *  For logging / diagnostics only
+     */
     public String getName();
+
+    /**
+     *  For logging / diagnostics only
+     */
     public void setName(String name);
 
     /**
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
index 4635727aadcf06654145455a0edad3e1bb915f35..00c04d83b3a5f1a1d43d6d11c984501c9fed5732 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
@@ -20,7 +20,15 @@ import net.i2p.util.Log;
 /**
  * Simplify the creation of I2PSession and transient I2P Destination objects if 
  * necessary to create a socket manager.  This class is most likely how classes
- * will begin their use of the socket library
+ * will begin their use of the socket library.
+ *
+ * For new applications, createDisconnectedManager() is the preferred method.
+ * It is non-blocking and throws on all errors.
+ * All createManager() methods are blocking and return null on error.
+ *
+ * Note that for all methods, host and port arguments are ignored if in RouterContext;
+ * it will connect internally to the router in the JVM.
+ * You cannot connect out from a router JVM to another router.
  *
  */
 public class I2PSocketManagerFactory {
@@ -41,6 +49,7 @@ public class I2PSocketManagerFactory {
      * I2CP router on the local machine on the default port (7654).
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      * 
      * @return the newly created socket manager, or null if there were errors
      */
@@ -53,6 +62,7 @@ public class I2PSocketManagerFactory {
      * I2CP router on the local machine on the default port (7654).
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      * 
      * @param opts Streaming and I2CP options, may be null
      * @return the newly created socket manager, or null if there were errors
@@ -66,9 +76,10 @@ public class I2PSocketManagerFactory {
      * I2CP router on the specified host and port.
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      * 
-     * @param host I2CP host null to use default
-     * @param port I2CP port <= 0 to use default
+     * @param host I2CP host null to use default, ignored if in router context
+     * @param port I2CP port <= 0 to use default, ignored if in router context
      * @return the newly created socket manager, or null if there were errors
      */
     public static I2PSocketManager createManager(String host, int port) {
@@ -80,9 +91,10 @@ public class I2PSocketManagerFactory {
      * I2CP router on the given machine reachable through the given port.
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      *
-     * @param i2cpHost I2CP host null to use default
-     * @param i2cpPort I2CP port <= 0 to use default
+     * @param i2cpHost I2CP host null to use default, ignored if in router context
+     * @param i2cpPort I2CP port <= 0 to use default, ignored if in router context
      * @param opts Streaming and I2CP options, may be null
      * @return the newly created socket manager, or null if there were errors
      */
@@ -107,6 +119,7 @@ public class I2PSocketManagerFactory {
      * stream and connected to the default I2CP host and port.
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      *
      * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      *                           or null for a transient destination. Caller must close.
@@ -121,6 +134,7 @@ public class I2PSocketManagerFactory {
      * stream and connected to the default I2CP host and port.
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      *
      * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      *                           or null for a transient destination. Caller must close.
@@ -137,11 +151,12 @@ public class I2PSocketManagerFactory {
      * port.
      * 
      * Blocks for a long time while the router builds tunnels.
+     * The nonblocking createDisconnectedManager() is preferred.
      *
      * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      *                           or null for a transient destination. Caller must close.
-     * @param i2cpHost I2CP host null to use default
-     * @param i2cpPort I2CP port <= 0 to use default
+     * @param i2cpHost I2CP host null to use default, ignored if in router context
+     * @param i2cpPort I2CP port <= 0 to use default, ignored if in router context
      * @param opts Streaming and I2CP options, may be null
      * @return the newly created socket manager, or null if there were errors
      */
@@ -167,8 +182,8 @@ public class I2PSocketManagerFactory {
      *
      * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      *                           or null for a transient destination. Caller must close.
-     * @param i2cpHost I2CP host null to use default
-     * @param i2cpPort I2CP port <= 0 to use default
+     * @param i2cpHost I2CP host null to use default, ignored if in router context
+     * @param i2cpPort I2CP port <= 0 to use default, ignored if in router context
      * @param opts Streaming and I2CP options, may be null
      * @return the newly created socket manager, non-null (throws on error)
      * @since 0.9.8
@@ -197,8 +212,8 @@ public class I2PSocketManagerFactory {
      *
      * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      *                           non-null. Caller must close.
-     * @param i2cpHost I2CP host null to use default
-     * @param i2cpPort I2CP port <= 0 to use default
+     * @param i2cpHost I2CP host null to use default, ignored if in router context
+     * @param i2cpPort I2CP port <= 0 to use default, ignored if in router context
      * @param opts Streaming and I2CP options, may be null
      * @param connect true to connect (blocking)
      * @return the newly created socket manager, non-null (throws on error)
@@ -212,11 +227,11 @@ public class I2PSocketManagerFactory {
         Properties syscopy = (Properties) System.getProperties().clone();
         for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
             String name = (String) e.getKey();
-            if (!opts.containsKey(name))
+            if (opts.getProperty(name) != null)
                 opts.setProperty(name, (String) e.getValue());
         }
         // as of 0.8.1 (I2CP default is BestEffort)
-        if (!opts.containsKey(I2PClient.PROP_RELIABILITY))
+        if (opts.getProperty(I2PClient.PROP_RELIABILITY) == null)
             opts.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
 
         if (i2cpHost != null)
diff --git a/apps/ministreaming/locale/messages_id.po b/apps/ministreaming/locale/messages_id.po
new file mode 100644
index 0000000000000000000000000000000000000000..670c306aca5e74dc5b2f9c0d2243dedc767542c1
--- /dev/null
+++ b/apps/ministreaming/locale/messages_id.po
@@ -0,0 +1,90 @@
+# I2P
+# Copyright (C) 2014 The I2P Project
+# This file is distributed under the same license as the streaming package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 17:55+0000\n"
+"PO-Revision-Date: 2014-09-04 04:23+0000\n"
+"Last-Translator: Khairul Agasta <khairuldroids@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:58
+msgid "Message timeout"
+msgstr "Batas waktu pesan"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:61
+msgid "Failed delivery to local destination"
+msgstr "Gagal mengirim ke tujuan lokal"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:64
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:97
+msgid "Local router failure"
+msgstr "Router lokal gagal"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:67
+msgid "Local network failure"
+msgstr "Jaringan lokal gagal"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:70
+msgid "Session closed"
+msgstr "Sesi ditutup"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:73
+msgid "Invalid message"
+msgstr "Pesan tidak valid"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:76
+msgid "Invalid message options"
+msgstr "Opsi pesan tidak valid"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:79
+msgid "Buffer overflow"
+msgstr "Buffer meluap"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:82
+msgid "Message expired"
+msgstr "Pesan kedaluwarsa"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:85
+msgid "Local lease set invalid"
+msgstr "Set penyewaan lokal tidak valid"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:88
+msgid "No local tunnels"
+msgstr "Tidak ada saluran lokal"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:91
+msgid "Unsupported encryption options"
+msgstr "Opsi enkripsi tidak didukung"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:94
+msgid "Invalid destination"
+msgstr "Tujuan tidak valid"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:100
+msgid "Destination lease set expired"
+msgstr "Set penyewaan tujuan kedaluwarsa"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:103
+msgid "Destination lease set not found"
+msgstr "Set penyewaan tujuan tidak ditemukan"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:106
+msgid "Local destination shutdown"
+msgstr "Tujuan lokal dimatikan"
+
+#. Translate this one here, can't do it later
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:113
+msgid "Failure code"
+msgstr "Kode kegagalan"
diff --git a/apps/ministreaming/locale/messages_pl.po b/apps/ministreaming/locale/messages_pl.po
new file mode 100644
index 0000000000000000000000000000000000000000..450d4f8d6fa65f859e5f56721961d93ed6d299f8
--- /dev/null
+++ b/apps/ministreaming/locale/messages_pl.po
@@ -0,0 +1,90 @@
+# I2P
+# Copyright (C) 2014 The I2P Project
+# This file is distributed under the same license as the streaming package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# polacco <polacco@i2pmail.org>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 17:55+0000\n"
+"PO-Revision-Date: 2015-02-12 19:24+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:58
+msgid "Message timeout"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:61
+msgid "Failed delivery to local destination"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:64
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:97
+msgid "Local router failure"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:67
+msgid "Local network failure"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:70
+msgid "Session closed"
+msgstr "Sesja zamknięta"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:73
+msgid "Invalid message"
+msgstr "Nieprawidłowa wiadomość"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:76
+msgid "Invalid message options"
+msgstr "Nieprawidłowe opcje wiadomości"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:79
+msgid "Buffer overflow"
+msgstr "Przepełnienie bufora"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:82
+msgid "Message expired"
+msgstr "Wiadomość wygasła"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:85
+msgid "Local lease set invalid"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:88
+msgid "No local tunnels"
+msgstr "Brak lokalnych tuneli"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:91
+msgid "Unsupported encryption options"
+msgstr "Nieobsługiwane opcje szyfrowania"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:94
+msgid "Invalid destination"
+msgstr "Nieprawidłowy cel"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:100
+msgid "Destination lease set expired"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:103
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:106
+msgid "Local destination shutdown"
+msgstr ""
+
+#. Translate this one here, can't do it later
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:113
+msgid "Failure code"
+msgstr "Kod niepowodzenia"
diff --git a/apps/ministreaming/locale/messages_ro.po b/apps/ministreaming/locale/messages_ro.po
new file mode 100644
index 0000000000000000000000000000000000000000..da730ac64a68b408796713639478d7a8cdad0fc9
--- /dev/null
+++ b/apps/ministreaming/locale/messages_ro.po
@@ -0,0 +1,90 @@
+# I2P
+# Copyright (C) 2014 The I2P Project
+# This file is distributed under the same license as the streaming package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# polearnik <polearnik@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 17:55+0000\n"
+"PO-Revision-Date: 2015-01-02 19:26+0000\n"
+"Last-Translator: pol polearnik <polearnik@mail.ru>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:58
+msgid "Message timeout"
+msgstr "Mesaj expirat"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:61
+msgid "Failed delivery to local destination"
+msgstr "Livrarea la destinație locală a esuat"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:64
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:97
+msgid "Local router failure"
+msgstr "Eroarea routerului local"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:67
+msgid "Local network failure"
+msgstr "Eroarea retelei locale"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:70
+msgid "Session closed"
+msgstr "Sesiune e inchisa"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:73
+msgid "Invalid message"
+msgstr "Mesaj incorect"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:76
+msgid "Invalid message options"
+msgstr "Optiunile mesajului incorecte"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:79
+msgid "Buffer overflow"
+msgstr "supraîncărcare memoriei"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:82
+msgid "Message expired"
+msgstr "Mesaj expirat"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:85
+msgid "Local lease set invalid"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:88
+msgid "No local tunnels"
+msgstr "Nu sunt tonele locale"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:91
+msgid "Unsupported encryption options"
+msgstr "Optiuni de criptare nesuportate"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:94
+msgid "Invalid destination"
+msgstr "Destinatie incorecta"
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:100
+msgid "Destination lease set expired"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:103
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:106
+msgid "Local destination shutdown"
+msgstr ""
+
+#. Translate this one here, can't do it later
+#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:113
+msgid "Failure code"
+msgstr "Codul erorii"
diff --git a/apps/ministreaming/locale/messages_ru.po b/apps/ministreaming/locale/messages_ru.po
index 740bc9d3cc0f27057734319358fbac1b21b25f52..73287836e2e1624817564a0a5289d13e9cf366db 100644
--- a/apps/ministreaming/locale/messages_ru.po
+++ b/apps/ministreaming/locale/messages_ru.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-23 17:55+0000\n"
-"PO-Revision-Date: 2014-06-26 19:53+0000\n"
+"PO-Revision-Date: 2014-08-28 18:57+0000\n"
 "Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Истек срок действия сообщения"
 
 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:85
 msgid "Local lease set invalid"
-msgstr ""
+msgstr "Локальный LeaseSet недействителен"
 
 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:88
 msgid "No local tunnels"
@@ -75,11 +75,11 @@ msgstr "Недопустимый адрес назначения"
 
 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:100
 msgid "Destination lease set expired"
-msgstr ""
+msgstr "Время ожидания истекло для LeaseSet с адресом назначения"
 
 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:103
 msgid "Destination lease set not found"
-msgstr ""
+msgstr "LeaseSet для адреса назначения не найден"
 
 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:106
 msgid "Local destination shutdown"
diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java
index cb2a01c0f653f3f3ed00cca8381b1df4fdb28b80..841dba9b495ec5aa2734178f5493b54e8643c736 100644
--- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java
+++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java
@@ -152,19 +152,28 @@ public class NewsXMLParser {
     private static NewsMetadata extractNewsMetadata(Node feed) throws I2PParserException {
         NewsMetadata rv = new NewsMetadata();
         Node n = feed.getNode("title");
-        if (n != null)
+        if (n != null) {
             rv.feedTitle = n.getValue();
+            if (rv.feedTitle != null)
+                rv.feedTitle = rv.feedTitle.trim();
+        }
         n = feed.getNode("subtitle");
-        if (n != null)
+        if (n != null) {
             rv.feedSubtitle = n.getValue();
+            if (rv.feedSubtitle != null)
+                rv.feedSubtitle = rv.feedTitle.trim();
+        }
         n = feed.getNode("id");
-        if (n != null)
+        if (n != null) {
             rv.feedID = n.getValue();
+            if (rv.feedTitle != null)
+                rv.feedTitle = rv.feedTitle.trim();
+        }
         n = feed.getNode("updated");
         if (n != null) {
             String v = n.getValue();
             if (v != null) {
-                long time = RFC3339Date.parse3339Date(v);
+                long time = RFC3339Date.parse3339Date(v.trim());
                 if (time > 0)
                     rv.feedUpdated = time;
             }
@@ -179,20 +188,23 @@ public class NewsXMLParser {
             // release attributes
             String a = r.getAttributeValue("date");
             if (a.length() > 0) {
-                long time = RFC3339Date.parse3339Date(a);
+                long time = RFC3339Date.parse3339Date(a.trim());
                 if (time > 0)
                     release.date = time;
             }
             a = r.getAttributeValue("minVersion");
             if (a.length() > 0)
-                release.minVersion = a;
+                release.minVersion = a.trim();
             a = r.getAttributeValue("minJavaVersion");
             if (a.length() > 0)
-                release.minJavaVersion = a;
+                release.minJavaVersion = a.trim();
             // release nodes
             n = r.getNode("i2p:version");
-            if (n != null)
+            if (n != null) {
                 release.i2pVersion = n.getValue();
+                if (release.i2pVersion != null)
+                    release.i2pVersion = release.i2pVersion.trim();
+            }
 
             List<NewsMetadata.Update> updates = new ArrayList<NewsMetadata.Update>();
             List<Node> updateNodes = getNodes(r, "i2p:update");
@@ -207,7 +219,7 @@ public class NewsXMLParser {
                 if (types.contains(type))
                     throw new I2PParserException("update with duplicate type");
                 NewsMetadata.Update update = new NewsMetadata.Update();
-                update.type = type;
+                update.type = type.trim();
                 types.add(type);
                 int totalSources = 0;
 
@@ -216,7 +228,7 @@ public class NewsXMLParser {
                     // returns "" for none
                     String href = t.getAttributeValue("href");
                     if (href.length() > 0) {
-                        update.torrent = href;
+                        update.torrent = href.trim();
                         totalSources += 1;
                     }
                 }
@@ -241,31 +253,46 @@ public class NewsXMLParser {
         for (Node entry : entries) {
             NewsEntry e = new NewsEntry();
             Node n = entry.getNode("title");
-            if (n != null)
+            if (n != null) {
                 e.title = n.getValue();
+                if (e.title != null)
+                    e.title = e.title.trim();
+            }
             n = entry.getNode("link");
-            if (n != null)
+            if (n != null) {
                 e.link = n.getValue();
+                if (e.link != null)
+                    e.link = e.link.trim();
+            }
             n = entry.getNode("id");
-            if (n != null)
+            if (n != null) {
                 e.id = n.getValue();
+                if (e.id != null)
+                    e.id = e.id.trim();
+            }
             n = entry.getNode("updated");
             if (n != null) {
                 String v = n.getValue();
                 if (v != null) {
-                    long time = RFC3339Date.parse3339Date(v);
+                    long time = RFC3339Date.parse3339Date(v.trim());
                     if (time > 0)
                         e.updated = time;
                 }
             }
             n = entry.getNode("summary");
-            if (n != null)
+            if (n != null) {
                 e.summary = n.getValue();
+                if (e.summary != null)
+                    e.summary = e.summary.trim();
+            }
             n = entry.getNode("author");
             if (n != null) {
                 n = n.getNode("name");
-                if (n != null)
+                if (n != null) {
                     e.authorName = n.getValue();
+                    if (e.authorName != null)
+                        e.authorName = e.authorName.trim();
+                }
             }
             n = entry.getNode("content");
             if (n != null) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
index 94ac47104f4d8eaf6c90597cd9468d2199c7a851..3d2919f396e8cbdfa16eba8164a824c637d63c44 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -188,6 +188,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
         PluginUpdateHandler puh = new PluginUpdateHandler(_context, this);
         register((Checker)puh, PLUGIN, HTTP, 0);
         register((Updater)puh, PLUGIN, HTTP, 0);
+        register((Updater)puh, PLUGIN, FILE, 0);
         // Don't do this until we can prevent it from retrying the same thing again...
         // handled inside P.U.H. for now
         //register((Updater)puh, PLUGIN, FILE, 0);
@@ -523,7 +524,8 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
         UpdateItem item = new UpdateItem(PLUGIN, name);
         VersionAvailable va = _available.get(item);
         if (va == null) {
-            va = new VersionAvailable("", "", HTTP, uris);
+            UpdateMethod method = "file".equals(uri.getScheme()) ? FILE : HTTP;
+            va = new VersionAvailable("", "", method, uris);
             _available.putIfAbsent(item, va);
         }
         if (_log.shouldLog(Log.WARN))
@@ -971,8 +973,8 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
      *  @param t may be null
      */
     public void notifyTaskFailed(UpdateTask task, String reason, Throwable t) {
-        if (_log.shouldLog(Log.WARN))
-            _log.warn("Failed " + task + " for " + task.getType() + ": " + reason, t);
+        if (_log.shouldLog(Log.ERROR))
+            _log.error("Failed " + task + " for " + task.getType() + ": " + reason, t);
         List<RegisteredUpdater> toTry = _downloaders.get(task);
         if (toTry != null) {
             UpdateItem ui = new UpdateItem(task.getType(), task.getID());
@@ -988,8 +990,27 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
         _downloaders.remove(task);
         _activeCheckers.remove(task);
         // any other types that shouldn't display?
-        if (task.getURI() != null && task.getType() != TYPE_DUMMY)
-            finishStatus("<b>" + _("Transfer failed from {0}", linkify(task.getURI().toString())) + "</b>");
+        if (task.getURI() != null && task.getType() != TYPE_DUMMY) {
+            StringBuilder buf = new StringBuilder(256);
+            buf.append("<b>");
+            String uri = task.getURI().toString();
+            if (uri.startsWith("file:") || task.getMethod() == FILE) {
+                uri = DataHelper.stripHTML(task.getURI().getPath());
+                buf.append(_("Install failed from {0}", uri));
+            } else {
+                buf.append(_("Transfer failed from {0}"));
+            }
+            if (reason != null && reason.length() > 0) {
+                buf.append("<br>");
+                buf.append(reason);
+            }
+            if (t != null && t.getMessage() != null && t.getMessage().length() > 0) {
+                buf.append("<br>");
+                buf.append(DataHelper.stripHTML(t.getMessage()));
+            }
+            buf.append("</b>");
+            finishStatus(buf.toString());
+        }
     }
 
     /**
@@ -1271,11 +1292,11 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
             _context.router().saveConfig(NewsHelper.PROP_LAST_UPDATE_TIME, Long.toString(modtime));
 
             if ("install".equals(policy)) {
-                _log.log(Log.CRIT, "Update was VERIFIED, restarting to install it");
+                _log.log(Log.CRIT, "Update was downloaded and verified, restarting to install it");
                 updateStatus("<b>" + _("Update verified") + "</b><br>" + _("Restarting"));
                 restart();
             } else {
-                _log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart");
+                _log.logAlways(Log.WARN, "Update was downloaded and verified, will be installed at next restart");
                 // SummaryHelper will display restart info separately
                 updateStatus("");
             }
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
index f8b6fd140df9bfd3a5c292a11ec614a48895d75e..fea9959f62147b391a1c8efbbd768677ec551a5e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
@@ -49,6 +49,7 @@ import net.i2p.util.VersionComparator;
  */
 class NewsFetcher extends UpdateRunner {
     private String _lastModified;
+    private long _newLastModified;
     private final File _newsFile;
     private final File _tempFile;
     /** is the news newer */
@@ -61,7 +62,7 @@ class NewsFetcher extends UpdateRunner {
         super(ctx, mgr, NEWS, uris);
         _newsFile = new File(ctx.getRouterDir(), NewsHelper.NEWS_FILE);
         _tempFile = new File(ctx.getTempDir(), "tmp-" + ctx.random().nextLong() + TEMP_NEWS_FILE);
-        long lastMod = NewsHelper.lastChecked(ctx);
+        long lastMod = NewsHelper.lastUpdated(ctx);
         if (lastMod > 0)
             _lastModified = RFC822Date.to822Date(lastMod);
     }
@@ -100,11 +101,16 @@ class NewsFetcher extends UpdateRunner {
                     get = new EepGet(_context, false, null, 0, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified);
                 get.addStatusListener(this);
                 long start = _context.clock().now();
+                // will be adjusted in headerReceived() below
+                _newLastModified = start;
                 if (get.fetch()) {
                     int status = get.getStatusCode();
                     if (status == 200 || status == 304) {
-                        _context.router().saveConfig(NewsHelper.PROP_LAST_CHECKED,
-                                                 Long.toString(start));
+                        Map<String, String> opts = new HashMap<String, String>(2);
+                        opts.put(NewsHelper.PROP_LAST_CHECKED, Long.toString(start));
+                        if (status == 200 && _isNewer)
+                            opts.put(NewsHelper.PROP_LAST_UPDATED, Long.toString(_newLastModified));
+                        _context.router().saveConfig(opts, null);
                         return;
                     }
                 }
@@ -329,6 +335,19 @@ class NewsFetcher extends UpdateRunner {
     @Override
     public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {}
 
+    /**
+     *  Overriden to get the last-modified header
+     */
+    @Override
+    public void headerReceived(String url, int attemptNum, String key, String val) {
+        if ("Last-Modified".equals(key)) {
+            long lm = RFC822Date.parse822Date(val);
+            // _newLastModified was set to start time in fetchNews() above
+            if (lm > 0 && lm < _newLastModified)
+                _newLastModified = lm;
+        }
+    }
+
     /**
      *  Copies the file from temp dir to the news location,
      *  calls checkForUpdates()
@@ -338,8 +357,7 @@ class NewsFetcher extends UpdateRunner {
         if (_log.shouldLog(Log.INFO))
             _log.info("News fetched from " + url + " with " + (alreadyTransferred+bytesTransferred));
         
-        long now = _context.clock().now();
-        if (_tempFile.exists()) {
+        if (_tempFile.exists() && _tempFile.length() > 0) {
             File from;
             if (url.endsWith(".su3")) {
                 try {
@@ -355,8 +373,8 @@ class NewsFetcher extends UpdateRunner {
             boolean copied = FileUtil.rename(from, _newsFile);
             _tempFile.delete();
             if (copied) {
-                String newVer = Long.toString(now);
-                _context.router().saveConfig(NewsHelper.PROP_LAST_UPDATED, newVer);
+                // this is either the start time or the Last-Modified header
+                String newVer = Long.toString(_newLastModified);
                 // fixme su3 version ? but it will be older than file version, which is older than now.
                 _mgr.notifyVersionAvailable(this, _currentURI, NEWS, "", HTTP,
                                             null, newVer, "");
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateHandler.java
index f327f739da95915bfd2fcc47be0bf2845d94e22a..b360ecb2f6b6cea856ee7815079a85d516e100bc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateHandler.java
@@ -67,7 +67,8 @@ class PluginUpdateHandler implements Checker, Updater {
     public UpdateTask update(UpdateType type, UpdateMethod method, List<URI> updateSources,
                                String appName, String newVersion, long maxTime) {
         if (type != UpdateType.PLUGIN ||
-            method != UpdateMethod.HTTP || updateSources.isEmpty())
+            (method != UpdateMethod.HTTP && method != UpdateMethod.FILE) ||
+            updateSources.isEmpty())
             return null;
         Properties props = PluginStarter.pluginProperties(_context, appName);
         String oldVersion = props.getProperty("version");
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
index 65e9f5584af90ab0cc28374b9307d59d54e3937b..9b7143ed52371b2cde6a40acd74e339307b8f976 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
@@ -82,16 +82,16 @@ class PluginUpdateRunner extends UpdateRunner {
         protected void update() {
 
             _updated = false;
-            if(_xpi2pURL.startsWith("file://")) {
-                updateStatus("<b>" + _("Attempting to install from file {0}", _xpi2pURL) + "</b>");
-                // strip off "file://"
-                String xpi2pfile = _xpi2pURL.substring(7);
-                if(xpi2pfile.length() == 0) {
-                        statusDone("<b>" + _("No file specified {0}", _xpi2pURL) + "</b>");
+            if (_xpi2pURL.startsWith("file:") || _method == UpdateMethod.FILE) {
+                // strip off file:// or just file:
+                String xpi2pfile = _uri.getPath();
+                if(xpi2pfile == null || xpi2pfile.length() == 0) {
+                        statusDone("<b>" + _("Bad URL {0}", _xpi2pURL) + "</b>");
                 } else {
                     // copy the contents of from to _updateFile
                     long alreadyTransferred = (new File(xpi2pfile)).getAbsoluteFile().length();
                     if(FileUtil.copy((new File(xpi2pfile)).getAbsolutePath(), _updateFile, true, false)) {
+                        updateStatus("<b>" + _("Attempting to install from file {0}", _xpi2pURL) + "</b>");
                         transferComplete(alreadyTransferred, alreadyTransferred, 0L, _xpi2pURL, _updateFile, false);
                     } else {
                         statusDone("<b>" + _("Failed to install from file {0}, copy failed.", _xpi2pURL) + "</b>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
index 798782fb253c4dd2de25df7b69dd0daf552cb3a9..8f128496d4e5ccf351bad217c08e1f7a79496545 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
@@ -43,7 +43,7 @@ class TrustedPluginKeys {
      *  @return map of B64 DSA keys to signer names
      */
     public static Map<String, String> getKeys() {
-        Map<String, String> rv = new HashMap(KEYS.length / 2);
+        Map<String, String> rv = new HashMap<String, String>(KEYS.length / 2);
         for (int i = 0; i < KEYS.length; i += 2) {
             rv.put(KEYS[i+1], KEYS[i]);
         }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index a13a432f2cbcd6c2a84ef41548659ccb45dae77c..e5a548cf1ce0db7a7cd17a56249957f18e3d8ee4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -59,7 +59,7 @@ public class CSSHelper extends HelperBase {
         // Protected with nonce in css.jsi
         if (lang != null && lang.length() >= 2 && lang.length() <= 6 &&
             lang.replaceAll("[a-zA-Z_]", "").length() == 0) {
-            Map m = new HashMap(2);
+            Map<String, String> m = new HashMap<String, String>(2);
             int under = lang.indexOf('_');
             if (under < 0) {
                 m.put(Messages.PROP_LANG, lang.toLowerCase(Locale.US));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
index 729a4b14d1c73629cd39e0bcc281b037e0256a3a..dc0983ea297b373a7581a6b6da9a52d7a27e067c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
@@ -1,6 +1,10 @@
 package net.i2p.router.web;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -13,11 +17,15 @@ import java.util.Set;
 
 import net.i2p.app.ClientApp;
 import net.i2p.app.ClientAppState;
+import net.i2p.crypto.SU3File;
+import net.i2p.crypto.TrustedUpdate;
+import net.i2p.data.DataHelper;
 import net.i2p.router.client.ClientManagerFacadeImpl;
 import net.i2p.router.startup.ClientAppConfig;
 import net.i2p.router.startup.LoadClientAppsJob;
 import net.i2p.router.update.ConsoleUpdateManager;
 import static net.i2p.update.UpdateType.*;
+import net.i2p.util.SecureFileOutputStream;
 
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 
@@ -66,6 +74,15 @@ public class ConfigClientsHandler extends FormHandler {
                 addFormError("Plugins disabled");
             return;
         }
+        if (_action.equals(_("Install Plugin from File"))) {
+            if (pluginsEnabled &&
+                (_context.getBooleanPropertyDefaultTrue(ConfigClientsHelper.PROP_ENABLE_PLUGIN_INSTALL) ||
+                 isAdvanced()))
+                installPluginFromFile();
+            else
+                addFormError("Plugins disabled");
+            return;
+        }
         if (_action.equals(_("Update All Installed Plugins"))) {
             if (pluginsEnabled)
                 updateAllPlugins();
@@ -388,6 +405,73 @@ public class ConfigClientsHandler extends FormHandler {
         installPlugin(null, url);
     }
 
+    /**
+     *  @since 0.9.19
+     */
+    private void installPluginFromFile() {
+        InputStream in = _requestWrapper.getInputStream("pluginFile");
+        // go to some trouble to verify it's an su3 or xpi2p file before
+        // passing it along, so we can display a good error message
+        byte[] su3Magic = DataHelper.getASCII(SU3File.MAGIC);
+        byte[] zipMagic = new byte[] { 0x50, 0x4b, 0x03, 0x04 };
+        byte[] magic = new byte[TrustedUpdate.HEADER_BYTES + zipMagic.length];
+        File tmp =  null;
+        OutputStream out = null;
+        try {
+            // non-null but zero bytes if no file entered, don't know why
+            if (in == null || in.available() <= 0) {
+                addFormError(_("You must enter a file"));
+                return;
+            }
+            DataHelper.read(in, magic);
+            boolean isSU3 = DataHelper.eq(magic, 0, su3Magic, 0, su3Magic.length);
+            if (!isSU3) {
+                if (!DataHelper.eq(magic, TrustedUpdate.HEADER_BYTES, zipMagic, 0, zipMagic.length)) {
+                    String name = _requestWrapper.getFilename("pluginFile");
+                    if (name == null)
+                        name = "File";
+                    throw new IOException(name + " is not an xpi2p or su3 plugin");
+                }
+            }
+            tmp =  new File(_context.getTempDir(), "plugin-" + _context.random().nextInt() + (isSU3 ? ".su3" : ".xpi2p"));
+            out = new BufferedOutputStream(new SecureFileOutputStream(tmp));
+            out.write(magic);
+            byte buf[] = new byte[16*1024];
+            int read = 0;
+            while ( (read = in.read(buf)) != -1)  {
+                out.write(buf, 0, read);
+            }
+            out.close();
+            String url = tmp.toURI().toString();
+            // threaded... TODO inline to get better result to UI?
+            installPlugin(null, url);
+            // above sleeps 1000, give it some more time?
+            // or check for complete?
+            ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
+            if (mgr == null)
+                return;
+            for (int i = 0; i < 20; i++) {
+                if (!mgr.isUpdateInProgress(PLUGIN)) {
+                    tmp.delete();
+                    break;
+                }
+                try {
+                   Thread.sleep(500);
+                } catch (InterruptedException ie) {}
+             }
+             String status = mgr.getStatus();
+             if (status != null && status.length() > 0)
+                 addFormNoticeNoEscape(status);
+        } catch (IOException ioe) {
+            addFormError(_("Install from file failed") + " - " + ioe.getMessage());
+        } finally {
+            // it's really a ByteArrayInputStream but we'll play along...
+            if (in != null)
+                try { in.close(); } catch (IOException ioe) {}
+            if (out != null)  try { out.close(); } catch (IOException ioe) {}
+        }
+    }
+
     private void updatePlugin(String app) {
         Properties props = PluginStarter.pluginProperties(_context, app);
         String url = props.getProperty("updateURL.su3");
@@ -434,10 +518,14 @@ public class ConfigClientsHandler extends FormHandler {
             addFormError(_("Bad URL {0}", url));
             return;
         }
-        if (mgr.installPlugin(app, uri))
-            addFormNotice(_("Downloading plugin from {0}", url));
-        else
+        if (mgr.installPlugin(app, uri)) {
+            if (url.startsWith("file:"))
+                addFormNotice(_("Installing plugin from {0}", uri.getPath()));
+            else
+                addFormNotice(_("Downloading plugin from {0}", url));
+        } else {
             addFormError("Cannot install, check logs");
+        }
         // So that update() will post a status to the summary bar before we reload
         try {
            Thread.sleep(1000);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
index f1970e0447361bb171a45deab94d5a6ebafce740..e98528a9650c518da2c3b4a2603597db9e2bb66c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
@@ -126,6 +126,7 @@ public class ConfigLoggingHandler extends FormHandler {
             }
         }
         
+     /*** disable
         if ( (_filename != null) && (_filename.trim().length() > 0) ) {
             _filename = _filename.trim();
             String old = _context.logManager().getBaseLogfilename();
@@ -138,6 +139,7 @@ public class ConfigLoggingHandler extends FormHandler {
                               + " (note: will not take effect until next rotation)");
             }
         }
+      ***/
         
         if ( (_recordFormat != null) && (_recordFormat.trim().length() > 0) ) {
             _recordFormat = _recordFormat.trim();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java
index 7a6b032c188d985393069c2c8dbbb1f4820f2d93..56371c1c28424a7f47cfc96437d2b539e65ddfb7 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java
@@ -1,6 +1,12 @@
 package net.i2p.router.web;
 
 import java.io.IOException;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * Render the configuration menu at the top of all the config pages.
@@ -21,6 +27,27 @@ public class ConfigNavHelper extends HelperBase {
                                            _x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
                                            _x("Reseeding"), _x("Advanced") };
 
+    private static class Tab {
+        public final String page, title;
+        public Tab(String p, String t) {
+            page = p; title = t;
+        }
+    }
+
+    private class TabComparator implements Comparator<Tab> {
+         private static final long serialVersionUID = 1L;
+         private final Collator coll;
+
+         public TabComparator() {
+             super();
+             coll = Collator.getInstance(new Locale(Messages.getLanguage(_context)));
+         }
+
+         public int compare(Tab l, Tab r) {
+             return coll.compare(l.title, r.title);
+        }
+    }
+
     /**
      *  @param graphical false for text-mode browsers
      */
@@ -31,18 +58,23 @@ public class ConfigNavHelper extends HelperBase {
         boolean span = graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME));
         if (!span)
             buf.append("<center>");
+        List<Tab> tabs = new ArrayList<Tab>(pages.length);
         for (int i = 0; i < pages.length; i++) {
-            String page = "config" + pages[i];
+            tabs.add(new Tab(pages[i], _(titles[i])));
+        }
+        Collections.sort(tabs, new TabComparator());
+        for (int i = 0; i < tabs.size(); i++) {
+            String page = "config" + tabs.get(i).page;
             if (requestURI.endsWith(page) || requestURI.endsWith(page + ".jsp")) {
                 // we are there
                 if (span)
                     buf.append("<span class=\"tab2\">");
-                buf.append(_(titles[i]));
+                buf.append(tabs.get(i).title);
             } else {
                 // we are not there, make a link
                 if (span)
                     buf.append("<span class=\"tab\">");
-                buf.append("<a href=\"").append(page).append("\">").append(_(titles[i])).append("</a>");
+                buf.append("<a href=\"").append(page).append("\">").append(tabs.get(i).title).append("</a>");
             }
             if (span)
                 buf.append(" </span>\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index 7f13242d3dab6f000ec75610012ef5abf52a8358..77005cf9d135e0de285706d9f34dc2185bb40c28 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -2,6 +2,7 @@ package net.i2p.router.web;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.DataHelper;
@@ -185,6 +186,12 @@ public class ConfigNetHelper extends HelperBase {
     /** @since IPv6 */
     public String getAddressSelector() {
         Set<String> addrs = getAddresses();
+        // isPubliclyRoutable() rejects some IPv6 addresses that getAddresses() allows
+        for (Iterator<String> iter = addrs.iterator(); iter.hasNext(); ) {
+            byte[] ip = Addresses.getIP(iter.next());
+            if (ip == null || !TransportUtil.isPubliclyRoutable(ip, true))
+                iter.remove();
+        }
         Set<String> configs;
         String cs = getUdphostname();
         if (cs.length() <= 0) {
@@ -318,6 +325,10 @@ public class ConfigNetHelper extends HelperBase {
     }
 
     public static final int DEFAULT_SHARE_KBPS = 12;
+
+    /**
+     *  @return in KBytes per second
+     */
     public int getShareBandwidth() {
         int irateKBps = _context.bandwidthLimiter().getInboundKBytesPerSecond();
         int orateKBps = _context.bandwidthLimiter().getOutboundKBytesPerSecond();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
index d05933b82796983f7919d946874868f162f41e7b..2dd4330a1e987db8fe8676089678139ecae64604 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java
@@ -1,5 +1,9 @@
 package net.i2p.router.web;
 
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,11 +29,73 @@ public class ConfigReseedHandler extends FormHandler {
                 // skip the nonce checking in ReseedHandler
                 addFormNotice(_("Starting reseed process"));
             }
-            return;
-        }
-        if (_action.equals(_("Save changes"))) {
+        } else if (_action.equals(_("Reseed from URL"))) {
+            String val = getJettyString("url");
+            if (val != null)
+                val = val.trim();
+            if (val == null || val.length() == 0) {
+                addFormError(_("You must enter a URL"));
+                return;
+            }
+            URL url;
+            try {
+                url = new URL(val);
+            } catch (MalformedURLException mue) {
+                addFormError(_("Bad URL {0}", val));
+                return;
+            }
+            try {
+                if (!_context.netDb().reseedChecker().requestReseed(url)) {
+                    addFormError(_("Reseeding is already in progress"));
+                } else {
+                    // wait a while for completion but not forever
+                    for (int i = 0; i < 40; i++) {
+                        try {
+                            Thread.sleep(500);
+                        } catch (InterruptedException ie) {}
+                        if (!_context.netDb().reseedChecker().inProgress())
+                            break;
+                    }
+                    String status = _context.netDb().reseedChecker().getStatus();
+                    String error = _context.netDb().reseedChecker().getError();
+                    if (error.length() > 0) {
+                        addFormErrorNoEscape(error);
+                    } else if (status.length() > 0) {
+                        addFormNoticeNoEscape(status);
+                    } else if (_context.netDb().reseedChecker().inProgress()) {
+                        addFormNotice(_("Reseed in progress, check summary bar for status"));
+                    } else {
+                        addFormNotice(_("Reseed complete, check summary bar for status"));
+                    }
+                }
+            } catch (IllegalArgumentException iae) {
+                addFormError(_("Bad URL {0}", val) + " - " + iae.getMessage());
+            }
+        } else if (_action.equals(_("Reseed from file"))) {
+            InputStream in = _requestWrapper.getInputStream("file");
+            try {
+                // non-null but zero bytes if no file entered, don't know why
+                if (in == null || in.available() <= 0) {
+                    addFormError(_("You must enter a file"));
+                    return;
+                }
+                int count = _context.netDb().reseedChecker().requestReseed(in);
+                if (count <= 0) {
+                    addFormError(_("Reseed from file failed"));
+                } else {
+                    addFormNotice(ngettext("Reseed successful, loaded {0} router info from file",
+                                           "Reseed successful, loaded {0} router infos from file",
+                                           count));
+                }
+            } catch (IOException ioe) {
+                addFormError(_("Reseed from file failed") + " - " + ioe);
+            } finally {
+                // it's really a ByteArrayInputStream but we'll play along...
+                if (in != null)
+                    try { in.close(); } catch (IOException ioe) {}
+            }
+        } else if (_action.equals(_("Save changes"))) {
             saveChanges();
-            return;
         }
         //addFormError(_("Unsupported") + ' ' + _action + '.');
     }
@@ -84,4 +150,9 @@ public class ConfigReseedHandler extends FormHandler {
         else
             addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs"));
     }
+
+    /** translate (ngettext) @since 0.9.19 */
+    public String ngettext(String s, String p, int n) {
+        return Messages.getString(n, s, p, _context);
+    }
 }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 21be2aa5973a4aff1b850561ca9dc6094af54d5a..4129db13689b2a06fa0aeba69b8dab207112d608 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -183,6 +183,15 @@ public class ConfigServiceHandler extends FormHandler {
         }
     }
 
+    /**
+     *  Should we show the cancel button?
+     *
+     *  @since 0.9.19
+     */
+    public boolean shouldShowCancelGraceful() {
+        return _context.router().gracefulShutdownInProgress();
+    }
+
     @Override
     protected void processForm() {
         if (_action == null) return;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
index 5e34d72456d0c5d402aabbdeb4b7348a87a87e53..ad444c9a6a61b94279ab8eadab252834f6748086 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
@@ -38,7 +38,7 @@ public class ConfigTunnelsHandler extends FormHandler {
      */
     private void saveChanges() {
         boolean saveRequired = false;
-        Map<String, String> changes = new HashMap();
+        Map<String, String> changes = new HashMap<String, String>();
         
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Saving changes, with props = " + _settings + ".");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java
index 00293a56785bfe3ff5cdf6eb2d8f84c629105d37..492c006e2b953939db1c9360608b74363f48a7f8 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java
@@ -44,6 +44,7 @@ public class EventLogHelper extends FormHandler {
         EventLog.NEW_IDENT, _x("New router identity"),
         EventLog.NOT_FLOODFILL, _x("Disabled floodfill"),
         EventLog.OOM, _x("Out of memory error"),
+        EventLog.REACHABILITY, _x("Reachability change"),
         EventLog.REKEYED, _x("New router identity"),
         EventLog.RESEED, _x("Reseeded router"),
         EventLog.SOFT_RESTART, _x("Soft restart"),
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
index 5d66bd5a1020d9b454b673ea619b91100c624e51..a56f8f7ad18af4405035525731e72974d157c915 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
+import net.i2p.servlet.RequestWrapper;
 import net.i2p.util.Log;
 
 /**
@@ -21,7 +22,10 @@ import net.i2p.util.Log;
 public abstract class FormHandler {
     protected RouterContext _context;
     protected Log _log;
+    /** Not for multipart/form-data, will be null */
     protected Map _settings;
+    /** Only for multipart/form-data. Warning, parameters are NOT XSS filtered */
+    protected RequestWrapper _requestWrapper;
     private String _nonce, _nonce1, _nonce2;
     protected String _action;
     protected String _method;
@@ -61,6 +65,15 @@ public abstract class FormHandler {
      */
     public void setSettings(Map settings) { _settings = new HashMap(settings); }
 
+    /**
+     *  Only set by formhandler.jsi for multipart/form-data
+     *
+     *  @since 0.9.19
+     */
+    public void setRequestWrapper(RequestWrapper rw) {
+        _requestWrapper = rw;
+    }
+
     /**
      *  Same as HelperBase
      *  @since 0.9.14.1
@@ -139,6 +152,17 @@ public abstract class FormHandler {
         _notices.add(msg);
     }
     
+    /**
+     * Add an error message to display
+     * Use if it includes a link or other formatting.
+     * Does not escape '<' and '>' before queueing
+     * @since 0.9.19
+     */
+    protected void addFormErrorNoEscape(String msg) {
+        if (msg == null) return;
+        _errors.add(msg);
+    }
+    
     /**
      * Display everything, wrap it in a div for consistent presentation
      *
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 7f395631d0593eb5f0795b3399393a043b9f9199..1569ebc9bb152c20c1099abc96ca3f280a5c7c43 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -49,7 +49,7 @@ public class HomeHelper extends HelperBase {
         "hiddengate.i2p" + S + _x("HiddenGate") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S +
         "Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S +
         _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S +
-        "jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S +
+        //"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 +
         _x("Free Web Hosting") + S + _x("Free eepsite hosting with PHP and MySQL") + S + "http://open4you.i2p/" + S + I + "open4you-logo.png" + S +
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
index 6593717a5edc4690bfd9a32324f9e4e136b92ea1..e270bf7ffc5dd458b17090e247d3eb7db801161f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
@@ -140,11 +140,13 @@ public class JobQueueHelper extends HelperBase {
     private void getJobStats(StringBuilder buf) { 
         buf.append("<table>\n" +
                    "<tr><th>").append(_("Job")).append("</th><th>").append(_("Runs")).append("</th>" +
+                   "<th>").append(_("Dropped")).append("</th>" +
                    "<th>").append(_("Time")).append("</th><th><i>").append(_("Avg")).append("</i></th><th><i>")
            .append(_("Max")).append("</i></th><th><i>").append(_("Min")).append("</i></th>" +
                    "<th>").append(_("Pending")).append("</th><th><i>").append(_("Avg")).append("</i></th><th><i>")
            .append(_("Max")).append("</i></th><th><i>").append(_("Min")).append("</i></th></tr>\n");
         long totRuns = 0;
+        long totDropped = 0;
         long totExecTime = 0;
         long avgExecTime = 0;
         long maxExecTime = -1;
@@ -161,6 +163,7 @@ public class JobQueueHelper extends HelperBase {
             buf.append("<tr>");
             buf.append("<td><b>").append(stats.getName()).append("</b></td>");
             buf.append("<td align=\"right\">").append(stats.getRuns()).append("</td>");
+            buf.append("<td align=\"right\">").append(stats.getDropped()).append("</td>");
             buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(stats.getTotalTime())).append("</td>");
             buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(stats.getAvgTime())).append("</td>");
             buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(stats.getMaxTime())).append("</td>");
@@ -171,6 +174,7 @@ public class JobQueueHelper extends HelperBase {
             buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(stats.getMinPendingTime())).append("</td>");
             buf.append("</tr>\n");
             totRuns += stats.getRuns();
+            totDropped += stats.getDropped();
             totExecTime += stats.getTotalTime();
             if (stats.getMaxTime() > maxExecTime)
                 maxExecTime = stats.getMaxTime();
@@ -193,6 +197,7 @@ public class JobQueueHelper extends HelperBase {
         buf.append("<tr class=\"tablefooter\">");
         buf.append("<td><b>").append(_("Summary")).append("</b></td>");
         buf.append("<td align=\"right\">").append(totRuns).append("</td>");
+        buf.append("<td align=\"right\">").append(totDropped).append("</td>");
         buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(totExecTime)).append("</td>");
         buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(avgExecTime)).append("</td>");
         buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(maxExecTime)).append("</td>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java
index 45a9c62808133db679225abba175519f738567d9..6055c83bcee619d5b7e88706e4be7eccd11f5b7e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java
@@ -53,7 +53,7 @@ public class NavHelper {
             String tip = _tooltips.get(name);
             if (tip != null)
                 buf.append("title=\"").append(tip).append("\" ");
-            buf.append('>').append(name).append("</a>");
+            buf.append('>').append(name.replace(" ", "&nbsp;")).append("</a>");
         }
         return buf.toString();
     }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index f6c44f9cb5ce5cf54713ab82d3020a6c09f0cea2..01e4659878bb51ce3e727dafc13805ff9692dc82 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -225,9 +225,10 @@ public class NetDbRenderer {
                 double log2 = biLog2(median);
                 buf.append("</b></p><p><b>Median distance (bits): ").append(fmt.format(log2));
                 // 2 for 4 floodfills... -1 for median
+                // this can be way off for unknown reasons
                 int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2));
                 buf.append("</b></p><p><b>Estimated total floodfills: ").append(total);
-                buf.append("</b></p><p><b>Estimated total leasesets: ").append(total * rapCount / 8);
+                buf.append("</b></p><p><b>Estimated total leasesets: ").append(total * rapCount / 4);
             } else {
                 buf.append("</b></p><p><b>Not floodfill or no data");
             }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
index 87780bcee48d31d9deff8a56d04d964566d26790..edcaf2f980d354d2ef007588bd30eef1bdc00a0f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
@@ -843,9 +843,10 @@ public class PluginStarter implements Runnable {
             }
         }
 
+        boolean isClientThreadRunning = isClientThreadRunning(pluginName, ctx);
         if (log.shouldLog(Log.DEBUG))
-            log.debug("plugin name = <" + pluginName + ">; threads running? " + isClientThreadRunning(pluginName) + "; webapp runing? " + isWarRunning + "; jobs running? " + isJobRunning);
-        return isClientThreadRunning(pluginName) || isWarRunning || isJobRunning;
+            log.debug("plugin name = <" + pluginName + ">; threads running? " + isClientThreadRunning + "; webapp runing? " + isWarRunning + "; jobs running? " + isJobRunning);
+        return isClientThreadRunning || isWarRunning || isJobRunning;
         //
         //if (log.shouldLog(Log.DEBUG))
         //    log.debug("plugin name = <" + pluginName + ">; threads running? " + isClientThreadRunning(pluginName) + "; webapp runing? " + WebAppStarter.isWebAppRunning(pluginName) + "; jobs running? " + isJobRunning);
@@ -858,24 +859,30 @@ public class PluginStarter implements Runnable {
      * @param pluginName
      * @return true if running
      */
-    private static boolean isClientThreadRunning(String pluginName) {
+    private static boolean isClientThreadRunning(String pluginName, RouterContext ctx) {
         ThreadGroup group = pluginThreadGroups.get(pluginName);
         if (group == null)
             return false;
         boolean rv = group.activeCount() > 0;
         
-      /**** debugging to figure out active threads
+        // Plugins start before the eepsite, and will create the static Timer thread
+        // in RolloverFileOutputStream, which never stops. Don't count it.
         if (rv) {
-            Thread[] activeThreads = new Thread[32];
+            Log log = ctx.logManager().getLog(PluginStarter.class);
+            Thread[] activeThreads = new Thread[128];
             int count = group.enumerate(activeThreads);
+            boolean notRollover = false;
             for (int i = 0; i < count; i++) {
                 if (activeThreads[i] != null) {
-                    System.err.println("Found " + activeThreads[i].getState() + " thread for " +
-                                       pluginName + ": " + activeThreads[i].getName());
+                    String name = activeThreads[i].getName();
+                    if (!"org.eclipse.jetty.util.RolloverFileOutputStream".equals(name))
+                        notRollover = true;
+                    if (log.shouldLog(Log.DEBUG))
+                        log.debug("Found " + activeThreads[i].getState() + " thread for " + pluginName + ": " + name);
                 }
             }
+            rv = notRollover;
         }
-      ****/
 
         return rv;
     }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedBundler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedBundler.java
new file mode 100644
index 0000000000000000000000000000000000000000..de94af7201ed1007c8c77b86a216724df9986aca
--- /dev/null
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedBundler.java
@@ -0,0 +1,168 @@
+package net.i2p.router.web;
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain
+ * with no warranty of any kind, either expressed or implied.
+ * It probably won't make your computer catch on fire, or eat
+ * your children, but it might.  Use at your own risk.
+ *
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Hash;
+import net.i2p.data.router.RouterAddress;
+import net.i2p.data.router.RouterInfo;
+import net.i2p.router.RouterContext;
+
+/**
+ *  Copy a random selection of 'count' router infos from configDir/netDb
+ *  to 'toDir'. Skip your own router info, and old, hidden, unreachable, and
+ *  introduced routers, and those from bad countries.
+ *
+ *  Much easier than the one in installer/tools since we have a running router.
+ *
+ *  Caller must delete file when done.
+ *
+ *  @since 0.9.19 modified from BundleRouterInfos in installer/tools
+ *
+ */
+class ReseedBundler {
+
+    private final RouterContext _context;
+    private final static String ROUTERINFO_PREFIX = "routerInfo-";
+    private final static String ROUTERINFO_SUFFIX = ".dat";
+    private static final int MINIMUM = 50;
+
+    public ReseedBundler(RouterContext ctx) {
+        _context = ctx;
+    }
+
+
+    /**
+     *  Create a zip file with
+     *  a random selection of 'count' router infos from configDir/netDb
+     *  to 'toDir'. Skip your own router info, and old, hidden, unreachable, and
+     *  introduced routers, and those from bad countries.
+     *
+     *  The file will be in the temp directory. Caller must move or delete.
+     */
+    public File createZip(int count) throws IOException {
+        Hash me = _context.routerHash();
+        int routerCount = 0;
+        int copied = 0;
+        long tooOld = System.currentTimeMillis() - 7*24*60*60*1000L;
+        List<RouterInfo> infos = new ArrayList<RouterInfo>(_context.netDb().getRouters());
+        // IP to router hash
+        Map<String, Hash> ipMap = new HashMap<String, Hash>(count);
+        List<RouterInfo> toWrite = new ArrayList<RouterInfo>(count);
+        Collections.shuffle(infos);
+        for (RouterInfo ri : infos) {
+            if (copied >= count)
+                break;
+            Hash key = ri.getIdentity().calculateHash();
+            if (key.equals(me)) {
+                continue;
+            }
+            if (ri.getPublished() < tooOld)
+                continue;
+            if (ri.getCapabilities().contains("U"))
+                continue;
+            if (ri.getCapabilities().contains("K"))
+                continue;
+            Collection<RouterAddress> addrs = ri.getAddresses();
+            if (addrs.isEmpty())
+                continue;
+            
+            String name = getRouterInfoName(key);
+            boolean hasIntro = false;
+            boolean hasIPv4 = false;
+            boolean dupIP = false;
+            for (RouterAddress addr : addrs) {
+                if ("SSU".equals(addr.getTransportStyle()) && addr.getOption("ihost0") != null) {
+                    hasIntro = true;
+                    break;
+                }
+                String host = addr.getHost();
+                if (host != null && host.contains(".")) {
+                    hasIPv4 = true;
+                    Hash old = ipMap.put(host, key);
+                    if (old != null && !old.equals(key)) {
+                        dupIP = true;
+                        break;
+                    }
+                }
+            }
+            if (dupIP)
+                continue;
+            if (hasIntro)
+                continue;
+            if (!hasIPv4)
+                continue;
+            if (_context.commSystem().isInBadCountry(ri))
+                continue;
+
+            toWrite.add(ri);
+            copied++;
+        }
+
+        if (toWrite.isEmpty())
+            throw new IOException("No router infos to include. Reseed yourself first.");
+        if (toWrite.size() < Math.min(count, MINIMUM))
+            throw new IOException("Not enough router infos to include, wanted " + count +
+                                  " but only found " + toWrite.size() + ". Please try again later.");
+
+        File rv = new File(_context.getTempDir(), "genreseed-" + _context.random().nextInt() + ".zip");
+        ZipOutputStream zip = null;
+        try {
+            zip = new ZipOutputStream(new FileOutputStream(rv) );
+            for (RouterInfo ri : toWrite) {
+                String name = getRouterInfoName(ri.getIdentity().calculateHash());
+                ZipEntry entry = new ZipEntry(name);
+                entry.setTime(ri.getPublished());
+                zip.putNextEntry(entry);
+                ri.writeBytes(zip);
+                zip.closeEntry();
+            }
+        } catch (DataFormatException dfe) {
+            rv.delete();
+            IOException ioe = new IOException(dfe.getMessage());
+            ioe.initCause(dfe);
+            throw ioe;
+        } catch (IOException ioe) {
+            rv.delete();
+            throw ioe;
+        } finally {
+            if ( zip != null) {
+                try {
+                    zip.finish();
+                    zip.close();
+                } catch (IOException ioe) {
+                    rv.delete();
+                    throw ioe;
+                }
+            }
+        }
+        return rv;
+    }
+
+    /**
+     *  Copied/modded from PersistentDataStore
+     */
+    private static String getRouterInfoName(Hash hash) {
+        String b64 = hash.toBase64();
+        return ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX;
+    }
+}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedGenerator.java
new file mode 100644
index 0000000000000000000000000000000000000000..377f6276fb7dcab19baefda333aeae9aa5eb6584
--- /dev/null
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedGenerator.java
@@ -0,0 +1,16 @@
+package net.i2p.router.web;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ *  Handler to create a i2preseed.zip file
+ *  @since 0.9.19
+ */
+public class ReseedGenerator extends HelperBase {
+
+    public File createZip() throws IOException {
+        ReseedBundler rb = new ReseedBundler(_context);
+        return rb.createZip(100);
+    }
+}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
index 9fec81875d533806d892dc362395348eae8fbc87..80fca929858a264617457f19df02abed1005bcdc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
@@ -219,10 +219,11 @@ public class StatsGenerator {
                 buf.append("\">").append(_("Graph Data")).append("</a> - ");
                 buf.append(" <a href=\"graph?stat=").append(name)
                    .append('.').append(periods[i]);
-                buf.append("&amp;showEvents=true\">").append(_("Graph Event Count")).append("</a> - ");
-                buf.append("<a href=\"viewstat.jsp?stat=").append(name);
-                buf.append("&amp;period=").append(periods[i]);
-                buf.append("&amp;format=xml\">").append(_("Export Data as XML")).append("</a>");
+                buf.append("&amp;showEvents=true\">").append(_("Graph Event Count")).append("</a>");
+                // This can really blow up your browser if you click on it
+                //buf.append(" - <a href=\"viewstat.jsp?stat=").append(name);
+                //buf.append("&amp;period=").append(periods[i]);
+                //buf.append("&amp;format=xml\">").append(_("Export Data as XML")).append("</a>");
             }
             buf.append("</li>\n");
         }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index f10d6858ff921d369674cf5625119a892c5c452b..f3edb40729f4854adca0f9303662af02c1434b4e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -17,36 +17,13 @@ import net.i2p.router.RouterContext;
  *
  */
 public class SummaryBarRenderer {
-    // Commented out because broken. Replaced by if-elseif blob below.
-    /*static final Map<String, java.lang.reflect.Method> ALL_SECTIONS;
-    static {
-        Map<String, java.lang.reflect.Method> aMap = new HashMap<String, java.lang.reflect.Method>();;
-        try {
-            aMap.put("HelpAndFAQ", SummaryBarRenderer.class.getMethod("renderHelpAndFAQHTML"));
-            aMap.put("I2PServices", SummaryBarRenderer.class.getMethod("renderI2PServicesHTML"));
-            aMap.put("I2PInternals", SummaryBarRenderer.class.getMethod("renderI2PInternalsHTML"));
-            aMap.put("General", SummaryBarRenderer.class.getMethod("renderGeneralHTML"));
-            aMap.put("ShortGeneral", SummaryBarRenderer.class.getMethod("renderShortGeneralHTML"));
-            aMap.put("NetworkReachability", SummaryBarRenderer.class.getMethod("renderNetworkReachabilityHTML"));
-            aMap.put("UpdateStatus", SummaryBarRenderer.class.getMethod("renderUpdateStatusHTML"));
-            aMap.put("RestartStatus", SummaryBarRenderer.class.getMethod("renderRestartStatusHTMLHTML"));
-            aMap.put("Peers", SummaryBarRenderer.class.getMethod("renderPeersHTML"));
-            aMap.put("FirewallAndReseedStatus", SummaryBarRenderer.class.getMethod("renderFirewallAndReseedStatusHTML"));
-            aMap.put("Bandwidth", SummaryBarRenderer.class.getMethod("renderBandwidthHTML"));
-            aMap.put("Tunnels", SummaryBarRenderer.class.getMethod("renderTunnelsHTML"));
-            aMap.put("Congestion", SummaryBarRenderer.class.getMethod("renderCongestionHTML"));
-            aMap.put("TunnelStatus", SummaryBarRenderer.class.getMethod("renderTunnelStatusHTML"));
-            aMap.put("Destinations", SummaryBarRenderer.class.getMethod("renderDestinationsHTML"));
-            aMap.put("NewsHeadings", SummaryBarRenderer.class.getMethod("renderNewsHeadingsHTML"));
-        } catch (java.lang.NoSuchMethodException e) {
-        }
-        ALL_SECTIONS = Collections.unmodifiableMap(aMap);
-    }*/
+
     static final String ALL_SECTIONS[] =
         {"HelpAndFAQ", "I2PServices", "I2PInternals", "General", "ShortGeneral", "NetworkReachability",
         "UpdateStatus", "RestartStatus", "Peers", "FirewallAndReseedStatus", "Bandwidth", "Tunnels",
         "Congestion", "TunnelStatus", "Destinations", "NewsHeadings" };
     static final Map<String, String> SECTION_NAMES;
+
     static {
         Map<String, String> aMap = new HashMap<String, String>();;
         aMap.put("HelpAndFAQ", "Help &amp; FAQ");
@@ -63,7 +40,7 @@ public class SummaryBarRenderer {
         aMap.put("Tunnels", "Tunnels");
         aMap.put("Congestion", "Congestion");
         aMap.put("TunnelStatus", "Tunnel Status");
-        aMap.put("Destinations", "Local Destinations");
+        aMap.put("Destinations", "Local Tunnels");
         aMap.put("NewsHeadings", "News &amp; Updates");
         SECTION_NAMES = Collections.unmodifiableMap(aMap);
     }
@@ -160,19 +137,19 @@ public class SummaryBarRenderer {
                    "<a href=\"/susimail/susimail\" target=\"_blank\" title=\"")
            .append(_("Anonymous webmail client"))
            .append("\">")
-           .append(_("Email"))
+           .append(nbsp(_("Email")))
            .append("</a>\n" +
 
                    "<a href=\"/i2psnark/\" target=\"_blank\" title=\"")
            .append(_("Built-in anonymous BitTorrent Client"))
            .append("\">")
-           .append(_("Torrents"))
+           .append(nbsp(_("Torrents")))
            .append("</a>\n" +
 
                    "<a href=\"http://127.0.0.1:7658/\" target=\"_blank\" title=\"")
            .append(_("Local web server"))
            .append("\">")
-           .append(_("Website"))
+           .append(nbsp(_("Website")))
            .append("</a>\n")
 
            .append(NavHelper.getClientAppLinks(_context))
@@ -194,31 +171,31 @@ public class SummaryBarRenderer {
                    "<a href=\"/tunnels\" target=\"_top\" title=\"")
            .append(_("View existing tunnels and tunnel build status"))
            .append("\">")
-           .append(_("Tunnels"))
+           .append(nbsp(_("Tunnels")))
            .append("</a>\n" +
 
                    "<a href=\"/peers\" target=\"_top\" title=\"")
            .append(_("Show all current peer connections"))
            .append("\">")
-           .append(_("Peers"))
+           .append(nbsp(_("Peers")))
            .append("</a>\n" +
 
                    "<a href=\"/profiles\" target=\"_top\" title=\"")
            .append(_("Show recent peer performance profiles"))
            .append("\">")
-           .append(_("Profiles"))
+           .append(nbsp(_("Profiles")))
            .append("</a>\n" +
 
                    "<a href=\"/netdb\" target=\"_top\" title=\"")
            .append(_("Show list of all known I2P routers"))
            .append("\">")
-           .append(_("NetDB"))
+           .append(nbsp(_("NetDB")))
            .append("</a>\n" +
 
                    "<a href=\"/logs\" target=\"_top\" title=\"")
            .append(_("Health Report"))
            .append("\">")
-           .append(_("Logs"))
+           .append(nbsp(_("Logs")))
            .append("</a>\n");
 
        //          "<a href=\"/jobs.jsp\" target=\"_top\" title=\"")
@@ -231,26 +208,26 @@ public class SummaryBarRenderer {
             buf.append("<a href=\"/graphs\" target=\"_top\" title=\"")
                .append(_("Graph router performance"))
                .append("\">")
-               .append(_("Graphs"))
+               .append(nbsp(_("Graphs")))
                .append("</a>\n");
         }
 
         buf.append("<a href=\"/stats\" target=\"_top\" title=\"")
            .append(_("Textual router performance statistics"))
            .append("\">")
-           .append(_("Stats"))
+           .append(nbsp(_("Stats")))
            .append("</a>\n" +
 
-                    "<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
-           .append(_("Local Destinations"))
+                   "<a href=\"/dns\" target=\"_top\" title=\"")
+           .append(_("Manage your I2P hosts file here (I2P domain name resolution)"))
            .append("\">")
-           .append(_("I2PTunnel"))
+           .append(nbsp(_("Addressbook")))
            .append("</a>\n" +
 
-                   "<a href=\"/dns\" target=\"_top\" title=\"")
-           .append(_("Manage your I2P hosts file here (I2P domain name resolution)"))
+                    "<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
+           .append(_("Local Tunnels"))
            .append("\">")
-           .append(_("Addressbook"))
+           .append(nbsp(_("Hidden Services Manager")))
            .append("</a>\n");
 
         if (_context.getBooleanProperty(HelperBase.PROP_ADVANCED))
@@ -630,6 +607,7 @@ public class SummaryBarRenderer {
             if (newsContent != "") {
                 buf.append("<ul>\n");
                 // Parse news content for headings.
+                boolean foundEntry = false;
                 int start = newsContent.indexOf("<h3>");
                 while (start >= 0) {
                     // Add offset to start:
@@ -645,16 +623,19 @@ public class SummaryBarRenderer {
                     int end = newsContent.indexOf("</h3>");
                     if (end >= 0) {
                         String heading = newsContent.substring(0, end);
-                        buf.append("<li>")
+                        buf.append("<li><a href=\"/?news=1&amp;consoleNonce=")
+                           .append(consoleNonce)
+                           .append("\">")
                            .append(heading)
-                           .append("</li>\n");
+                           .append("</a></li>\n");
+                        foundEntry = true;
                     }
                     start = newsContent.indexOf("<h3>");
                 }
                 buf.append("</ul>\n");
                 // Set up string containing <a> to show news.
                 String requestURI = _helper.getRequestURI();
-                if (requestURI.contains("/home")) {
+                if (requestURI.contains("/home") && !foundEntry) {
                     buf.append("<a href=\"/?news=1&amp;consoleNonce=")
                        .append(consoleNonce)
                        .append("\">")
@@ -676,4 +657,14 @@ public class SummaryBarRenderer {
     private String _(String s) {
         return Messages.getString(s, _context);
     }
+
+    /**
+     *  Where the translation is to two words or more,
+     *  prevent splitting across lines
+     *
+     *  @since 0.9.18
+     */
+    private static String nbsp(String s) {
+        return s.replace(" ", "&nbsp;");
+    }
 }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 953fdb34f74cd8f7a7e848b05e54292c0db6924f..e97dd34806b64349fffe0f5945ddbabdf5de0534 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -416,7 +416,10 @@ public class SummaryHelper extends HelperBase {
         List<Destination> clients = new ArrayList<Destination>(_context.clientManager().listClients());
         
         StringBuilder buf = new StringBuilder(512);
-        buf.append("<h3><a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr class=\"b\"><div class=\"tunnels\">");
+        buf.append("<h3><a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
+           .append(_("Add/remove/edit &amp; control your client and server tunnels"))
+           .append("\">").append(_("Local Tunnels"))
+           .append("</a></h3><hr class=\"b\"><div class=\"tunnels\">");
         if (!clients.isEmpty()) {
             Collections.sort(clients, new AlphaComparator());
             buf.append("<table>");
@@ -427,7 +430,7 @@ public class SummaryHelper extends HelperBase {
                 
                 buf.append("<tr><td align=\"right\"><img src=\"/themes/console/images/");
                 if (_context.clientManager().shouldPublishLeaseSet(h))
-                    buf.append("server.png\" alt=\"Server\" title=\"").append(_("Server")).append("\">");
+                    buf.append("server.png\" alt=\"Server\" title=\"").append(_("Hidden Service")).append("\">");
                 else
                     buf.append("client.png\" alt=\"Client\" title=\"").append(_("Client")).append("\">");
                 buf.append("</td><td align=\"left\"><b><a href=\"tunnels#").append(h.toBase64().substring(0,4));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 49aca0898609691d6c1972e5369815aeb2e4d8f3..18250d3a2dbac5b38fc2e1d4119a39a798d7786e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -35,7 +35,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
 public class WebAppStarter {
 
     private static final Map<String, Long> warModTimes = new ConcurrentHashMap<String, Long>();
-    static final Map INIT_PARAMS = new HashMap(4);
+    static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(4);
     //static private Log _log;
 
     static {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/package.html b/apps/routerconsole/java/src/net/i2p/router/web/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..1926aa39441a2ec476b76941f0119c8bd16dc685
--- /dev/null
+++ b/apps/routerconsole/java/src/net/i2p/router/web/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+The router console user interface, implemented in routerconsole.jar, with these classes
+supporting the webapp in routerconsole.war.
+Entry point is RouterConsoleRunner, started from clients.config.
+</p>
+</body>
+</html>
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index a6d049ed7fc37f1a249f79d13a18a704b50ec80d..65f67daf506500b2516be7c204be130bfeefc8a6 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -56,8 +56,6 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 <%=intl._("Enabled with SSL required")%><br>
 <input type="radio" class="optbox" name="mode" value="0" <%=clientshelper.i2cpModeChecked(0) %> >
 <%=intl._("Disabled - Clients outside this Java process may not connect")%><br>
-<%=intl._("I2CP Port")%>:
-<input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="clientshelper" property="port" />" ><br>
 <%=intl._("I2CP Interface")%>:
 <select name="interface">
 <%
@@ -74,6 +72,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
        }
 %>
 </select><br>
+<%=intl._("I2CP Port")%>:
+<input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="clientshelper" property="port" />" ><br>
 <b><%=intl._("Authorization")%></b><br>
 <input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> >
 <%=intl._("Require username and password")%><br>
@@ -115,7 +115,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 <form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <jsp:getProperty name="clientshelper" property="form3" />
-<hr><div class="formaction">
+<div class="formaction">
  <input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
  <input type="submit" name="action" class="accept" value="<%=intl._("Save Plugin Configuration")%>" />
 </div></form></div>
@@ -123,43 +123,44 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
        } // pluginUpdateEnabled
        if (clientshelper.isPluginInstallEnabled()) {
 %>
-<h3><a name="plugin"></a><%=intl._("Plugin Installation")%></h3><p>
+<h3><a name="plugin"></a><%=intl._("Plugin Installation from URL")%></h3><p>
  <%=intl._("Look for available plugins on {0}.", "<a href=\"http://plugins.i2p\">plugins.i2p</a>")%>
  <%=intl._("To install a plugin, enter the download URL:")%>
  </p>
-<%
-       } // pluginInstallEnabled
-       if (clientshelper.isPluginInstallEnabled() || clientshelper.isPluginUpdateEnabled()) {
-%>
 <div class="wideload">
 <form action="configclients" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
-<%
-           if (clientshelper.isPluginInstallEnabled()) {
-%>
 <p>
  <input type="text" size="60" name="pluginURL" >
  </p><hr><div class="formaction">
  <input type="submit" name="action" class="default" value="<%=intl._("Install Plugin")%>" />
  <input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
  <input type="submit" name="action" class="download" value="<%=intl._("Install Plugin")%>" />
-</div>
-<%
-           } // pluginInstallEnabled
-%>
-</div>
+</div></form></div>
+
+
+<div class="wideload">
+<h3><a name="plugin"></a><%=intl._("Plugin Installation from File")%></h3>
+<form action="configclients" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
+<p><%=intl._("Install plugin from file.")%>
+<br><%=intl._("Select xpi2p or su3 file")%> :
+<input type="file" name="pluginFile" >
+</p><hr><div class="formaction">
+<input type="submit" name="action" class="download" value="<%=intl._("Install Plugin from File")%>" />
+</div></form></div>
 <%
-           if (clientshelper.isPluginUpdateEnabled()) {
+       } // pluginInstallEnabled
+       if (clientshelper.isPluginUpdateEnabled()) {
 %>
-<hr><div class="formaction">
+<h3><a name="plugin"></a><%=intl._("Update All Plugins")%></h3>
+<div class="formaction">
+<form action="configclients" method="POST">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="submit" name="action" class="reload" value="<%=intl._("Update All Installed Plugins")%>" />
-</div>
-<%
-           } // pluginUpdateEnabled
-%>
 </form></div>
 <%
-       } // pluginInstallEnabled || pluginUpdateEnabled
+       } // pluginUpdateEnabled
    } // showPlugins
 %>
 </div></div></body></html>
diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp
index 6be2d9d2e9fdf9988df568c5158a3d5c91c43954..bf1f59d4560a9577916ffdcb1d798c220964ccbb 100644
--- a/apps/routerconsole/jsp/confighome.jsp
+++ b/apps/routerconsole/jsp/confighome.jsp
@@ -55,7 +55,7 @@ input.default {
    }  // shouldShowSearch()
 %>
 
-<h3><%=intl._("Recommended Eepsites")%></h3>
+<h3><%=intl._("Hidden Services of Interest")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="hidden" name="group" value="1">
@@ -69,7 +69,7 @@ input.default {
  </div>
 </form>
 
-<h3><%=intl._("Local Services")%></h3>
+<h3><%=intl._("Applications and Configuration")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="hidden" name="group" value="2">
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index 21cfb1750c99d7e2664f1b88dd51c784aecfaec9..9e3be5cc768fec23fb91425fe120f9a1e599158b 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -27,7 +27,7 @@
  <div class="wideload">
       <table border="0" cellspacing="5">
         <tr><td class="mediumtags" align="right"><b><%=intl._("Log file")%>:</b></td>
-          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" >
+          <td><input type="text" name="logfilename" size="40" disabled="disabled" title="<%=intl._("Edit {0} to change", "logger.config")%>" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" >
             <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td>
         </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td>
           <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" >
diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp
index da667ace1dbf8bf800426822056b1970b594c7fb..2bb42d52297da1a543e8155695c3f03eec376b8e 100644
--- a/apps/routerconsole/jsp/configreseed.jsp
+++ b/apps/routerconsole/jsp/configreseed.jsp
@@ -19,14 +19,53 @@
 
 <jsp:useBean class="net.i2p.router.web.ConfigReseedHandler" id="formhandler" scope="request" />
 <%@include file="formhandler.jsi" %>
+
+<p><%=intl._("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%>
+<%=intl._("If reseeding has failed, you should first check your network connection.")%>
+<%=intl._("See {0} for instructions on reseeding manually.", "<a href=\"https://geti2p.net/faq#manual_reseed\">" + intl._("the FAQ") + "</a>")%>
+</p>
+
 <div class="configure"><form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
+<h3><%=intl._("Manual Reseed from URL")%></h3>
+<p><%=intl._("Enter zip or su3 URL")%> :
+<input name="url" type="text" size="60" value="" />
+<br><%=intl._("The su3 format is preferred, as it will be verifed as signed by a trusted source.")%>
+<%=intl._("The zip format is unsigned; use a zip file only from a source that you trust.")%>
+</p>
+<div class="formaction">
+<input type="submit" name="action" class="download" value="<%=intl._("Reseed from URL")%>" />
+</div></form></div>
+
+<div class="configure">
+<form action="" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
+<h3><%=intl._("Manual Reseed from File")%></h3>
+<p><%=intl._("Select zip or su3 file")%> :
+<input name="file" type="file" value="" />
+<br><%=intl._("The su3 format is preferred, as it will be verifed as signed by a trusted source.")%>
+<%=intl._("The zip format is unsigned; use a zip file only from a source that you trust.")%>
+</p>
+<div class="formaction">
+<input type="submit" name="action" class="download" value="<%=intl._("Reseed from file")%>" />
+</div></form></div>
+
+<div class="configure">
+<form action="/createreseed" method="GET">
+<h3><%=intl._("Create Reseed File")%></h3>
+<p><%=intl._("Create a new reseed zip file you may share for others to reseed manually.")%>
+<%=intl._("This file will never contain your own router's identity or IP.")%>
+</p>
+<div class="formaction">
+<input type="submit" name="action" class="go" value="<%=intl._("Create reseed file")%>" />
+</div></form></div>
+
+<div class="configure">
+<form action="" method="POST">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
 <h3><%=intl._("Reseeding Configuration")%></h3>
-<p><%=intl._("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%>
-<%=intl._("If reseeding has failed, you should first check your network connection.")%>
 <p><b><%=intl._("The default settings will work for most people.")%></b>
-<%=intl._("Change these only if HTTP is blocked by a restrictive firewall, reseed has failed, and you have access to an HTTP proxy.")%>
-<%=intl._("See {0} for instructions on reseeding manually.", "<a href=\"https://geti2p.net/faq#manual_reseed\">" + intl._("the FAQ") + "</a>")%>
+<%=intl._("Change these only if HTTPS is blocked by a restrictive firewall and reseed has failed.")%>
 </p>
 <div class="wideload">
 <table border="0" cellspacing="5">
@@ -71,7 +110,7 @@
 -->
 
 </table></div>
-<hr><div class="formaction">
+<div class="formaction">
 <input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
 <input type="submit" name="action" class="download" value="<%=intl._("Save changes and reseed now")%>" />
 <input type="submit" name="action" class="accept" value="<%=intl._("Save changes")%>" />
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index c6711cc43c54078182cd4372b5cb12f932c09577..f12c9b95cb055a6f5f2968eb800ac18c12eb1121 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -25,7 +25,9 @@
   <hr><div class="formaction">
  <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown gracefully")%>" >
  <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown immediately")%>" >
- <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
+ <% if (formhandler.shouldShowCancelGraceful()) { %>
+     <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
+ <% } %>
  </div>
  <% if (System.getProperty("wrapper.version") != null) { %>
  <p><%=intl._("If you want the router to restart itself after shutting down, you can choose one of the following.")%> 
diff --git a/apps/routerconsole/jsp/createreseed.jsp b/apps/routerconsole/jsp/createreseed.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..650a237f0e9089491d2c62046c7309ecb2cd7d89
--- /dev/null
+++ b/apps/routerconsole/jsp/createreseed.jsp
@@ -0,0 +1,45 @@
+<jsp:useBean class="net.i2p.router.web.ReseedGenerator" id="gen" scope="request" /><jsp:setProperty name="gen" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /><%
+/*
+ * USE CAUTION WHEN EDITING
+ * Trailing whitespace OR NEWLINE on the last line will cause
+ * IllegalStateExceptions !!!
+ *
+ * Do not tag this file for translation.
+ */
+try {
+    java.io.InputStream in = null;
+    java.io.File zip = null;
+    try {
+        zip = gen.createZip();
+        response.setContentLength((int) zip.length());
+        long lastmod = zip.lastModified();
+        if (lastmod > 0)
+            response.setDateHeader("Last-Modified", lastmod);
+        response.setDateHeader("Expires", 0);
+        response.addHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
+        response.addHeader("Pragma", "no-cache");
+        response.setContentType("application/zip; name=\"i2preseed.zip\"");
+        response.addHeader("Content-Disposition", "attachment; filename=\"i2preseed.zip\"");
+        byte buf[] = new byte[16*1024];
+        in = new java.io.FileInputStream(zip);
+        int read = 0;
+        java.io.OutputStream cout = response.getOutputStream();
+        while ( (read = in.read(buf)) != -1) { 
+            cout.write(buf, 0, read);
+        }
+    } finally {
+        if (in != null) 
+            try { in.close(); } catch (java.io.IOException ioe) {}
+        if (zip != null)
+            zip.delete();
+    }
+} catch (java.io.IOException ioe) {
+    // prevent 'Committed' IllegalStateException from Jetty
+    if (!response.isCommitted()) {
+        response.sendError(403, ioe.toString());
+    }  else {
+        // Jetty doesn't log this
+        throw ioe;
+    }
+}
+%>
\ No newline at end of file
diff --git a/apps/routerconsole/jsp/formhandler.jsi b/apps/routerconsole/jsp/formhandler.jsi
index e00bf6f4366066287a1dea0506b1cf0e8f7d043c..b6091e80f8a23f311914ebbe2fb36e929c65020b 100644
--- a/apps/routerconsole/jsp/formhandler.jsi
+++ b/apps/routerconsole/jsp/formhandler.jsi
@@ -29,12 +29,31 @@
         // nonce1 will be null, removed in setAttibute below
     }
 
-    // Put all the params in the map, some handlers use this instead of individual setters
-    // We also call all of the setters below.
-    formhandler.setSettings(request.getParameterMap());
 
+    String contentType = request.getContentType();
+    if (contentType != null && contentType.toLowerCase(java.util.Locale.US).startsWith( "multipart/form-data")) {
+        // For multipart/form-data, we must decode things enough to get the action and nonce
+        // so FormHandler will validate.
+        // The handler must get everything else through the wrapper. No other properties will be set.
+        // All parameters other than nonce and action must be retrieved through the wrapper.
+        // Warning, parameters are NOT XSS filtered.
+        net.i2p.servlet.RequestWrapper requestWrapper = new net.i2p.servlet.RequestWrapper(request);
+        String action = requestWrapper.getParameter("action");
+        if (action != null)
+            formhandler.setAction(action);
+        String nonce = requestWrapper.getParameter("nonce");
+        if (nonce != null)
+            formhandler.setNonce(nonce);
+        formhandler.setRequestWrapper(requestWrapper);
+    } else {
+        // Put all the params in the map, some handlers use this instead of individual setters
+        // We also call all of the setters below.
+        formhandler.setSettings(request.getParameterMap());
 %>
 <jsp:setProperty name="formhandler" property="*" />
+<%
+    }
+%>
 <jsp:getProperty name="formhandler" property="allMessages" />
 <%
 
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index cbad4cb6438a4f4608f21c64118951ff419594e0..4fbeb27494e69f6fc5d96c9bf2da7f0129223b68 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -111,11 +111,11 @@
    }  // shouldShowSearch()
 %>
   <div class="ag2">
-    <h4 class="app"><%=intl._("Eepsites of Interest")%></h4>
+    <h4 class="app"><%=intl._("Hidden Services of Interest")%></h4>
     <jsp:getProperty name="homehelper" property="favorites" /><br>
   </div>
   <div class="ag2">
-    <h4 class="app2"><%=intl._("Local Services")%></h4>
+    <h4 class="app2"><%=intl._("Applications and Configuration")%></h4>
     <jsp:getProperty name="homehelper" property="services" /><br>
     <div class="clearer">&nbsp;</div>
   </div>
diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
index c5b20d676abf676f4ec3ca2742a9b16029e04254..45ff895a6cfc87fe3e779e37b89a2dacf6b835c4 100644
--- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp
+++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
@@ -15,7 +15,7 @@
 
 <html><head>
 <%@include file="css.jsi" %>
-<%=intl.title("i2p tunnel manager")%>
+<%=intl.title("Hidden Services Manager")%>
 <script src="/js/ajax.js" type="text/javascript"></script>
 <script src="/js/iframed.js" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
@@ -52,7 +52,7 @@
 
 <%@include file="summary.jsi" %>
 
-<h1><%=intl._("I2P Tunnel Manager")%> <span class="newtab"><a href="/i2ptunnel/" target="_blank" title="<%=intl._("Open in new tab")%>"><img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/newtab.png" /></a></span></h1>
+<h1><%=intl._("Hidden Services Manager")%> <span class="newtab"><a href="/i2ptunnel/" target="_blank" title="<%=intl._("Open in new tab")%>"><img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/newtab.png" /></a></span></h1>
 <div class="main" id="main">
 <iframe src="/i2ptunnel/" width="100%" height="100%" frameborder="0" border="0" name="i2ptunnelframe" id="i2ptunnelframe" onload="setupFrame()" allowtransparency="true">
 <%=intl._("Your browser does not support iFrames.")%>
diff --git a/apps/routerconsole/locale-countries/messages_et.po b/apps/routerconsole/locale-countries/messages_et.po
index 3936bb02c86dd24fafb86bc82eb8fb8b37ab97a2..af69370722cbbcb4cfb1075695a1f1198ba487f1 100644
--- a/apps/routerconsole/locale-countries/messages_et.po
+++ b/apps/routerconsole/locale-countries/messages_et.po
@@ -2,21 +2,23 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the routerconsole package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# foo <foo@bar>, 2009
+# Marie Nepeta <hellomynameiscatbug@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P routerconsole\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-14 13:34+0000\n"
-"PO-Revision-Date: 2011-12-29 00:00+0000\n"
-"Last-Translator: ajutine <ajutine@nowhere.none>\n"
-"Language-Team: ajutine <ajutine@nowhere.none>\n"
-"Language: et\n"
+"POT-Creation-Date: 2013-10-14 13:33+0000\n"
+"PO-Revision-Date: 2014-11-25 12:39+0000\n"
+"Last-Translator: Marie Nepeta <hellomynameiscatbug@gmail.com>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/I2P/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Anonymous Proxy"
 msgstr "Anonüümne proxy"
@@ -181,7 +183,7 @@ msgid "Cape Verde"
 msgstr "Cape Verde"
 
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 msgid "Christmas Island"
 msgstr "Jõulusaar"
@@ -564,9 +566,8 @@ msgstr "Poola"
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre ja Miquelon"
 
-#, fuzzy
 msgid "Pitcairn Islands"
-msgstr "Neitsisaared"
+msgstr "Pitcairni saared"
 
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
@@ -659,7 +660,7 @@ msgid "Swaziland"
 msgstr "Swaasimaa"
 
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "Turksi ja Caicose saared"
 
 msgid "Chad"
 msgstr "Tšaad"
@@ -713,7 +714,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Ühendriikide hajasaared"
 
 msgid "United States"
 msgstr "Ameerika Ühendriigid"
@@ -762,4 +763,3 @@ msgstr "Zambia"
 
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
-
diff --git a/apps/routerconsole/locale-countries/messages_mg.po b/apps/routerconsole/locale-countries/messages_mg.po
new file mode 100644
index 0000000000000000000000000000000000000000..5f2ee846920ed17b1ec3edc83319d019db3b984a
--- /dev/null
+++ b/apps/routerconsole/locale-countries/messages_mg.po
@@ -0,0 +1,764 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# topdog101 <topdog101@free.fr>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-14 13:33+0000\n"
+"PO-Revision-Date: 2014-02-20 15:52+0000\n"
+"Last-Translator: topdog101 <topdog101@free.fr>\n"
+"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/mg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Anonymous Proxy"
+msgstr "Proxy tsy fantatra anarana"
+
+msgid "Satellite Provider"
+msgstr "Mpizara avy amin'ny alalan'ny zana-bolana"
+
+msgid "Andorra"
+msgstr "Andorra"
+
+msgid "United Arab Emirates"
+msgstr "Firenena Arabo Mitambatra"
+
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgid "Antigua and Barbuda"
+msgstr "Antigues sy Barbados"
+
+msgid "Anguilla"
+msgstr "Anguilla"
+
+msgid "Albania"
+msgstr "Albania"
+
+msgid "Armenia"
+msgstr "Armenia"
+
+msgid "Netherlands Antilles"
+msgstr "Antilles Holandiana"
+
+msgid "Angola"
+msgstr "Angola"
+
+msgid "Antarctica"
+msgstr "Faitra Atsimo indrindra"
+
+msgid "Argentina"
+msgstr "Argentina"
+
+msgid "American Samoa"
+msgstr "Samoa Amerikana"
+
+msgid "Austria"
+msgstr "Aotrisy"
+
+msgid "Australia"
+msgstr "Aostralia"
+
+msgid "Aruba"
+msgstr "Aruba"
+
+msgid "Åland Islands"
+msgstr "Nosy Aland"
+
+msgid "Azerbaijan"
+msgstr "Azerbajian"
+
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia sy Herzegovina"
+
+msgid "Barbados"
+msgstr "Barbados"
+
+msgid "Bangladesh"
+msgstr "Bengladesy"
+
+msgid "Belgium"
+msgstr "Belzika"
+
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgid "Bulgaria"
+msgstr "Firenena Bulgariana"
+
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgid "Burundi"
+msgstr "Burundi"
+
+msgid "Benin"
+msgstr "Benin"
+
+msgid "Bermuda"
+msgstr "Bermudes"
+
+msgid "Brunei Darussalam"
+msgstr "Brunei Daresalam"
+
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgid "Brazil"
+msgstr "Firenena Braziliana"
+
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgid "Bouvet Island"
+msgstr "Nosy Bouvet"
+
+msgid "Botswana"
+msgstr "Botswana"
+
+msgid "Belarus"
+msgstr "Bielarosia"
+
+msgid "Belize"
+msgstr "Belize"
+
+msgid "Canada"
+msgstr "Firenena kanadiana"
+
+msgid "Cocos (Keeling) Islands"
+msgstr "Nosy Cocos(Keeling)"
+
+msgid "The Democratic Republic of the Congo"
+msgstr "Repoblika Demokratikan'i Congo"
+
+msgid "Central African Republic"
+msgstr "Repoblikan'i Afrika Afovoany"
+
+msgid "Congo"
+msgstr "Congo"
+
+msgid "Switzerland"
+msgstr "Soisy"
+
+msgid "Cote D'Ivoire"
+msgstr "Cote D'Ivoire"
+
+msgid "Cook Islands"
+msgstr "Nosy Cook"
+
+msgid "Chile"
+msgstr "Silia"
+
+msgid "Cameroon"
+msgstr "Firenena Kameroniana"
+
+msgid "China"
+msgstr "Sina"
+
+msgid "Colombia"
+msgstr "Kaolombia"
+
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgid "Serbia and Montenegro"
+msgstr "Serbia sy Montenegro"
+
+msgid "Cuba"
+msgstr "Kioba"
+
+msgid "Cape Verde"
+msgstr "Cap Vert"
+
+msgid "Curaçao"
+msgstr "Curaçao"
+
+msgid "Christmas Island"
+msgstr "Nosy Krisimasy"
+
+msgid "Cyprus"
+msgstr "Sypra"
+
+msgid "Czech Republic"
+msgstr "Repoblikan'i Tsekoslovakia"
+
+msgid "Germany"
+msgstr "Firenena Alemana"
+
+msgid "Djibouti"
+msgstr "Djibotia"
+
+msgid "Denmark"
+msgstr "Danemark"
+
+msgid "Dominica"
+msgstr "Dominika"
+
+msgid "Dominican Republic"
+msgstr "Repoblika Dominikana"
+
+msgid "Algeria"
+msgstr "Aljeria"
+
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgid "Estonia"
+msgstr "Estonia"
+
+msgid "Egypt"
+msgstr "Ejypta"
+
+msgid "Western Sahara"
+msgstr "Sahara Andrefana"
+
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgid "Spain"
+msgstr "Firenena Espaniana"
+
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgid "European Union"
+msgstr "Firaisana Eoropeana"
+
+msgid "Finland"
+msgstr "Finlande"
+
+msgid "Fiji"
+msgstr "Fiji"
+
+msgid "Falkland Islands (Malvinas)"
+msgstr "Nosy Falkland (Malvinas)"
+
+msgid "Federated States of Micronesia"
+msgstr "Firenena Federaly an'i Mikronesia"
+
+msgid "Faroe Islands"
+msgstr "Nosy Faroe"
+
+msgid "France"
+msgstr "Frantsa"
+
+msgid "Gabon"
+msgstr "Gabon"
+
+msgid "United Kingdom"
+msgstr "Firenena Anglisy"
+
+msgid "Grenada"
+msgstr "Grenades"
+
+msgid "Georgia"
+msgstr "Jeorjia"
+
+msgid "French Guiana"
+msgstr "Goyana Frantsay"
+
+msgid "Guernsey"
+msgstr "Guernsey"
+
+msgid "Ghana"
+msgstr "Ghana"
+
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+msgid "Greenland"
+msgstr "Greenland"
+
+msgid "Gambia"
+msgstr "Gambia"
+
+msgid "Guinea"
+msgstr "Ginea"
+
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+msgid "Equatorial Guinea"
+msgstr "Ginea Ekatoraly"
+
+msgid "Greece"
+msgstr "Firenena Grika"
+
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Jeorjia Atsimo sy ny Nosy Sandwich Atsimo"
+
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgid "Guam"
+msgstr "Guam"
+
+msgid "Guinea-Bissau"
+msgstr "Ginea-Bisao"
+
+msgid "Guyana"
+msgstr "Goyana"
+
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+msgid "Honduras"
+msgstr "Honduras"
+
+msgid "Croatia"
+msgstr "Kroasia"
+
+msgid "Haiti"
+msgstr "Haiti"
+
+msgid "Hungary"
+msgstr "Hongria"
+
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgid "Ireland"
+msgstr "Irlandy"
+
+msgid "Israel"
+msgstr "Firenena Israeliana"
+
+msgid "Isle of Man"
+msgstr "Nosin'i Man"
+
+msgid "India"
+msgstr "Firenena Indiana"
+
+msgid "British Indian Ocean Territory"
+msgstr "Tany Anglisy ety amin'ny Ranomasina Indiana"
+
+msgid "Iraq"
+msgstr "Irak"
+
+msgid "Islamic Republic of Iran"
+msgstr "Repoblika Islamika an'i Iran"
+
+msgid "Iceland"
+msgstr "Iceland"
+
+msgid "Italy"
+msgstr "Italia"
+
+msgid "Jersey"
+msgstr "Jersey"
+
+msgid "Jamaica"
+msgstr "Firenena jamaikana"
+
+msgid "Jordan"
+msgstr "Firenena Jordaniana"
+
+msgid "Japan"
+msgstr "Firenena Japoney"
+
+msgid "Kenya"
+msgstr "Kenya"
+
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+msgid "Cambodia"
+msgstr "Firenena Kambojiana"
+
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgid "Comoros"
+msgstr "Kaomoro"
+
+msgid "Saint Kitts and Nevis"
+msgstr "Saint Kitts sy Nevis"
+
+msgid "The Democratic People's Republic of Korea"
+msgstr "Repoblika Demokratika entim'bahoakan'i Korea"
+
+msgid "Republic of Korea"
+msgstr "Repoblikan'i Korea"
+
+msgid "Kuwait"
+msgstr "Firenena kowesiana"
+
+msgid "Cayman Islands"
+msgstr "Nosy Caîman"
+
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+msgid "Lao People's Democratic Republic"
+msgstr "Repoblika Demokratikan'i Entim'bahoakan'i Lao"
+
+msgid "Lebanon"
+msgstr "Libanona"
+
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgid "Liberia"
+msgstr "Liberia"
+
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgid "Lithuania"
+msgstr "Lithuania"
+
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+msgid "Latvia"
+msgstr "Latvia"
+
+msgid "Libyan Arab Jamahiriya"
+msgstr "Jamahiriya Libiana"
+
+msgid "Morocco"
+msgstr "Firenena Marokana"
+
+msgid "Monaco"
+msgstr "Monaco"
+
+msgid "Republic of Moldova"
+msgstr "Repoblikan'i Moldova "
+
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgid "Saint Martin"
+msgstr "Saint Martin"
+
+msgid "Madagascar"
+msgstr "Madagasikara"
+
+msgid "Marshall Islands"
+msgstr "Nosy Marshall"
+
+msgid "The Former Yugoslav Republic of Macedonia"
+msgstr "Repoblikan'i Masedonia"
+
+msgid "Mali"
+msgstr "Mali"
+
+msgid "Myanmar"
+msgstr "Myanmar"
+
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgid "Macao"
+msgstr "Macao"
+
+msgid "Northern Mariana Islands"
+msgstr "Nosy Mariana Avaratra"
+
+msgid "Martinique"
+msgstr "Martinika"
+
+msgid "Mauritania"
+msgstr "Maoritania"
+
+msgid "Montserrat"
+msgstr "Montserrat"
+
+msgid "Malta"
+msgstr "Malta"
+
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgid "Maldives"
+msgstr "Maldives"
+
+msgid "Malawi"
+msgstr "Malawi"
+
+msgid "Mexico"
+msgstr "Mexico"
+
+msgid "Malaysia"
+msgstr "Malaisia"
+
+msgid "Mozambique"
+msgstr "Mozambika"
+
+msgid "Namibia"
+msgstr "Namibia"
+
+msgid "New Caledonia"
+msgstr "New Caledonia"
+
+msgid "Niger"
+msgstr "Niger "
+
+msgid "Norfolk Island"
+msgstr "Nosy Norflolk"
+
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgid "Netherlands"
+msgstr "Holandy"
+
+msgid "Norway"
+msgstr "Firenena Norveziana"
+
+msgid "Nepal"
+msgstr "Nepal"
+
+msgid "Nauru"
+msgstr "Nauru"
+
+msgid "Niue"
+msgstr "Niue"
+
+msgid "New Zealand"
+msgstr "Nouvelle Zelande"
+
+msgid "Oman"
+msgstr "Oman"
+
+msgid "Panama"
+msgstr "Panama"
+
+msgid "Peru"
+msgstr "Perou"
+
+msgid "French Polynesia"
+msgstr "Polinesia Frantsay"
+
+msgid "Papua New Guinea"
+msgstr "Papua Nouvelle Guinee"
+
+msgid "Philippines"
+msgstr "Firenena Filipiana"
+
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgid "Poland"
+msgstr "Polona"
+
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre sy Miquelon"
+
+msgid "Pitcairn Islands"
+msgstr "Nosy Pitcairn"
+
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+msgid "Palestinian Territory"
+msgstr "Tany Palestiniana"
+
+msgid "Portugal"
+msgstr "Portugal"
+
+msgid "Palau"
+msgstr "Palau"
+
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgid "Qatar"
+msgstr "Qatar"
+
+msgid "Réunion"
+msgstr "Nosy La Reunion"
+
+msgid "Romania"
+msgstr "Romania"
+
+msgid "Serbia"
+msgstr "Serbia"
+
+msgid "Russian Federation"
+msgstr "Federasiona Rosiana"
+
+msgid "Rwanda"
+msgstr "Rwanda"
+
+msgid "Saudi Arabia"
+msgstr "Arabie Saoudite"
+
+msgid "Solomon Islands"
+msgstr "Nosy Solomon"
+
+msgid "Seychelles"
+msgstr "Nosy Seychelles"
+
+msgid "Sudan"
+msgstr "Soudan"
+
+msgid "Sweden"
+msgstr "Suede"
+
+msgid "Singapore"
+msgstr "Singapour"
+
+msgid "Saint Helena"
+msgstr "Saint Helena"
+
+msgid "Slovenia"
+msgstr "Slovenia"
+
+msgid "Svalbard and Jan Mayen"
+msgstr "Svalbard sy Jan Mayen"
+
+msgid "Slovakia"
+msgstr "Slovakia"
+
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgid "San Marino"
+msgstr "San Marino"
+
+msgid "Senegal"
+msgstr "Firenena Sonegaly"
+
+msgid "Somalia"
+msgstr "Somalia"
+
+msgid "Suriname"
+msgstr "Suriname"
+
+msgid "Sao Tome and Principe"
+msgstr "Sao Tome sy Principe"
+
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgid "Syrian Arab Republic"
+msgstr "Repoblika Arabo Syriana"
+
+msgid "Swaziland"
+msgstr "Swaziland"
+
+msgid "Turks and Caicos Islands"
+msgstr "Turks sy ny nosy Caicos"
+
+msgid "Chad"
+msgstr "Tchad"
+
+msgid "French Southern Territories"
+msgstr "Tany frantsay Atsimo"
+
+msgid "Togo"
+msgstr "Togo"
+
+msgid "Thailand"
+msgstr "Thailand"
+
+msgid "Tajikistan"
+msgstr "Taijikistan"
+
+msgid "Tokelau"
+msgstr "Tokelau"
+
+msgid "Timor-Leste"
+msgstr "Timor-Leste"
+
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgid "Tunisia"
+msgstr "Tonisia"
+
+msgid "Tonga"
+msgstr "Tonga"
+
+msgid "Turkey"
+msgstr "Torkia "
+
+msgid "Trinidad and Tobago"
+msgstr "Trinidad sy Tobago"
+
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgid "United Republic of Tanzania"
+msgstr "Repoblika Mitambatr'i Tanzania"
+
+msgid "Ukraine"
+msgstr "Firenena Okrainiana"
+
+msgid "Uganda"
+msgstr "Uganda"
+
+msgid "United States Minor Outlying Islands"
+msgstr "Nosy miraiky amin'Etazonia"
+
+msgid "United States"
+msgstr "Etazonia"
+
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgid "Uzbekistan"
+msgstr "Ozbekistana"
+
+msgid "Holy See (Vatican City State)"
+msgstr "Tany masina (Vatikana)"
+
+msgid "Saint Vincent and the Grenadines"
+msgstr "Saint Vincent sy ny Grenadines"
+
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgid "Virgin Islands"
+msgstr "Nosy Virgin"
+
+msgid "Viet Nam"
+msgstr "Firenena Vietnamiana"
+
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgid "Wallis and Futuna"
+msgstr "Wallis sy Futuna"
+
+msgid "Samoa"
+msgstr "Nosy Samoa"
+
+msgid "Yemen"
+msgstr "Yemen"
+
+msgid "Mayotte"
+msgstr "Mayotte"
+
+msgid "South Africa"
+msgstr "Afrika Atsimo"
+
+msgid "Zambia"
+msgstr "Zambia"
+
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
diff --git a/apps/routerconsole/locale-countries/messages_pl.po b/apps/routerconsole/locale-countries/messages_pl.po
index 9aac112e1c5f72d9d26a0be22b995c48275bcbdd..0680cc86e807e1d2dd6fcee75976cafd246152ba 100644
--- a/apps/routerconsole/locale-countries/messages_pl.po
+++ b/apps/routerconsole/locale-countries/messages_pl.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the routerconsole package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 # PolishAnon <b790979@klzlk.com>, 2011-2012
 # Warton <businesshehe@yahoo.com>, 2011-2012
+# polacco <polacco@i2pmail.org>, 2014
 # polacco <polacco@i2pmail.org>, 2012
 # PolishAnon <b790979@klzlk.com>, 2011
 # Tracerneo <ziolkoneo@gmail.com>, 2013
@@ -13,17 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-19 23:01+0000\n"
-"PO-Revision-Date: 2013-10-23 21:02+0000\n"
-"Last-Translator: Tracerneo <ziolkoneo@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/"
-"pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2013-10-14 13:33+0000\n"
+"PO-Revision-Date: 2014-11-23 20:42+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "Anonymous Proxy"
 msgstr "Anonimowe proxy"
@@ -149,7 +148,7 @@ msgid "The Democratic Republic of the Congo"
 msgstr "Demokratyczna Republika Konga"
 
 msgid "Central African Republic"
-msgstr "Republika Środkowej Afryki"
+msgstr "Republika Środkowoafrykańska"
 
 msgid "Congo"
 msgstr "Kongo"
@@ -170,7 +169,7 @@ msgid "Cameroon"
 msgstr "Kamerun"
 
 msgid "China"
-msgstr "Chiny"
+msgstr "Chińska Republika Ludowa"
 
 msgid "Colombia"
 msgstr "Kolumbia"
@@ -185,7 +184,7 @@ msgid "Cuba"
 msgstr "Kuba"
 
 msgid "Cape Verde"
-msgstr "Wyspy Zielonego Przylądka"
+msgstr "Republika Zielonego Przylądka"
 
 msgid "Curaçao"
 msgstr "Curaçao"
@@ -389,7 +388,7 @@ msgid "Comoros"
 msgstr "Komory"
 
 msgid "Saint Kitts and Nevis"
-msgstr "Saint Kitts and Nevis"
+msgstr "Saint Kitts i Nevis"
 
 msgid "The Democratic People's Republic of Korea"
 msgstr "Korea Północna"
@@ -575,7 +574,7 @@ msgid "Pitcairn Islands"
 msgstr "Wyspy Pitcairn"
 
 msgid "Puerto Rico"
-msgstr "Puerto Rico"
+msgstr "Portoryko"
 
 msgid "Palestinian Territory"
 msgstr "Palestyna"
@@ -680,7 +679,7 @@ msgid "Thailand"
 msgstr "Tajlandia"
 
 msgid "Tajikistan"
-msgstr "Tadżikistan"
+msgstr "Tadżykistan"
 
 msgid "Tokelau"
 msgstr "Tokelau"
@@ -701,16 +700,16 @@ msgid "Turkey"
 msgstr "Turcja"
 
 msgid "Trinidad and Tobago"
-msgstr "Trinidad i Tobago"
+msgstr "Trynidad i Tobago"
 
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
 msgid "Taiwan"
-msgstr "Tajwan"
+msgstr "Republika Chińska"
 
 msgid "United Republic of Tanzania"
-msgstr "Zjednoczonej Republiki Tanzanii"
+msgstr "Tanzania"
 
 msgid "Ukraine"
 msgstr "Ukraina"
diff --git a/apps/routerconsole/locale-countries/messages_pt.po b/apps/routerconsole/locale-countries/messages_pt.po
index a4c8bc16985f50703152d93b2828d97534733027..2a89b0f60836bc4e7dbe2cf402ba9a584253e08c 100644
--- a/apps/routerconsole/locale-countries/messages_pt.po
+++ b/apps/routerconsole/locale-countries/messages_pt.po
@@ -2,35 +2,33 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the routerconsole package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
-# hxdcmls <hexadecimais@bol.com.br>, 2013
-# hxdcmls <hexadecimais@bol.com.br>, 2013
-# wtfisthis <low_fps11@yahoo.com>, 2012-2013
+# alfalb.as, 2015
+# hxdcmls, 2013
 # rafaelbf, 2013
-# Ruthein <rutweiller@hotmail.com>, 2012
+# Ruthein Alex <rutweiller@hotmail.com>, 2012
 # tuliouel, 2013
 # wicked, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-14 13:34+0000\n"
-"PO-Revision-Date: 2013-07-04 19:08+0000\n"
-"Last-Translator: tuliouel\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/"
-"pt/)\n"
-"Language: pt\n"
+"POT-Creation-Date: 2013-10-14 13:33+0000\n"
+"PO-Revision-Date: 2015-03-02 15:19+0000\n"
+"Last-Translator: alfalb.as\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Anonymous Proxy"
-msgstr "Proxy anônimo"
+msgstr "Proxy Anónimo"
 
 msgid "Satellite Provider"
-msgstr "Provedor"
+msgstr "Provedor de Satélite"
 
 msgid "Andorra"
 msgstr "Andorra"
@@ -769,4 +767,3 @@ msgstr "Zambia"
 
 msgid "Zimbabwe"
 msgstr "Zimbabué"
-
diff --git a/apps/routerconsole/locale-countries/messages_sq.po b/apps/routerconsole/locale-countries/messages_sq.po
index c29ac607cba9e3a83689b38faec136fa07402fb9..76b13718627b3bde92899f12f6703f4a1a551cf9 100644
--- a/apps/routerconsole/locale-countries/messages_sq.po
+++ b/apps/routerconsole/locale-countries/messages_sq.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-14 13:33+0000\n"
-"PO-Revision-Date: 2014-08-10 18:13+0000\n"
+"PO-Revision-Date: 2014-08-11 06:06+0000\n"
 "Last-Translator: Shpetim <shpetim@privacysolutions.no>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/I2P/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -107,7 +107,7 @@ msgid "Bermuda"
 msgstr "Bermuda"
 
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darusalam"
 
 msgid "Bolivia"
 msgstr "Bolivia"
diff --git a/apps/routerconsole/locale-news/messages_es.po b/apps/routerconsole/locale-news/messages_es.po
index 9c208d1cff742331bab0c631e4dc4436d08d4ac7..8ce12cf2de2524e139e32f4fd870a545d3b19823 100644
--- a/apps/routerconsole/locale-news/messages_es.po
+++ b/apps/routerconsole/locale-news/messages_es.po
@@ -4,16 +4,17 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# difusion, 2014
 # strel, 2014
 # trolly, 2013
-# trolly, 2013
+# Trolly, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-02-24 00:55+0000\n"
-"Last-Translator: strel\n"
+"PO-Revision-Date: 2014-11-15 05:17+0000\n"
+"Last-Translator: difusion\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "&iexcl;Bienvenido a I2P!"
 
 #, java-format
 msgid "Please {0}have patience{1} as I2P boots up and finds peers."
-msgstr "¡ Por favor, tenga {0}paciencia{1} mientras I2P se arranca y encuentra otros pares!"
+msgstr "¡Por favor, tenga {0}paciencia{1} mientras I2P se arranca y encuentra otros pares!"
 
 #, java-format
 msgid ""
diff --git a/apps/routerconsole/locale-news/messages_fi.po b/apps/routerconsole/locale-news/messages_fi.po
new file mode 100644
index 0000000000000000000000000000000000000000..051867a000870d97864b431f11072ce041fe88eb
--- /dev/null
+++ b/apps/routerconsole/locale-news/messages_fi.po
@@ -0,0 +1,65 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# oselotti, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 21:46+0000\n"
+"PO-Revision-Date: 2014-08-23 08:23+0000\n"
+"Last-Translator: oselotti\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Congratulations on getting I2P installed!"
+msgstr "Onnittelut I2P:n asentamisesta!"
+
+msgid "Welcome to I2P!"
+msgstr "Tervetuloa I2P:hen!"
+
+#, java-format
+msgid "Please {0}have patience{1} as I2P boots up and finds peers."
+msgstr "Odota {0}kärsivällisesti{1} kuin I2P käynnistyy ja löytää vertaisia."
+
+#, java-format
+msgid ""
+"While you are waiting, please {0}adjust your bandwidth settings{1} on the "
+"{2}configuration page{3}."
+msgstr "Odottaessasi {0}säädä kaistanleveysasetuksesi{1} {2}asetussivulta{3}."
+
+msgid ""
+"Also you can setup your browser to use the I2P proxy to reach eepsites."
+msgstr "Voit myös asettaa selaimesi käyttämään I2P-välityspalvelinta päästäksesi eepsiteille."
+
+msgid ""
+"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
+"browser settings."
+msgstr "Aseta 127.0.0.1 (tai localhost) portti 4444 http-välityspalvelimeksi selaimen asetuksiin."
+
+msgid "Do not use SOCKS for this."
+msgstr "Älä käytä SOCKS:ia tähän."
+
+#, java-format
+msgid ""
+"More information can be found on the {0}I2P browser proxy setup page{1}."
+msgstr "Lisää tietoa löytyy {0}I2P-selaimen välityspalvelinasetussivulta{1}."
+
+#, java-format
+msgid ""
+"Once you have a \"shared clients\" destination listed on the left, please "
+"{0}check out{1} our {2}FAQ{3}."
+msgstr "Kun sinulla on \"shared clients\" listattuna vasemmalla, {0}tutustu{1} {2}UKK{3}-sivuun."
+
+#, java-format
+msgid ""
+"Point your IRC client to {0}localhost:6668{1} and say hi to us on "
+"{2}#i2p{3}."
+msgstr "Osoita IRC-asiakasohjelmasi osoitteeseen {0}localhost:6668{1} ja tule tervehtimään meitä {2}#i2p{3}-kanavalle."
diff --git a/apps/routerconsole/locale-news/messages_id.po b/apps/routerconsole/locale-news/messages_id.po
new file mode 100644
index 0000000000000000000000000000000000000000..770e09e492d3c70ebe7fd9112af67159ebc8b232
--- /dev/null
+++ b/apps/routerconsole/locale-news/messages_id.po
@@ -0,0 +1,65 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 21:46+0000\n"
+"PO-Revision-Date: 2014-08-12 04:16+0000\n"
+"Last-Translator: Khairul Agasta <khairuldroids@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Congratulations on getting I2P installed!"
+msgstr "Selamat atas terpasangnya I2P!"
+
+msgid "Welcome to I2P!"
+msgstr "Selamat datang di I2P!"
+
+#, java-format
+msgid "Please {0}have patience{1} as I2P boots up and finds peers."
+msgstr "Mohon {0}bersabar{1} karena I2P boot up dan menemukan peers."
+
+#, java-format
+msgid ""
+"While you are waiting, please {0}adjust your bandwidth settings{1} on the "
+"{2}configuration page{3}."
+msgstr "Sementara Anda menunggu, silahkan {0}sesuaikan pengaturan bandwidth Anda{1} pada {2}laman konfigurasi{3}."
+
+msgid ""
+"Also you can setup your browser to use the I2P proxy to reach eepsites."
+msgstr "Anda juga dapat menyetel peramban Anda untuk menggunakan proxy I2P untuk mencapai eepsites."
+
+msgid ""
+"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
+"browser settings."
+msgstr "Masukkan saja 127.0.0.1 (atau localhost) port 4444 sebagai proxy http kedalam pengaturan peramban Anda."
+
+msgid "Do not use SOCKS for this."
+msgstr "Jangan menggunakan SOCKS untuk ini."
+
+#, java-format
+msgid ""
+"More information can be found on the {0}I2P browser proxy setup page{1}."
+msgstr "Informasi lainnya dapat ditemukan pada {0}laman penyetalan proxy peramban I2P{1}."
+
+#, java-format
+msgid ""
+"Once you have a \"shared clients\" destination listed on the left, please "
+"{0}check out{1} our {2}FAQ{3}."
+msgstr "Ketika Anda memiliki tujuan \"klien berbagi\" dalam daftar di kiri, silahkan {0}baca{1} {2}FAQ{3} kami."
+
+#, java-format
+msgid ""
+"Point your IRC client to {0}localhost:6668{1} and say hi to us on "
+"{2}#i2p{3}."
+msgstr "Arahkan klien IRC Anda ke {0}localhost:6668{1} dan katakan hi kepada kami di {2}#i2p{3}."
diff --git a/apps/routerconsole/locale-news/messages_ko.po b/apps/routerconsole/locale-news/messages_ko.po
index 062765aa8114f103251738686a5f94145637d2cc..1f326e29276a18c7eda551922e3fb264e15d0f32 100644
--- a/apps/routerconsole/locale-news/messages_ko.po
+++ b/apps/routerconsole/locale-news/messages_ko.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-02-23 16:51+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"PO-Revision-Date: 2014-10-18 12:26+0000\n"
+"Last-Translator: Choi Yeon-Ung <kqwe1859@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/I2P/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,4 +62,4 @@ msgstr "\"공유된 클라이언트\"의 행선지가 왼쪽에 있습니다. {2
 msgid ""
 "Point your IRC client to {0}localhost:6668{1} and say hi to us on "
 "{2}#i2p{3}."
-msgstr ""
+msgstr "IRC 클라이언트를 {0}localhost:6668{1}로 포인트 하고 {2}#i2p{3}에 접속해서 우리들에게 인사를 건네주세요."
diff --git a/apps/routerconsole/locale-news/messages_nb.po b/apps/routerconsole/locale-news/messages_nb.po
index fa2b24d53264684cb9b8b211ff130097e9a3b4af..683fba392abd05e728fdcd88cdcc05d468dcaca8 100644
--- a/apps/routerconsole/locale-news/messages_nb.po
+++ b/apps/routerconsole/locale-news/messages_nb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-05-01 19:52+0000\n"
+"PO-Revision-Date: 2014-11-20 12:07+0000\n"
 "Last-Translator: Allan Nordhøy <comradekingu@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Congratulations on getting I2P installed!"
-msgstr ""
+msgstr "Til lykke med innstallasjon av I2P!"
 
 msgid "Welcome to I2P!"
 msgstr "Velkommen til I2P!"
@@ -33,33 +33,33 @@ msgstr "{0}vær tolmodig{1} i påvente av I2P-oppstart og tilknytning til likeme
 msgid ""
 "While you are waiting, please {0}adjust your bandwidth settings{1} on the "
 "{2}configuration page{3}."
-msgstr ""
+msgstr "Mens du venter, {0}gjør båndbreddeinnstillinger{1} på {2}oppsettssiden{3}."
 
 msgid ""
 "Also you can setup your browser to use the I2P proxy to reach eepsites."
-msgstr ""
+msgstr "Du kan også sette opp din nettleser for bruk med I2P-mellomtjener for å nå eep-sider"
 
 msgid ""
 "Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
 "browser settings."
-msgstr ""
+msgstr "Skriv inn 127.0.0.1 (eller localhost) port 4444 som en http-mellomtjener i dine nettleserinnstillinger."
 
 msgid "Do not use SOCKS for this."
-msgstr ""
+msgstr "Ikke bruk SOCKS for dette."
 
 #, java-format
 msgid ""
 "More information can be found on the {0}I2P browser proxy setup page{1}."
-msgstr ""
+msgstr "Mer informasjon er å finne på {0}oppsettssiden for I2P-mellomtjener{1}."
 
 #, java-format
 msgid ""
 "Once you have a \"shared clients\" destination listed on the left, please "
 "{0}check out{1} our {2}FAQ{3}."
-msgstr ""
+msgstr "Når du har \"delte klienter\" mål opplistet til venstre, {0}sjekk{1} vår {2}O-S-S{3}."
 
 #, java-format
 msgid ""
 "Point your IRC client to {0}localhost:6668{1} and say hi to us on "
 "{2}#i2p{3}."
-msgstr ""
+msgstr "Rett din IRC-klient inn mot {0}localhost:6668{1} og si hei til oss på {2}#i2p{3}."
diff --git a/apps/routerconsole/locale-news/messages_nl.po b/apps/routerconsole/locale-news/messages_nl.po
index 3b8acd38141c64665cce60b921c7f9ef5ab3d971..e303980bc6248b3a6eccef84880acd2372e4e9cf 100644
--- a/apps/routerconsole/locale-news/messages_nl.po
+++ b/apps/routerconsole/locale-news/messages_nl.po
@@ -4,13 +4,14 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# Nathan Follens, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-02-23 16:51+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"PO-Revision-Date: 2015-01-17 23:18+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,20 +37,20 @@ msgstr "Terwijl je wacht, {0}pas je bandbreedte instellingen aan{1} op de {2}con
 
 msgid ""
 "Also you can setup your browser to use the I2P proxy to reach eepsites."
-msgstr ""
+msgstr "Je kan ook je browser instellen om de I2P-proxy te gebruiken om eepsites te kunnen bereiken."
 
 msgid ""
 "Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
 "browser settings."
-msgstr ""
+msgstr "Geef gewoon 127.0.0.1 (of localhost) poort 4444 in als een http-proxy in je browserinstellingen."
 
 msgid "Do not use SOCKS for this."
-msgstr ""
+msgstr "Gebruik hiervoor geen SOCKS."
 
 #, java-format
 msgid ""
 "More information can be found on the {0}I2P browser proxy setup page{1}."
-msgstr ""
+msgstr "Meer informatie kan je vinden op de {0}I2P browser proxy setup pagina{1}."
 
 #, java-format
 msgid ""
@@ -61,4 +62,4 @@ msgstr "Wanneer je een \"gedeelde clients\" destination in de linker lijst hebt,
 msgid ""
 "Point your IRC client to {0}localhost:6668{1} and say hi to us on "
 "{2}#i2p{3}."
-msgstr ""
+msgstr "Wijs je IRC-cliënt naar {0}localhost:6668{1} en zeg gedag tegen ons op {2}#i2p{3}"
diff --git a/apps/routerconsole/locale-news/messages_pt_BR.po b/apps/routerconsole/locale-news/messages_pt_BR.po
index bae9178f326d8db4b366dd0faedb7396c9ab23f8..504c6ecc6f8840ee957e7be0fc9520a06806d93a 100644
--- a/apps/routerconsole/locale-news/messages_pt_BR.po
+++ b/apps/routerconsole/locale-news/messages_pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-03-15 18:10+0000\n"
+"PO-Revision-Date: 2014-11-29 12:03+0000\n"
 "Last-Translator: blueboy\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -66,4 +66,4 @@ msgstr "Uma vez que você tenha um destino de \"clientes compartilhados\" listad
 msgid ""
 "Point your IRC client to {0}localhost:6668{1} and say hi to us on "
 "{2}#i2p{3}."
-msgstr "Aponte seu cliente IRC para {0}localhost:6668{1} e diga oi para nós em {2}#i2p{3}."
+msgstr "Aponte seu cliente IRC para {0}localhost:6668{1} e dê um oi para nós em {2}#i2p{3}."
diff --git a/apps/routerconsole/locale-news/messages_sq.po b/apps/routerconsole/locale-news/messages_sq.po
new file mode 100644
index 0000000000000000000000000000000000000000..b4cfd946b86e0fb47a0cc6f3c7d0f7fa49b841ad
--- /dev/null
+++ b/apps/routerconsole/locale-news/messages_sq.po
@@ -0,0 +1,64 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 21:46+0000\n"
+"PO-Revision-Date: 2014-02-23 16:51+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/I2P/language/sq/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Congratulations on getting I2P installed!"
+msgstr ""
+
+msgid "Welcome to I2P!"
+msgstr ""
+
+#, java-format
+msgid "Please {0}have patience{1} as I2P boots up and finds peers."
+msgstr ""
+
+#, java-format
+msgid ""
+"While you are waiting, please {0}adjust your bandwidth settings{1} on the "
+"{2}configuration page{3}."
+msgstr ""
+
+msgid ""
+"Also you can setup your browser to use the I2P proxy to reach eepsites."
+msgstr ""
+
+msgid ""
+"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
+"browser settings."
+msgstr ""
+
+msgid "Do not use SOCKS for this."
+msgstr ""
+
+#, java-format
+msgid ""
+"More information can be found on the {0}I2P browser proxy setup page{1}."
+msgstr ""
+
+#, java-format
+msgid ""
+"Once you have a \"shared clients\" destination listed on the left, please "
+"{0}check out{1} our {2}FAQ{3}."
+msgstr ""
+
+#, java-format
+msgid ""
+"Point your IRC client to {0}localhost:6668{1} and say hi to us on "
+"{2}#i2p{3}."
+msgstr ""
diff --git a/apps/routerconsole/locale-news/messages_uk.po b/apps/routerconsole/locale-news/messages_uk.po
index dae0ed4b0de3257799579fd4761a0ff893be26ed..ba8e39a36351c436c7b8ee00c97683af40893824 100644
--- a/apps/routerconsole/locale-news/messages_uk.po
+++ b/apps/routerconsole/locale-news/messages_uk.po
@@ -7,13 +7,14 @@
 # Anton Zub <azb.0x7dc@gmail.com>, 2014
 # jonny_nut, 2014
 # LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2014-09-08 19:38+0000\n"
-"Last-Translator: LinuxChata\n"
+"PO-Revision-Date: 2014-12-25 14:10+0000\n"
+"Last-Translator: madjong <madjong@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +59,7 @@ msgstr "Додаткова інформація доступна на {0}I2P с
 msgid ""
 "Once you have a \"shared clients\" destination listed on the left, please "
 "{0}check out{1} our {2}FAQ{3}."
-msgstr ""
+msgstr "Як тільки ви побачите \"shared clients\" у списку зліва, будь ласка, {0}відвідайте{1} наш {2}FAQ{3}."
 
 #, java-format
 msgid ""
diff --git a/apps/routerconsole/locale/messages_ar.po b/apps/routerconsole/locale/messages_ar.po
index 0111da812aa7e105326c35bfe45e7d2977fa9365..b3792fd7c86e5e7ac10e36353db26d9914188f43 100644
--- a/apps/routerconsole/locale/messages_ar.po
+++ b/apps/routerconsole/locale/messages_ar.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -46,7 +46,7 @@ msgstr[5] ""
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -59,7 +59,7 @@ msgstr[5] ""
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -72,7 +72,7 @@ msgstr[5] ""
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -83,13 +83,13 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr ""
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -100,44 +100,44 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "ممنوع من طرف الموجه: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "ممنوع من طرف الموجه"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "  {0} عنوان ممنوع"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "من"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "إلى"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "ﻻشيئ"
 
@@ -147,66 +147,66 @@ msgstr "ﻻشيئ"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "توقيف الأنفاق"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "توقيف غالبية الأنفاق : "
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "رفض الانفاق: وصل الى الحد"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "رفض الانفاق: وصل حد سرعة الاتصال"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "رفض غالبية الانفاق: وصل حد سرعة الاتصال"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "قبول غالبية الأنفاق"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "قبول الأنفاق"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "جاري التوقيف"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "رفض الأنفاق"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "اعادة التوزيع"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
@@ -217,26 +217,26 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "فشل اعادة التوزيع"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "تم حفظ اعدادات اعادة التوزيع"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "اعادة التوزيع: تحميل العنوان"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -270,7 +270,7 @@ msgstr "كم من المستخدمين نتحاور معهم"
 msgid "Known fast peers"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr ""
 
@@ -280,45 +280,54 @@ msgstr ""
 msgid "No transports (hidden or starting up?)"
 msgstr "ﻻ وسائل النقل (مخفية أو جاري البدء؟)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "صعب الوصول بأية وسيلة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "عموان الموجه للنقل"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} مستعملة للاتصال الخارجي فقط"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "التعاريف"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -327,251 +336,258 @@ msgstr "التعاريف"
 msgid "Peer"
 msgstr "مستخدم"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "النظير البعيد"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "اتصال داخلي"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "اتصال خارجي"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "ساعد المستخدمين الآخرين في عبور الجدار الناري"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "عرضنا لمساعدتهم (مساعدة أقرانه الآخرين من اجتياز جدار الحماية)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "مدة تلقى / بعث حزمة  "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "خامل"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "داخل/خارج"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "سرعة الداخلة / الخارجة للتحويل (KBytes في الثانية)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "مدة استمرار هذا الاتصال"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "فوق"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "الانحراف"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "الفرق بين ساعة النظير و ساعتك"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "نافذة الازدحام، هي كمية المرسلة دون ازدحام"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "عدد الرسائل المرسلة التي تنتظر الموافقة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "الحد الأقصى لعدد الرسائل المتزامنة الارسال"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "عدد المرسلات التي تتجاوز إطار الازدحام"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "عتبة بداية بطيئة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "الوقت الذهاب وإياب في جزء ثانية"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "اعادة الارسال في جزء ثانية"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "الحد الأقصى الحالي إرسال حجم الحزمة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "العدد الاجمالي للحزم المرسلة الى المستخدم"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "العدد الاجمالي للحزم المستقبلة"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "العدد الاجمالي للحزم المرسلة الى النظائر"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "إجمالي عدد الحزم المكررة الواردة من الزملاء"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "خدمة"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "الحالة"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "مدة الاشتغال"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -580,67 +596,63 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "درجة انحراف الساعة: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "اتصال NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "حد"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "انتهى الوقت"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "السجلات"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "الداخل"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "الخارج"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
@@ -651,213 +663,213 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "اتصال UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "اتجاه/تقديم"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "حسب الاتصاب الوارد"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "حسب الاتصال الخارج"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "حسب معدل الداخل"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "حسب معدل الصادرة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "حسب مدة الاتصال"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "حسب انحراف الساعة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "حسب نافذة الازدحام"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "حسب مدة الانطلاق"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "حسب الوقت ذهابا وإيابا"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "حسب مهلة إعادة الإرسال"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "حسب أقصى مدة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "حسب الحزم المرسلة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "حسب الحزم المستقبلة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "حسب الحزم المعاد ارسالها"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "حسب الحزم المستقبلة اكثر من مرة"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "عرضنا لتعريفهم"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "عرصو علينا تقديمهم"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "اختنق"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "فشل واحد"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} فشل"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "ممنوع"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "تجاوز النفق: بطيئ جدا"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "تجاوز النفق: ازدحام"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "تجاوز النفق: ازدحام"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "تجاوز النفق: حد الاتصال"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "تجاوز النفق: ازدحام كبير"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "تجاوز النفق: وقت الانتظار"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "يوجد اصدار جديد {0} للملحق"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "فشل البحث عم ترقية للملحق {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "ﻻيوجد اصدار جديد {0} للملحق"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B منقول"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "فشل في النقل {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "طريقة الترقية"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "أعد التشغيل"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "انتهى التحديث"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "من {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "ملف التحديث غير كامل {0} "
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "فشل في نسخ {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1365,8 +1377,8 @@ msgid "Add Client"
 msgstr "أضف مستخدم"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "مستخدم"
 
@@ -1397,9 +1409,9 @@ msgid "Plugin"
 msgstr "الملحق"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "إصدار"
 
@@ -1421,7 +1433,7 @@ msgstr "رخصة"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "موقع"
 
@@ -1434,7 +1446,7 @@ msgid "Stop"
 msgstr "توقف"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "بحث عن الترقية"
@@ -1456,7 +1468,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1466,7 +1478,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1485,6 +1497,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1565,7 +1578,7 @@ msgstr "عنوان غير موجود"
 msgid "Log overrides updated"
 msgstr "اعدا كتابة السجلات"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "تم حفظ السجلات"
 
@@ -1614,7 +1627,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "حذف"
 
@@ -1633,7 +1646,7 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "شبكة"
 
@@ -1689,8 +1702,8 @@ msgid "UI"
 msgstr "واجهة مستخدم"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "نفق"
@@ -1709,15 +1722,15 @@ msgid "Logging"
 msgstr "تسجيل"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "المستخدمين"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "احصائات"
 
@@ -1730,7 +1743,7 @@ msgstr "متقدم"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1840,16 +1853,16 @@ msgstr "تحديث سرعة الاتصال المشاركة"
 msgid "Updated bandwidth limits"
 msgstr "حد سرعة الاتصال "
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "غير معروف"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "بايت في الثانية"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "أو {0} بايت لكل شهر"
@@ -2427,7 +2440,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2436,86 +2449,86 @@ msgstr ""
 msgid "Password"
 msgstr "كلمة السر"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "يوجد اصدار جديد "
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "توجد تحديثات، انقر زر على اليسار للتحميل"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "ﻻتوجد تحديثات"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "أبد"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "تحديث العناوين"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "تحديث المفاتيح الموثوقة."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "كل"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "إعلام فقط"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "حمل فقط"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "حمل، تحقق و أعد تشغيل"
 
@@ -2673,7 +2686,7 @@ msgid "{0} for {1}"
 msgstr "{0} لكل {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "استعمال الشيكة"
 
@@ -2787,12 +2800,12 @@ msgid "Graph settings saved"
 msgstr "حفظ اعدادات الرسم البياني"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "دفتر العناوين"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
@@ -2823,17 +2836,17 @@ msgid "I2P Home Page Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "بريد الكتروني مجهول"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "بريد الكتروني"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "مساعدة روتر I2P"
 
@@ -2843,17 +2856,17 @@ msgid "Router Console"
 msgstr "مركز تحكم I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "برنامج تورنت مجهول"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "تورنت"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
@@ -2939,10 +2952,8 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -3025,7 +3036,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
@@ -3175,148 +3186,157 @@ msgid "Unpublished"
 msgstr "غير منشور"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "الغاية"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "ينتهي في مدة {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "انتهى {0} منذ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "نفق"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "لم تتم تهيئة"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "احصائيات قاعدة البيانات I2P"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "عدد"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "نقل"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "البلد"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "المعلومات"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "معلومات النظائر"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "مختفي"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "تحديث"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} مدة"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "تم نشره منذ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "عناوين"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "ثمن"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "مختفي"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3335,7 +3355,7 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
@@ -3432,7 +3452,7 @@ msgid "Failing"
 msgstr "فشل"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "مدمج"
 
@@ -3645,7 +3665,7 @@ msgid "Lifetime average frequency"
 msgstr "متوسط مدى الحياة"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3704,282 +3724,282 @@ msgstr "رسم بياني"
 msgid "Graph Event Count"
 msgstr "الرسم البياني"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "تصدير البيانات XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "متوسط الحياة"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "مساعدة حول I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "مساعدة"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "خدمات I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P اعدادات موجه"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "أظهر الأنفاق الموجودة وحالة الانفاق "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "أظهر اتصالات المشاركين"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "أظهر قائمة بكل I2P المعروفة"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "تقرير"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "يجلات"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "أظهر اشتغال الموجه بريم بياني"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "رسم بياني"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "احصائات نصية للموجه"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "الوجهات المحلية"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "الأنفاق I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "عام"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "هوية محلية"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "هوية موجهك  I2P هو"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "لاتظهر لأحد"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "أظهر"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "مدة الاشتغال"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "مساعدة في اعدادات الجدار الناري لزيادة فعالية I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "مفعل"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "سريع"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "قدرة عالية"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "معروف"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "حدد سرعة الموجه"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "الاتصال الداخلي/خارجي"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "مجموع"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "مستعمل"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "تصفح"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "مشارك"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "نسبة المشاركة"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "ازدحام"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "تأخر"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "تأخر الرسالة"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "تأخر النفق"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -4053,43 +4073,43 @@ msgstr ""
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "أضف/حذف/حرر  &amp; المستخدم والانفاق"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "خادم"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "أظهر الانفاق"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "اعادة بناية"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "هناك"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "مستعد"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "بناء"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "جاري بناء النفق"
 
@@ -4097,31 +4117,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "المستخدمين المشتركين"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "أنقر اعادة التشغبل للتثبيت"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "انقر زر التوقف وأعد التشغيل للتثبيت"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "اصدار {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4130,40 +4150,40 @@ msgstr ""
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "مساعدة خول اعدادات الجدار الناري"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "تأكد من NAT/جدار ناري"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "اعادة توزيع"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4436,6 +4456,10 @@ msgstr "التشفير"
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "الأنفاق I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4753,7 +4777,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4841,13 +4865,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP منفذ"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr ""
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP منفذ"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "الصلاحية"
@@ -4934,12 +4958,13 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4999,48 +5024,53 @@ msgstr "اعدادت السجلات I2P"
 msgid "Log file"
 msgstr "ملف السجل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "بيانات السجل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "تاريخ السجل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "أقصى حجم لملف السجل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "نوع السجل"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6228,18 +6258,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_cs.po b/apps/routerconsole/locale/messages_cs.po
index c59198822617aa5b986519342af7ea3e74dbdeb3..6adc430128270634fe56a9e17637516cd1b7c2f5 100644
--- a/apps/routerconsole/locale/messages_cs.po
+++ b/apps/routerconsole/locale/messages_cs.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-07 20:09+0000\n"
-"Last-Translator: A5h8d0wf0x <littleslyfoxie28@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[2] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -51,7 +51,7 @@ msgstr[2] "{0} sek."
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -61,7 +61,7 @@ msgstr[2] "{0} minut"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -69,13 +69,13 @@ msgstr[0] "{0} hodina"
 msgstr[1] "{0} hodiny"
 msgstr[2] "{0} hodin"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "neaplikovatelné"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -83,44 +83,44 @@ msgstr[0] "{0} den"
 msgstr[1] "{0} dny"
 msgstr[2] "{0} dnů"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Zakázáno hashem routeru: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Zakázáno hashem routeru"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP adresa zakázána v souboru blocklist.txt, záznam {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IPs Zakázáno Až Do Restartu"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IPs Je Trvale Zakázáno"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Od"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Do"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "žádný"
 
@@ -130,66 +130,66 @@ msgstr "žádný"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Odmítnutí tunelů: Uvádění do provozu"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Odmítám tunely: velké spoždění zprávy"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Odmítám tunely: velké množství požadavků"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Odmítám tunely: limit dosažen"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Odmítnutí tunelů: limit rychlosti"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Odmítnutí většiny tunelů: limit rychlost"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Přijetí většiny tunelů"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Přijetí tunelů"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Odmítám tunely: vypínání"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Odmítnutí tunelů"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Opětovné sdílení (reseeding)"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
@@ -197,26 +197,26 @@ msgstr[0] "Reseed získán pouze pro 1 router."
 msgstr[1] "Reseed získán pouze pro {0} routerů."
 msgstr[2] "Reseed získán pouze pro {0} routerů."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed selhal."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Další informace viz. {0}."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "reseed stránky nastavení"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseedovaní: načítání seedované URL."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -250,7 +250,7 @@ msgstr "S kolika peery aktivně komunikujeme"
 msgid "Known fast peers"
 msgstr "Známé rychlé peery"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Záznam NetDB"
 
@@ -260,45 +260,54 @@ msgstr "Záznam NetDB"
 msgid "No transports (hidden or starting up?)"
 msgstr "Žádné transporty (skryté nebo začínající?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Nedostupné na každém transportu"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Transportní Adresy Routeru"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} je použito pouze pro odchozí spojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP není povolen"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Vaše limity spojení pro přeneos jsou automaticky nastaveny v závislosti na nastavení přenosové rychlosti."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Pro nastavení těchto limitů přidejte nastavení i2np.ntcp.maxConnections=nnn a i2np.udp.maxConnections=nnn na stránce pokročilá nastavení."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definice"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -307,251 +316,258 @@ msgstr "Definice"
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Vzdálený sdíleč určený hashem routru."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Adresář"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Příchozí spojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Odchozí spojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Nabídli nám že nás představí (pomoc ostatním peerům překonat náš firewall)."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Nabídli jsme jim že je představíme (pomoc ostatním peerům překonat firewall za kterým jsou)."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Doba od posledního přijetí / odeslání paketu."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Nečinný"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "příchozí/odchozí"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Průměrná příchozí / odchozí přenosová rychlost."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Před jak dlouhou dobou bylo toto spojení navázáno"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Up"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Zkreslit"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Rozdíl mezi vašim časem a časem peeru."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Okno přetížení, což je jak mnoho bytů může být odesláno bez potvrzení."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Počet odeslaných zpráv čekajících na potvrzení."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Maximální množství souběžných zpráv k odeslání"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Počet nevyřízených odeslání které přesahují okno přetížení."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Pomalý start prahu."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Round trip time v milisekundách"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Časový limit opakovaného přenosu v milisekundách"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Současná maximální velikost odeslaného paketu / předpokládaná velikost přijímaného paketu (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Celkový počet paketů odeslaných "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Celkový počet paketů obdržených od peeru"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Celkový počet paketů znovu přenesených peeru. "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Celkový počet duplikovaných paketů obdržených od peeru."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Služba"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN Obvyklé Nastavení Rozhraní"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Typ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Upstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Downstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP Připojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Externí IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Vrstva 3 je přidávána"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Výchozí Služba Připojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP Připojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet Link Nastavení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Nalezeno Zařízení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Podzařízení"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP Stav"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "UPnP zařízení odpojeno"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP bylo odpojeno. Máte více než jedno UPnP Internet Gateway Device na vaší LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP nenalezlo žádné UPnP aware, kompatibilní zařízení na vaší LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Současná externí IP adresa hlášená UPnP je {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Současná externí IP adresa není dostupná"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP hlásí že maximální míra downstreamu je {0}bits/sec"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP hlásí že maximální míra upstreamu je {0}bits/sec"
@@ -560,67 +576,63 @@ msgstr "UPnP hlásí že maximální míra upstreamu je {0}bits/sec"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} port {1,number,#####} byl úspěšně předán UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} port {1,number,#####} nebyl úspěšně předán UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP není povolen"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Nadměrné zkreslení hodin: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP připojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limit"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Z fronty"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Backlogováno?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Příchozí"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Odchozí"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
@@ -628,213 +640,213 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP připojení"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Třídit podle hashe peeru"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Směr / Úvod"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Seřadit podle příchozí nečinnosti"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Seřadit podle odchozí nečinnosti"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Seřadit podle příchozí rychlosti"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Seřadit podle odchozí rychlosti "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Seřadit podle doby běhu připojení."
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Seřadit podle zkreslení času"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Seřadit podle okna přetížení"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Seřadit podle pomalého startu prahu"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Seřadit podle round trip time"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Seřadit podle časového limitu opakovaného přenosu"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Seřadit podle odchozí maximální přenosové jednotky"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Seředit podle odeslaných paketů"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Seřadit podle přijatých paketů"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Seřadit podle znovu odeslaných paketů "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Seřadit podle paketů obdržených více než jednou"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Nabídli jsme jim že je představíme"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Nabídli nám že nás představí"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Zadušen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 selhání"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} selhání"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Zakázáno"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "Backblogováno"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr ""
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1342,8 +1354,8 @@ msgid "Add Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr ""
 
@@ -1374,9 +1386,9 @@ msgid "Plugin"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr ""
 
@@ -1398,7 +1410,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr ""
 
@@ -1411,7 +1423,7 @@ msgid "Stop"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr ""
@@ -1433,7 +1445,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1443,7 +1455,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1462,6 +1474,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1542,7 +1555,7 @@ msgstr ""
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr ""
 
@@ -1591,7 +1604,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr ""
 
@@ -1610,7 +1623,7 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr ""
 
@@ -1666,8 +1679,8 @@ msgid "UI"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr ""
@@ -1686,15 +1699,15 @@ msgid "Logging"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr ""
 
@@ -1707,7 +1720,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1817,16 +1830,16 @@ msgstr ""
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
@@ -2395,7 +2408,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2404,86 +2417,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr ""
 
@@ -2641,7 +2654,7 @@ msgid "{0} for {1}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr ""
 
@@ -2755,12 +2768,12 @@ msgid "Graph settings saved"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
@@ -2791,17 +2804,17 @@ msgid "I2P Home Page Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
@@ -2811,17 +2824,17 @@ msgid "Router Console"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
@@ -2907,10 +2920,8 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2993,7 +3004,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
@@ -3143,148 +3154,157 @@ msgid "Unpublished"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr ""
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3303,7 +3323,7 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
@@ -3388,7 +3408,7 @@ msgid "Failing"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
@@ -3601,7 +3621,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3654,282 +3674,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr ""
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -4003,43 +4023,43 @@ msgstr ""
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -4047,31 +4067,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4080,40 +4100,40 @@ msgstr ""
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4386,6 +4406,10 @@ msgstr ""
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr ""
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4703,7 +4727,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4791,11 +4815,11 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
@@ -4884,12 +4908,13 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4949,48 +4974,53 @@ msgstr ""
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6178,18 +6208,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_da.po b/apps/routerconsole/locale/messages_da.po
index 63a938df74781b7bbba1f9d907e878094527bb2d..08222d03259a4230a1c2caf10ce254cec39e464b 100644
--- a/apps/routerconsole/locale/messages_da.po
+++ b/apps/routerconsole/locale/messages_da.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/I2P/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -40,7 +40,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -49,7 +49,7 @@ msgstr[1] "{0} sek"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -58,64 +58,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 time"
 msgstr[1] "{0} timer"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "Ikke tingængelig "
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 dag"
 msgstr[1] "{0} dage"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Banned af router hash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Banned af router hash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP forbudt af blocklist.txt indgang {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP'er Forbudt Indtil Genstart"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP'er Permanent Forbudt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Fra"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Til"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "ingen"
 
@@ -125,92 +125,92 @@ msgstr "ingen"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Afviser tunneler: Opstart"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Afviser tunneler: Overdreven besked-forsinkelse "
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Afviser de fleste tunneler: Overdreven antal forspørgsler "
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Afviser tunneler: Begrænsning"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Afviser tunneler: Båndbreddebegrænsning"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Afviser de fleste tunneler: båndbreddebegrænsning"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Acceptere de fleste tunneler"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Acceptere tunneler"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Afviser tunneler: Lukker ned!"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Afviser tunneler"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeder"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Reseed entede kun 1 router."
 msgstr[1] "Reseeder hentede kun {0} routere."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseeding fejlede"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Se {0} for at få hjælp."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "Reseeding konfigurationsside"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseeder: henter seed-URL."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -244,7 +244,7 @@ msgstr "Hvor mange peers vi aktivt snakker med"
 msgid "Known fast peers"
 msgstr "Kendte hurtige peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb indgang"
 
@@ -254,45 +254,54 @@ msgstr "NetDb indgang"
 msgid "No transports (hidden or starting up?)"
 msgstr "Ingen transporter (skjult eller under opstart?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Utilgængelig for alle transporter"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Router Transport Adresse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} bruges kun til udadgående forbindelser"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP er ikke aktiveret."
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Din transport forbindelsesgrænse,er automatisk baseret på din konfigurerede båndbredde. "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "For at tilsidesætte grænsen for ændringen af bearbejdningsdata, skal du tilføje indstillingerne i2np.ntcp.maxConnections = nnn og i2np.udp.maxConnections = nnn på den Avanceret Konfigurationsside."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definationer "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -301,251 +310,258 @@ msgstr "Definationer "
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Fjern-peeren, identificeret af router hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dir"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Indadgående forbindelse "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Udadgående forbindelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "De har tilbudt at introducere os (hjælpe andre peers omgå vores firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Vi tilbød at introducere dem (hjælpe andre peers omgå deres firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Hvor længe siden en pakke blev modtaget / sent"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Hvile"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Ind/Ud"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Den problemfrie indadgående / udadgående overførselshastighed (KBytes per sekund)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Hvor længe siden denne forbindelse blev etableret"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Op"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Skæv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Forskellen på dit og peerens ur"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Overbelastnings vinduet, som er hvor mange bytes der kan sendes uden en kvittering"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Antal sendte beskeder der afventer at blive kvitteret for"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Det maksimale antal samtidige beskeder der kan sendes"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Antallet af ventende afsendelser som overstiger overbelastnings vinduet "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Den langsomme starttilstand"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Fra start til slut i millisekunder"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Den videresendte timeout i millisekunder"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Nuværende maksimale sendte pakkestørrelse / anslået maksimalt modtaget pakkestørrelse (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Det samlede antal af pakker sendt af peeren"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Det samlede antal af pakker modtaget fra peeren"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dub TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Det samlede antal pakker videreudsendes til peeren"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "DUB RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "De samlede antal af gentagene pakker modtaget fra peeren"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN Almindelig Grænseoverflade Konfiguration"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Type"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Upstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Downstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP Forbindelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Oppetid"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Ekstern IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Lag 3 videsending "
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Standard Forbindelses Tjeneste"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP Forbindelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet Link Konfiguration"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Fundet Enhed"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Subenhed"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Deaktiverede UPnP-enheder"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP er blevet deaktiveret, du har mere end en UPnP Internet Gateway Enhed på din LAN forbindelse?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP har ikke fundet nogen UPnP-bevidst kompitabel enhed på din LAN forbindelse."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Den nuværende eksterne IP adresse reporteret af UPnP er {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Den nuværende eksterne IP adresse er ikke tilgængelig."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP reporterer at den maksimale downstream bit hastighed er {0}bits/sek"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP reporterer at den maksimale upstream bit hastighed er {0}bits/sek"
@@ -554,280 +570,276 @@ msgstr "UPnP reporterer at den maksimale upstream bit hastighed er {0}bits/sek"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} port {1,number,#####} blev åbnet af UPnP med succes."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} port {1,number,#####} blev ikke åbnet af UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP er ikke aktiveret."
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Overdreven forskel på ur: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP fobindelser "
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Grænse"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Udadgående kø"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Gemt fra tidligere?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Indadgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Udadgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} peer"
 msgstr[1] "{0} peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP forbindelser"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sorter efter peer hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Retning / Indledning"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sorter efter hvilende indadgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sorter efter hvilende udadgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sorter efter indadgående sats"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sorter efter udadgående sats"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sorter efter forbindelsens oppetid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sorter efter tidsforskel"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sorter efter overbelastnings vindue"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sorter efter langsom starttilstand"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sorter efter tiden fra start til slut"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sorter efter genafsendelses timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sorter efter den maksimale udadgående overførsels-enhed"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sorter efter antal afsendte pakker"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sorter efter antal modtaget pakker"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sorter efter antal videresendte pakker "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sorter efter pakker der er modtaget mere end én gang"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Vi tilbød at indtroducere dem "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "De tilbød at idtoducere os"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Kvalt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 fejl"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} fejle"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Banned"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "backlogged"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Dropper tunnelforespørgsler: For langsom "
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Dropper tunnelforespørgsler: Overbelastede"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Afviser tunneler: Overbelastning af forespørgsler "
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Afviser tunneler: Grænse for forbindelser"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Dropper tunnelforespørgsler: Høj belastning"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Dropper tunnelforespørgsler: Kø tid"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Nyt plugin version {0} er tilgængeligt"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Opdatering for plugin {0} kunne ikke tjekkes"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Der er ingen ny version tilgængelig for plugin {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B overført"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Overfører fil fra {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Opdatering blev downloaded"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Genstarter"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Opdatering mislykkedes"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "fra {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Usigneret opdaterings fil fra {0} er korrupt"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Det mislykkedes at kopiere til {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "In - netværk opdateringer deaktiveret. Tjek pakke manager."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Inge skriverettigheder til I2P installationsmappen."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Du skal først opdatere til version {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Kræver Java version {0} men installeret Java version er {1}"
@@ -1335,8 +1347,8 @@ msgid "Add Client"
 msgstr "Tilføj Klient"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
@@ -1367,9 +1379,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Version"
 
@@ -1391,7 +1403,7 @@ msgstr "Licens"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Hjemmeside"
 
@@ -1404,7 +1416,7 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Check for opdateringer"
@@ -1426,7 +1438,7 @@ msgstr "Slet"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1436,7 +1448,7 @@ msgstr "Slet valgte"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1455,6 +1467,7 @@ msgstr "Gendanne standarder"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1535,7 +1548,7 @@ msgstr "Ugyldig destination"
 msgid "Log overrides updated"
 msgstr "Log tilsidesætter opdateret log"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Log konfiguration gemt"
 
@@ -1584,7 +1597,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1603,7 +1616,7 @@ msgid "Home Page"
 msgstr "Hjemmeside"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Netværk"
 
@@ -1659,8 +1672,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunneler"
@@ -1679,15 +1692,15 @@ msgid "Logging"
 msgstr "Logning"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peers"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "statistik"
 
@@ -1700,7 +1713,7 @@ msgstr "Avanceret"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1810,16 +1823,16 @@ msgstr "Opdaterer båndbredde delingsprocent"
 msgid "Updated bandwidth limits"
 msgstr "Opdaterer båndbredde grænse"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits per sekund"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "eller maksimalt {0} bytes per måned "
@@ -2385,7 +2398,7 @@ msgstr "Brugernavn"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Tilføje"
 
@@ -2394,86 +2407,86 @@ msgstr "Tilføje"
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Opdatere eller tjek forvejen i gang"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Der er en tilgængelig opdatering, prøver at downloade."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Der er en tilgængelig opdatering, klik på knappen til venstre for at downloade."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Der er ingen tilgængelige opdateringer"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Opdatering af nyhedsURL til {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Opdatering af proxyvært til {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Opdatering af proxyport til {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Opdaterer opdateringsfrekvens {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Opdatering af opdateringspolicy til {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Opdaterer opdaterings URLer."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Opdaterer betroede nøgler."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Opdaterer usigneret opdateringsURL til {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Enhver"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Notificer kun"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Download og verificer kun"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Download, verificer og genstart"
 
@@ -2631,7 +2644,7 @@ msgid "{0} for {1}"
 msgstr "{0} for {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Båndbreddeforbrug"
 
@@ -2745,12 +2758,12 @@ msgid "Graph settings saved"
 msgstr "Graf indstillinger blev gemt"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Adressebog"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Hold styr på din I2P host-fil her (I2P domænenavns vedtagelse)"
 
@@ -2781,17 +2794,17 @@ msgid "I2P Home Page Configuration"
 msgstr "I2P Hjemmesidekonfiguration"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonym webmail klient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Router Hjælp"
 
@@ -2801,17 +2814,17 @@ msgid "Router Console"
 msgstr "Router Konsol"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Indbygget anonym BitTorrent klient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Lokal webserver"
 
@@ -2897,10 +2910,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Teknisk dokumentation"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "Enkel og hurtig mikroblogging website"
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2983,7 +2994,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Din browser er ikke korrekt konfigueret til at bruge HTTP proxyn på {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Navn"
 
@@ -3133,148 +3144,157 @@ msgid "Unpublished"
 msgstr "ikke publiceret"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destination"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Udløber om {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Udløbet for {0} siden"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Ikke initialiseret"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Netværksdatabase Router statistik"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Antal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Land"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Vores information"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Peer information for"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Hele posten"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Gemt"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Opdateret"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} siden"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publiceret"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adresse(r)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "omkostninger"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Gemt eller under opstart"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU med introdutører   "
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP og SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP og SSU med introdutører"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 kun SSU, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 kun NTCP, SSU, introducers"
 
@@ -3293,7 +3313,7 @@ msgid "Hide news"
 msgstr "Skjul nyheder"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Vis nyheder"
 
@@ -3374,7 +3394,7 @@ msgid "Failing"
 msgstr "Svigtende"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integreret"
 
@@ -3587,7 +3607,7 @@ msgid "Lifetime average frequency"
 msgstr "Levetid gennemsnitsfrekvens"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3638,282 +3658,282 @@ msgstr "Diagram data"
 msgid "Graph Event Count"
 msgstr "Diagram over antal hændelser"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Eksporter Data som XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Livstids gennemsnitsværdi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Router Hjælp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Hjælp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Konfigurer opstart af klienter og webapps (tjenester); manuel start af hvilende tjenester"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P tjenester"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Konfigurer I2P Router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P Internt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Se eksisterende tunneler og status på tunneler som bygges"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Vis alle de nuværende klient forbindelser"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Vis seneste klient ydelsesprofiler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Vis liste over kendte I2P routere"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Sundheds Rapport"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Logs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Graf over routerens ydelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Grafer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Tekstbaseret statistik over routerens ydelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Lokale destinationer"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Genarelt "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Din lokale identitet er din unike I2P router identitet, tilsvarande en ip adresse men tilpasset I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Aldrig vidaregive dette til nogen, da det kan afsløre din rigtige ip-adresse."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Lokal Identitet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Din unikke I2P router identitet er"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "afslør aldrig denne for nogen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "vis"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Den version af I2P som vi kører."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Hvor længe vi har været i gang i denne session"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Oppetid"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Hjælp med konfiguration af firewall og router for den optimale I2P ydelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Konfigurere I2P Opdateringer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P Opdatering"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Peers som vi snakket med de sidste minutter/ sidste time"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Antallet af peers til rådighed at bygge klienttunneler "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Hurtig"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Antallet af peers til rådighed at bygge sonderende tunneler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Høj kapacitet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Antallet af peers til rådighed for forespørgsler til netværksdatabasen "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Det samlade antal peers i vores netværkdatabase"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Kendte"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Konfigurer routerens båndbredde bevilling "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Båndbredde ind/ud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Used"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Bruges til opbygning og afprøvning af tunneler, og kommunikation med floodfill peers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Udforskende"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunneler, vi bruger til at levere eller få adgang til tjenester på netværket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunneler vi deltager i, og direkte bidrager med båndbredde til netværket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Deltagende"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "Forholdet mellem tunnel hops vi leverer med tunnel hops vi bruger - en værdi større end 1.00 indikerer et positivt bidrag til netværket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Del-ratio "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Hvad er der i routerens jobkø?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Overfyldning"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indikerer routerens ydeevne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Arbejdsforsinkelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indikerer hvor hurtigt udgående beskeder til andre i2P routere er sendt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Besked fosinkelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Tiden for en tunneltest fra start til slut"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tunnel forsinkelse"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "Kø anmodninger fra andre routere til at deltage i tunneler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Efterslæb"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Nyheder &amps; Opdateringer"
 
@@ -3987,43 +4007,43 @@ msgstr "ERR-UDP Deaktiveret og Indadgående TCP vært / port er ikke indstillet"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN-Bag en Firewall med deaktiveret UDP"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Tilføj/fjern/ændre &amp; kontroller din klient og server tunneler"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Vis tunneler"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Leasingkontrakter udløbet"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Genopbygger"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "siden"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Klar"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Opbygger"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Opbygger tunneler"
 
@@ -4031,31 +4051,31 @@ msgstr "Opbygger tunneler"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "delte klienter "
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Klik på Genstart for at installere"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Klik på Luk Ned og Genstart for at installerer"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Opdatering tilgængelig"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Download {0} Opdatering"
@@ -4064,40 +4084,40 @@ msgstr "Download {0} Opdatering"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Download usigneret<br>Opdatering {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Hjælp med konfiguration af firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Tjek NAT/firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "rækkefølge    "
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Top"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Ned"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Bund"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Vælg et felt til at tilføje"
 
@@ -4370,6 +4390,10 @@ msgstr "Kryptering"
 msgid "i2cp"
 msgstr "i2cp "
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPoo"
@@ -4687,7 +4711,7 @@ msgstr "Avanceret network konfigurationsside"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4775,13 +4799,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Deaktiveret - Klienter udenfor denne Java process kan muligvis ikke forbinde sig."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP Port"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP brugergrænseoverflade"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP Port"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorasition "
@@ -4868,13 +4892,14 @@ msgid "Search Engines"
 msgstr "Søgemaskiner"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Anbefalede Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Lokale tjenester"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4933,48 +4958,53 @@ msgstr "Konfigurer I2P logging indstillinger"
 msgid "Log file"
 msgstr "Logging filnavn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(symbolet '@' vil blive skiftet ud under log rotation)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Log post format"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(brug 'd' = dato, 'c' = class, 't' = tråd, 'p' = prioritet, 'm' = meddelelse)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Log dato format"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = måned, 'dd' = dag, 'HH' = time, 'mm' = minut, 'ss' = sekund, 'SSS' = milisekund)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Maksimal log fil størrelse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Standard log niveau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG og INFO er ikke anbefalede standardindstillinger, da de drastisk vil nedsætte hastigheden på din router."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Log niveau brud"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nyt brud"
 
@@ -6162,18 +6192,6 @@ msgstr "Klik på et flag for at vælge et sprog. Klik 'konfigurer sprog' nedenfo
 msgid "Search I2P"
 msgstr "Søg I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Eepsites af interesse"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "i2p tunnel manager"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "I2P Tunnel Manager"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar File Dump"
diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po
index 8119017b99abaf63e6bb8489aae5f27fec6d236c..183ed03115126b20899b93daa088d855fdc1dddc 100644
--- a/apps/routerconsole/locale/messages_de.po
+++ b/apps/routerconsole/locale/messages_de.po
@@ -11,7 +11,7 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 # foo <foo@bar>, 2009
-# Lars Schimmer <echelon@i2pmail.org>, 2014
+# Lars Schimmer <echelon@i2pmail.org>, 2014-2015
 # Ashoka <martin.tastler@posteo.de>, 2013
 # mixxy, 2011
 # nextloop <ga25day@mytum.de>, 2013
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-23 09:09+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-10 13:58+0000\n"
 "Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -51,7 +51,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -60,7 +60,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -69,64 +69,64 @@ msgstr[1] "{0} Minuten"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 Stunde"
 msgstr[1] "{0} Stunden"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "nicht verfügbar"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "einen Tag"
 msgstr[1] "{0} Tage"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Gesperrt über Routerprüfsumme: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Gesperrt über Routerprüfsumme"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP gesperrt wegen blocklist.txt-Eintrags {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "bis zum Neustart gesperrte IP's"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "permanent gesperrte IP's"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Von"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "An"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "keine"
 
@@ -136,92 +136,92 @@ msgstr "keine"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Weise Tunnelanfragen ab: Initialisieren"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Weise Tunnelanfragen zurück: hohe Nachrichtenlatenz"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Weise Tunnelanfragen zurück: hohe Anzahl an Anfragen"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Weise Tunnelanfragen zurück: Begrenzung erreicht"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Weise Tunnelanfragen zurück: Bandbreitenbeschränkung erreicht"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Weise die meisten Tunnelanfragen zurück: Bandbreitenbeschränkung erreicht"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Akzeptiere die meisten Tunnelanfragen"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Akzeptiere Tunnelanfragen"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Weise Tunnelanfragen zurück: Beende Router"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Weise Tunnelanfragen zurück"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeden"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Nur Daten eines Routers per Reseed erhalten"
 msgstr[1] "Nur {0} Routerinformationen per Reseed erhalten"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed fehlgeschlagen"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Für Hilfe, siehe {0}!"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "Einstellungen für das Reseeden"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseed: Hole die Seed-URL"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -255,7 +255,7 @@ msgstr "Anzahl aktiver Teilnehmer mit denen wir reden"
 msgid "Known fast peers"
 msgstr "bekannte schnelle Teilnehmer"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetzDB-Eintrag"
 
@@ -265,45 +265,54 @@ msgstr "NetzDB-Eintrag"
 msgid "No transports (hidden or starting up?)"
 msgstr "Keine Transporte (Versteckter Modus oder Start?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Nicht unterstützter Signaturtyp"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Unerreichbar auf allen Transporten"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Router-Transport-Adresse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} wird nur für ausgehende Verbindungen genutzt"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP ist nicht aktiviert."
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Ihre Verbindungseinstellungen werden, basierend auf der von Ihnen zur Verfügung gestellten Bandbreite, automatisch vorgenommen."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Um diese Einstellungen zu umgehen, fügen Sie folgende Einstellungen der Seite \"Erweiterte Einstellungen\" hinzu: i2np.ntcp.maxConnections=nnn und i2np.udp.maxConnections=nnn"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definitionen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -312,251 +321,258 @@ msgstr "Definitionen"
 msgid "Peer"
 msgstr "Teilnehmer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Der entfernte Teilnehmer, über seine Router-Prüfsumme erkannt"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Richtung"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "eingehende Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "ausgehende Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Sie boten an, uns bekannt zu machen (anderen Teilnehmern helfen, unsere Firewall zu überwinden)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Wir bieten an, sie bekannt zu machen (anderen Teilnehmern helfen, ihre Firewall zu überwinden)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "vergangene Zeit seit ein Paket empfangen/gesendet wurde"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "untätig"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "ein-/ausgehend"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Die geglättete ein-/ausgehende Transferrate (KBytes pro Sekunde)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "wie lange die Verbindung schon besteht"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "verbunden"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Differenz"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Unterschied zwischen Ihrer und der Uhr des Teilnehmers"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Der Pufferspeicher, der angibt, wieviele Bytes Sie ohne Bestätigung senden können"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Anzahl der gesendeten Nachrichten, die auf Bestätigung warten"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "maximale Anzahl von gleichzeitig sendbaren Nachrichten"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Anzahl der ausstehenden Sendeanforderungen, die den Pufferspeicher überschreiten."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Grenzwert zum verzögertem Starten"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Rundenzeit zum Server und zurück in Millisekunden"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Timeout beim erneuten Senden (in Millisekunden)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "derzeit maximale Größe der gesendeten Pakete / geschätzte maximale Größe der empfangenen Pakete (Bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "gesendet"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Gesamtanzahl der an den Teilnehmer gesendeten Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "empfangen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Gesamtanzahl der vom Teilnehmer empfangenen Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "mehrfach gesendet"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Gesamtanzahl der an den Teilnehmer erneut gesendeten Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "mehrfach empfangen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Gesamtanzahl der vom Teilnehmer erneut empfangenen Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Einstellungen des WAN Common Interface"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Typ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Upstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Downstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN-PPP-Verbindung"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Laufzeit"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "externe IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Schicht-3-Weiterleitung"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Standardverbingungsservice"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN-IP-Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Einstellunfen zur WAN-Ethernet-Verbindung"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Gerät gefunden"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Untergerät"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP-Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Deaktivierte UPnP Geräte"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP wurde deaktiviert; Hast du mehr als ein UPnP-Internet-Gateway in deinem LAN ?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP hat keine UPnP-fähigen, kompatiblen Geräte in deinem LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Die gegenwärtige von UPnP gemeldete externe IP-Adresse ist {0}."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Die gegenwärtige externe IP-Adresse steht nicht zur Verfügung."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP meldet eine maximale Downstream-Bitrate von {0} bits/s."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP meldet eine maximale Upstream-Bitrate von {0} bits/s."
@@ -565,280 +581,276 @@ msgstr "UPnP meldet eine maximale Upstream-Bitrate von {0} bits/s."
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} Port {1,number,#####} wurde erfolgreich durch UPnP weitergeleitet."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} Port {1,number,#####} wurde nicht per UPnP weitergeleitet."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP ist nicht aktiviert."
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "zu hohe Abweichung der Uhrzeit: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP-Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "obere Grenze"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Ausgehende Warteschlange"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Rückstau"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "ankommend"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "abgehend"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} Teilnehmer"
 msgstr[1] "{0} Teilnehmer"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP-Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Nach Router-Prüfsumme sortieren"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Richtung/Bekanntmachung"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sortieren nach untätigen eingehenden Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sortieren nach untätigen ausgehenden Verbindungen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sortieren nach eingehender Transferrate"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sortieren nach ausgehender Transferrate"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sortieren nach Lebensdauer der Verbindung"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sortieren nach Zeitunterschied"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sortieren nach Größe des Pufferspeichers"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sortieren nach Grenzwert des verzögerten Startens"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sortieren nach Rundenzeit"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sortieren nach Timeout beim erneuten Senden"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sortieren nach maximaler ausgehender Transferpaketgröße"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sortieren nach Anzahl gesendeter Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sortieren nach Anzahl empfangener Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sortieren nach Anzahl erneut gesendeter Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sortieren nach Anzahl mehrfach empfangener Pakete"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Wir bieten an, diese bekannt zu machen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Diese boten an, uns bekannt zu machen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "gedrosselt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 Fehler"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} fehlgeschlagen"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Gesperrt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "im Rückstand"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Ignoriere Tunnelanfragen: zu langsam"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Ignoriere Tunnelanfragen: überlastet"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr "Weise Tunnel ab: Versteckter Modus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Weise Tunnelanfragen zurück: Überlast an Anfragen"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Weise Tunnelanfragen zurück: Verbindungslimit erreicht"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Ignoriere Tunnelanfragen: Hohe Last"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Ignoriere Tunnelanfragen: zu lange Warteschlange"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Neue Version des Zusatzprogramms ist verfügbar ({0})"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Überprüfung auf neue Version des Zusatzprogramms {0} fehlgeschlagen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Keine neue Version des Zusatzprogrammes {0} verfügbar"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}Bytes übertragen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Übertragung von {0} fehlgeschlagen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Aktualisierung heruntergeladen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Starte neu"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Aktualisierung verifiziert"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "von {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Unsignierte Aktualisierungsdatei von {0} ist fehlerhaft"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Kopieren nach {0} fehlgeschlagen"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "In-Netzwerk Updates deaktiviert. Schauen Sie im Paket Manager nach."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Keine Schreibberechtigung im I2P Installations Verzeichnis."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Sie müssen zuerst auf Version {0} upgraden."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Benötigt Java Version {0}, Sie haben aber Java Version {1} installiert"
@@ -1346,8 +1358,8 @@ msgid "Add Client"
 msgstr "Klienten hinzufügen"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
@@ -1378,9 +1390,9 @@ msgid "Plugin"
 msgstr "Zusatzprogramm"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Version"
 
@@ -1402,7 +1414,7 @@ msgstr "Lizenz"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Webseite"
 
@@ -1415,7 +1427,7 @@ msgid "Stop"
 msgstr "Stopp"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Auf Aktualisierungen prüfen"
@@ -1437,7 +1449,7 @@ msgstr "löschen"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1447,7 +1459,7 @@ msgstr "Lösche ausgewähltes"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1466,6 +1478,7 @@ msgstr "Auf Standardwerte zurücksetzen"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1546,7 +1559,7 @@ msgstr "ungültiges Ziel"
 msgid "Log overrides updated"
 msgstr "Zusatzoptionen zu Berichten aktualisiert"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Einstellungen der Berichte gespeichert."
 
@@ -1595,7 +1608,7 @@ msgstr "WARNUNG"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1614,7 +1627,7 @@ msgid "Home Page"
 msgstr "Homepage"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -1670,8 +1683,8 @@ msgid "UI"
 msgstr "Benutzerschnittstelle"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnel"
@@ -1690,15 +1703,15 @@ msgid "Logging"
 msgstr "Statusmeldungen"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Teilnehmer"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistiken"
 
@@ -1711,7 +1724,7 @@ msgstr "Erweitert"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1821,16 +1834,16 @@ msgstr "Aktualisiere den Anteil der zur Verfügung gestellten Bandbreite"
 msgid "Updated bandwidth limits"
 msgstr "Aktualisiere die Bandbreitenlimits"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "Bits pro Sekunde"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "oder maximal {0} Bytes im Monat"
@@ -2396,7 +2409,7 @@ msgstr "Benutzername"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -2405,86 +2418,86 @@ msgstr "Hinzufügen"
 msgid "Password"
 msgstr "Passwort"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Es wird bereits auf Aktualisierungen geprüft."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Aktualisierung verfügbar; versuche, diese herunterzuladen"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Aktualisierung verfügbar. Klick auf den Knopf links, um sie herunterzuladen!"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Keine Aktualisierung verfügbar"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Aktualisiere die Adresse für Benachrichtigungen auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Aktualisiere Proxyserver auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Aktualisiere den Port des Proxys auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Aktualisiere die Häufigkeit des Neuladens auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nie"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Aktualisiere die Aktualisierungsrichtlinien auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Aktualisiere die Aktualisierungsadressen auf"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Aktualisiere die vertrauten Schlüssel"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Aktualisiere die Adresse der unsignierten Aktualisierungsdatei auf {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Alle"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Nur benachrichtigen"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Nur herunterladen und überprüfen"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Herunterladen, überprüfen und neustarten"
 
@@ -2642,7 +2655,7 @@ msgid "{0} for {1}"
 msgstr "{0} für {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Bandbreitennutzung"
 
@@ -2756,12 +2769,12 @@ msgid "Graph settings saved"
 msgstr "Einstellungen zu Grafiken gespeichert"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Adressbuch"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Verwalten Sie Ihre I2P-Adressen hier (I2P-Namensauflösung)"
 
@@ -2792,17 +2805,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Konfiguration der I2P-Homepage"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Webmail-Klient für anonyme E-Mail"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Hilfe zum I2P-Router"
 
@@ -2812,17 +2825,17 @@ msgid "Router Console"
 msgstr "I2P-Routerkonsole"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Integrierter anonymer BitTorrent-Klient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "BitTorrent"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Lokaler Webserver"
 
@@ -2908,10 +2921,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Technische Dokumentation"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "einfache und schnelle MicroBlog-Website"
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2994,7 +3005,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Dein Browser ist nicht richtig konfiguriert, um den HTTP-Proxy auf {0} zu benutzen"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Name"
 
@@ -3144,148 +3155,157 @@ msgid "Unpublished"
 msgstr "unveröffentlicht"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Ziel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Zum lokalen Adressbuch hinzufügen"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Wird in {0} ungültig"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Wurde vor {0} ungültig"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Schnittstelle"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Nicht initialisiert"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Netzwerkdatenbank Routerstatistiken"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Anzahl"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transporte"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Land"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Informationen über uns"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Informationen über den Teilnehmer"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Ganzer Eintrag"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "vor {0}"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Signierungsschlüssel"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adresse(n)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "Kosten"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Versteckt oder Startphase"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU mit Hilfsrouter"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP und SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP und SSU mit Hilfsrouter"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "nur IPv6 SSU, Introducer"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSu"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, Introducer"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, Introducer"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "nur IPv6 NTCP, SSU, Introducer"
 
@@ -3304,7 +3324,7 @@ msgid "Hide news"
 msgstr "Neuigkeiten verstecken"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Neuigkeiten anzeigen"
 
@@ -3385,7 +3405,7 @@ msgid "Failing"
 msgstr "fehlgeschlagen"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "integriert"
 
@@ -3598,7 +3618,7 @@ msgid "Lifetime average frequency"
 msgstr "durchschnittliche Häufigkeit über Lebenszeit"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3649,282 +3669,282 @@ msgstr "Daten graphisch darstellen"
 msgid "Graph Event Count"
 msgstr "Ereignisse graphisch darstellen"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Daten als XML exportieren"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Durchschnitt über Lebenszeit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "Hilfe zum I2P-Router &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Hilfe &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Autostart-Einstellungen der Klienten und WebApplikationen (Services); manuelles Starten der ruhenden Services"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P-Dienste"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Konfiguration des I2P-Routers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Einstellungen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Betrachte die existierenden Tunnel und den Status des Tunnelaufbaus"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Zeige alle bestehenden Verbindungen zu Teilnehmern"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Zeige aktuelle Leistungsprofile der Teilnehmer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Eine Liste aller bekannten I2P-Router anzeigen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetzDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Gesundheitszustand"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Statusberichte"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Graphische Darstellung der Routerleistung"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Graphen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Statistiken über die Leistung des Routers in Textform"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "lokale Ziele"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr "Lokale Tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "Verwaltung der versteckten Services"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Grundsätzliches"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Deine lokale Identität ist deine einzigartige I2P-Routeridentität, ähnlich einer IP-Adresse, jedoch speziell für I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Gib dies niemals irgendjemandem preis, es könnte deine echte IP-Adresse verraten."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "lokale Identität"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Ihre eindeutige I2P-Routeridentifikation ist"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "Verraten Sie sie niemandem!"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "anzeigen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Dies ist die Version von I2P, die aktuell läuft."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Wie lange ist der I2P-Router seit dem letztem Neustart aktiv"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Laufzeit"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Hilfe bei der Konfiguration Ihrer Firewall und Ihres Routers für eine optimale Leistung."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "Mehr Informationen sind im Wiki verfügbar"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Warnung: ECDSA ist nicht verfügbar. Aktualisieren Sie Ihr Java oder Betriebssystem"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Einstellungen zur Aktualisierung"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P-Aktualisierung"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Teilnehmer mit denen wir in den letzen Minuten / Stunden kommuniziert haben"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "aktiv"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Anzahl der für den Aufbau von Klient-Tunneln verfügbaren Teilnehmer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "schnell"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Anzahl der für den Aufbau von Erkundungstunneln verfügbaren Teilnehmer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "hohe Kapazität"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Anzahl der Teilnehmer, die für Anfragen an die Netzwerk-Datenbank zur Verfügung stehen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Gesamtanzahl an Teilnehmern in unserer Netzwerk-Datenbank"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "bekannt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Konfigurieren der Bandbreitenzuweisung des Routers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Bandbreite ein-/ausgehend"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "gesamt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "genutzt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "benutzt zum Aufbau und Testen von Tunneln, sowie der Kommunikation mit Floodfill-Teilnehmern"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Erkundung"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunnel, die wir zur Verfügung stellen oder nutzen, um auf Dienste im Netzwerk zuzugreifen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunnel an denen wir teilnehmen und über die wir direkt Bandbreite für das Netzwerk zur Verfügung stellen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "teilnehmend an"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 " Verhältnis der Tunnelsprünge, die wir dem Netz zur Verfügugn stellen, zu denen, die wir selbst benutzen - ein Wert größer als 1,00 bedeutet einen positiven Beitrag zum I2P-Netzwerk"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Kooperationsfaktor"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Was ist in der Aufgabenliste des Routers?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Aufgaben"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "zeigt die gegenwärtige Leisutng des Routers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Aufgabenverzug"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "zeigt, wie schnell Nachrichten an andere I2P-Router gesendet werden"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Nachrichtenverzug"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Hin- und Rücklaufzeit für einen Tunneltest"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tunnelverzug"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "wartende Anfragen anderer Router zur Teilnahme in deren Tunneln"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Anfragenrückstau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Benachrichtigungen &amp; Aktualisierungen"
 
@@ -3998,43 +4018,43 @@ msgstr "FEHLER: UDP deaktiviert und eingehender TCP/IP-Port nicht gesetzt"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARNUNG: Firewall aktiv und UDP deaktiviert"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Klienten- und Servertunnel hinzufügen, löschen oder bearbeiten"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "Versteckte Services"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Zeige Tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Leases abgelaufen"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Baue wieder auf"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "vor"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Bereit"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Baue auf"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Baue Tunnel auf"
 
@@ -4042,31 +4062,31 @@ msgstr "Baue Tunnel auf"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "versch. Klienten"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Klicken Sie auf Neustart zum Installieren der"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Klicken Sie zum Installieren auf Herunterfahren und Neustarten"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Update verfügbar"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Aktualisierung herunterladen ({0})"
@@ -4075,40 +4095,40 @@ msgstr "Aktualisierung herunterladen ({0})"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "unsignierte Aktualisierung herunterladen: {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Hilfe bei der Firewalleinstellung"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Überprüfe die Netzwerkverbindung und deine NAT/Firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Hole neue Teilnehmerinformationen"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "ganz oben"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "runter"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "ganz unten"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Markiere eine Sektion zum Hinzuzufügen"
 
@@ -4381,6 +4401,10 @@ msgstr "Verschlüsselung"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "Pool im Netz"
@@ -4698,7 +4722,7 @@ msgstr "Erweiterte Netzwerkeinstellungen"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4786,13 +4810,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Deaktiviert - Klienten außerhalb dieses Javaprozesses können sich nicht verbinden"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP-Port"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP-Interface"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP-Port"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorisation"
@@ -4879,13 +4903,14 @@ msgid "Search Engines"
 msgstr "Suchmaschinen"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Empfohlene Eepseiten"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "Interessante versteckte Services"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Lokale Dienste"
+msgid "Applications and Configuration"
+msgstr "Anwendungen und Konfiguration"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4944,48 +4969,53 @@ msgstr "Richte I2P-Berichte ein"
 msgid "Log file"
 msgstr "Logdatei"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "Editiere {0} zum Ändern"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(Das Zeichen '@' wird bei der Rotation der Berichtedatei ersetzt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Format der Berichtedatei"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(Benutzen Sie 'd' = Datum, 'c' = Klasse, 't' = Thread, 'p' = Priorität, 'm' = Nachricht)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Datumsformat der Berichte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = Monat, 'dd' = Tag, 'HH' = Stunde, 'mm' = Minute, 'ss' = Sekunde, 'SSS' = Millisekunde)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "max. Dateigröße der Berichte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Standardlevel für Berichte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG und INFO sind nicht empfohlen, da diese den Router drastisch verlangsamen)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Berichtelevel - Sonderoptionen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Neue Zusatzoption"
 
@@ -6173,18 +6203,6 @@ msgstr "Klicke auf eine Fahne, um eine Sprache auszuwählen, Klicke 'Spracheinst
 msgid "Search I2P"
 msgstr "Durchsuche I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Interessante Eepsites"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "I2P-Tunnel-Verwalter"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "I2P-Tunnel-Verwalter"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "JAR-Dateien"
diff --git a/apps/routerconsole/locale/messages_el.po b/apps/routerconsole/locale/messages_el.po
index ae2a84c7b9c1b3a29d1bac6a7e5c2f3ad493e000..cb7f39669037981a89fa20106ec4facfef290f76 100644
--- a/apps/routerconsole/locale/messages_el.po
+++ b/apps/routerconsole/locale/messages_el.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[1] "{0,number,####} μιλιδευτερόλεπτα"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -50,7 +50,7 @@ msgstr[1] "{0} δευτ"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -59,64 +59,64 @@ msgstr[1] "{0} λεπτ"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 ώρα"
 msgstr[1] "{0} ώρες"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "Μ/Δ"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 μέρα"
 msgstr[1] "{0} μέρες"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Αποκλεισμένο σύμφωνα από το router hash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Αποκλεισμένο σύμφωνα από το router hash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "Η IP έχει αποκλειστεί από την εγγραφή {0} στο blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "Οι IP έχουν αποκλειστεί μέχρι την επανεκκίνηση"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Οι IP έχουν αποκλειστεί μόνιμα"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Από"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Σε"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr ""
 
@@ -126,92 +126,92 @@ msgstr ""
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Απόρριψη τούνελ: Εκκίνηση"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Απόρριψη τούνελ : Υψηλή καθυστέρηση μηνύματος"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Απόρριψη των περισσοτέρων τούνελ : Υψηλός αριθμός αιτήσεων"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Απόρριψη τούνελ: Επίτευξη ορίου"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Απόρριψη τούνελ : Όριο εύρους ζώνης"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Απόρριψη των περισοτέρων τούνελ : Όριο εύρους ζώνης"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Αποδοχή των περισσοτέρων τούνελ"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Αποδοχή τούνελ"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Απόρριψη τούνελ : Κλείσιμο"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Απόρριψη τούνελ"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, 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:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Δείτε {0} για βοήθεια."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -245,7 +245,7 @@ msgstr "Με πόσους ομότιμους μιλάμε ενεργά"
 msgid "Known fast peers"
 msgstr "Γνωστοί fast peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "εγγραφή στην NetDB"
 
@@ -255,45 +255,54 @@ msgstr "εγγραφή στην NetDB"
 msgid "No transports (hidden or starting up?)"
 msgstr "Κανένας μεταφορέας (κρυφοί ή κατά την εκκίνηση;)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Μη προσβάσιμο από κανένα μεταφορέα"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Διευθύνσεις Μεταφορέων Δρομολογητή"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} χρησιμοποιείται για εξερχόμενες συνδέσεις μονο"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "Το UPnP δεν είναι ενεργοποιημένο"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Τα όρια συνδεσιμότητας μεταφορέων ορίζονται αυτόματα βάση της παραμέτρου εύρους ζώνης."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Για να θέσετε δικά σας όρια, προσθέστε τα i2np.ntcp.maxConnections=nnn και i2np.udp.maxConnections=nnn στη σελίδα προχωρημένης παραμετροποίησης."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Ορισμοί"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -302,251 +311,258 @@ msgstr "Ορισμοί"
 msgid "Peer"
 msgstr "Ομότιμος"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Ο απομακρυσμένος ομότιμος, αναγνωρισμένος από το router hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Κατάλογος"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Εισερχόμενη σύνδεση"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Εξερχόμενη σύνδεση"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Προσφέρθηκαν να μας συστήσουν (βοηθήσουν άλλους ομότιμους να διασχίσουν το τείχος προστασίας μας)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Προσφερθήκαμε να βοηθήσουμε (βοηθήσουμε άλλους ομότιμους να διασχίσουν το τείχος προστασίας τους)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Χρονικό διάστημα από την λήψη/αποστολή πακέτου"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Αδρανής"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Μέσα/Έξω"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Ομογενοποιημένος ρυθμός μεταφοράς εισερχομενων / εξερχόμενων δεδομένων (KBytes ανα δευτερόλεπτο)."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Χρονικό διάστημα από την εγκαθίδρυση αυτής της σύνδεσης"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Πάνω"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Απόκλιση"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Η διαφορά ανάμεσα στο ρολόι του ομοτίμου και το δικό σας"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Το παράθυρο συμφόρησης, το οποίο είναι ο αριθμός των bytes που μπορούν να σταλούν χωρίς αναγνώριση"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Ο αριθμός των απεσταλμένων μηνυμάτων που περιμένου αναγνώριση"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Ο μέγιστος αριθμός ταυτόχρονων μηνυμάτων προς αποστολή"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Ο αριθμός των αποστολών σε αναμονή που υπερβαίνουν το παράθυρο συμφόρησης"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Το κατώφλι αργής εκκίνησης"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr ""
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Το όριο χρόνου επαναμετάδοσης σε χιλιοστά του δευτερολέπτου"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Τρέχον μέγιστο μέγεθος πακέτου αποστολής / εκτιμώμενο μέγιστο μέγεθος πακέτου λήψης (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "Αποστολή"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Συνολικός αριθμός πακέτων που εστάλησαν στον ομότιμο"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "Λήψη"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Συνολικός αριθμός πακέτων που ελήφθησαν από τον ομότιμο"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Ταυτόσημες TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Συνολικός αριθμός πακέτων που επανεστάλησαν στον ομότιμο"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Ταυτόσημες RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Συνολικός αριθμός διπλότυπων πακέτων που ελήφθησαν από τον ομότιμο"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Τύπος"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Σύνδεση WAN PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Εξωτερική IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Προώθηση επιπέδου 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Σύνδεση WAN IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Κατάσταση UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -555,280 +571,276 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "Το UPnP δεν είναι ενεργοποιημένο"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Εκεταμένη απόκλιση ρολογιού: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP συνδέσεις"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Όριο"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Λήξη Χρόνου"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Ουρά εξερχομένων"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Εισερχόμενα"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Εξερχόμενα"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP συνδέσεις"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Ταξινόμηση σύμφωνα με το hash του ομότιμου"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Κατεύθυνση/Εισαγωγή"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Ταξινόμηση σύμφωνα την αδρανή εισερχόμενη"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Ταξινόμηση σύμφωνα την αδρανή εξερχόμενη"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Ταξινόμηση σύμφωνα με ρυθμό εισερχομένων"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Ταξινόμηση σύμφωνα με ρυθμό εξερχομένων"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Ταξινόμηση σύμφωνα με το χρόνο της σύνδεσης"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Ταξινόμηση σύμφωνα με την απόκλιση ρολογιού"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Ταξινόμηση σύμφωνα με το παράθυρο συμφόρησης"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Ταξινόμηση σύμφωνα με το κατώφλιο αργής εκκίνησης"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Ταξινόμηση σύμφωνα με τα απεσταλμένα πακέτα"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Ταξινόμηση σύμφωνα με τα ληφθέντα πακέτα"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Ταξινόμηση σύμφωνα με τον αριθμό πακέτων που επαναμεταδόθηκαν"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Ταξινόμηση σύμφωνα με τον αριθμό των πακέτων που ελήφθησαν πάνω από μια φορά"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Προσφερθήκαμε να τους εισάγουμε"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Προσθέρθηκαν να μας εισάγουν"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 αποτυχία"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} αποτυχίες"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Αποκλεισμένος"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Απόρριψη αιτημάτων για τούνελ: Καθυστέρηση"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Απόρριψη αιτημάτων για τούνελ: Υπερφόρτωση"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Απόρριψη τούνελ: Υπερφόρτωση αιτημάτων"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Απόρριψη τούνελ: Όριο συνδέσεων"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Απόρριψη αιτημάτων για τούνελ: Υψηλό φορτίο"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Απόρριψη αιτημάτων για τούνελ: Χρόνος ουράς αναμονής"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Νέα έκδοση πρόσθετου {0} διαθέσιμη"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Ο έλεγχος για ενημέρωσεις του πρόσθετου {0} απέτυχε"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Δεν υπάρχει νέα έκδοση διαθέσιμη για το πρόσθετο {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} Bytes μεταφέρθηκαν"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Μεταφορά από {0} απέτυχε"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Η ενημέρωση κατέβηκε"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Γίνεται επανεκκίνηση"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Η ενημέρωση επαληθεύτηκε"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "από {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Το μη υπογεγραμμένο αρχείο ενημέρωσης από {0} είναι κατεστραμμένο"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Αντιγραφή από {0} απέτυχε"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1336,8 +1348,8 @@ msgid "Add Client"
 msgstr "Προσθήκη Πελάτη"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Πελάτης"
 
@@ -1368,9 +1380,9 @@ msgid "Plugin"
 msgstr "Πρόσθετο"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Έκδοση"
 
@@ -1392,7 +1404,7 @@ msgstr "Άδεια"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Ιστότοπος"
 
@@ -1405,7 +1417,7 @@ msgid "Stop"
 msgstr "Σταμάτα"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Έλεγχος για ενημερώσεις"
@@ -1427,7 +1439,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1437,7 +1449,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1456,6 +1468,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1536,7 +1549,7 @@ msgstr "Μη έγκυρος προορισμός"
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Ρυθμίσεις καταγραφώ αποθηκευτήκαν"
 
@@ -1585,7 +1598,7 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Αφαίρεση"
 
@@ -1604,7 +1617,7 @@ msgid "Home Page"
 msgstr "Αρχική Σελίδα"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Δίκτυο"
 
@@ -1660,8 +1673,8 @@ msgid "UI"
 msgstr "Διεπαφή Χρήστη"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Τούνελ"
@@ -1680,15 +1693,15 @@ msgid "Logging"
 msgstr "Καταγραφή"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Ομότιμοι"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Στατιστικά"
 
@@ -1701,7 +1714,7 @@ msgstr "Προχωρημένα"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1811,16 +1824,16 @@ msgstr "Ενημέρωση ποσοστού κοινής χρήσης εύρου
 msgid "Updated bandwidth limits"
 msgstr "Τα όρια εύρους ζώνης ενημερώθηκαν"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits ανά δευτερόλεπτο"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "ή {0} bytes μέγιστο ανά μήνα"
@@ -2386,7 +2399,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -2395,86 +2408,86 @@ msgstr "Προσθήκη"
 msgid "Password"
 msgstr "Κωδικός"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Διαθέσιμη ενημέρωση, προσπάθεια για κατέβασμα τώρα"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Ενημέρωση διαθέσιμη, πατήστε το κουμπί στα αριστέρα για  κατέβασμα"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Καμιά ενημέρωση διαθέσιμη"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Ενημέρωση του URL ενημέρωσης σε {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "εσωτερικό"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Ενημέρωση της διεύθυνσης του proxy σε {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Ενημέρωση της πόρτας του proxy σε {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Ενημέρωση συχνότητας ανανέωσης σε {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Ποτέ"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Ενημέρωση πολιτικής ενημερώσεων σε {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Ανανέωση των διευθύνσεων URL για ενημερώσεις."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Ενημέρωση κλειδιών εμπιστοσύνης."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Κάθε"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Ειδοποίηση μόνο"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Κατέβασμα και ειδοποίηση μόνο"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Κατέβασμα, επαλήθευση και επανεκκίνηση"
 
@@ -2632,7 +2645,7 @@ msgid "{0} for {1}"
 msgstr "{0} για {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr ""
 
@@ -2746,12 +2759,12 @@ msgid "Graph settings saved"
 msgstr "Οι ρυθμίσεις των γραφημάτων αποθηκεύτηκαν"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
@@ -2782,17 +2795,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Ρύθμιση της Αρχικής Σελίδας I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
@@ -2802,17 +2815,17 @@ msgid "Router Console"
 msgstr "Κονσόλα Router"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Τοπικός server ιστού"
 
@@ -2898,10 +2911,8 @@ msgstr "Έγγραφα Java"
 msgid "Technical documentation"
 msgstr "Τεχνική τεκμηρίωση"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2984,7 +2995,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Ο browser σας δεν είναι σωστά ρυθμισμένος να χρησιμοποιεί HTTP proxy στο {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Όνομα"
 
@@ -3134,148 +3145,157 @@ msgid "Unpublished"
 msgstr "Μη δημοσιευμένο"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Προορισμός"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Λήγει σε {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Έληξε {0} πριν"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Τούνελ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Δεν αρχικοποιήθηκε"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Χώρα"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Τα στοιχεία μας"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Πληροφορίες ομότιμου για"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Πλήρης εγγραφή"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} πριν"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Δημοσιεύτηκε"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Διεύθυνση/εις"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "κόστος"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Κρυμμένο κατά την εκκίνηση"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP και SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3294,7 +3314,7 @@ msgid "Hide news"
 msgstr "Κρύψιμο νέων"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Εμφάνιση νέων"
 
@@ -3375,7 +3395,7 @@ msgid "Failing"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Ενσωματωμένος"
 
@@ -3588,7 +3608,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3639,282 +3659,282 @@ msgstr "Γράφημα Δεδομένων"
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Εξαγωγή δεδομένων ως XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P Υπηρεσίες"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Προφίλ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Γραφήματα"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Τοπικοί προορισμοί"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2P τούνελ"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Γενικά"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Τοπική ταυτότητα"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "εμφάνιση"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3988,43 +4008,43 @@ msgstr ""
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -4032,31 +4052,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Κάνε κλικ στην επανεκκίνηση για εγκατάσταση"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Κάνε κλικ στο σβήσιμο και στη επανεκκίνησε για εγκατάσταση"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Έκδοση {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Κατέβασμα {0} Ενημερώσεων"
@@ -4065,40 +4085,40 @@ msgstr "Κατέβασμα {0} Ενημερώσεων"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Κατέβασμα μη υπογεγραμμένης<br>Ενημέρωσης {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Ελέγξτε τη σύνδεση δικτύου και το NAT/firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Επίλεξε μια ενότητα για προσθήκη"
 
@@ -4371,6 +4391,10 @@ msgstr ""
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2P τούνελ"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4688,7 +4712,7 @@ msgstr "Σελίδα προχωρημένων ρυθμίσεων δικτύου"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4776,11 +4800,11 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
@@ -4869,13 +4893,14 @@ msgid "Search Engines"
 msgstr "Μηχανές Αναζήτησης"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Προτεινόμενα eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Τοπικές υπηρεσίες"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4934,48 +4959,53 @@ msgstr ""
 msgid "Log file"
 msgstr "Αρχείο καταγραφών"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6163,18 +6193,6 @@ msgstr "Κάντε κλικ στη σημαία για να επιλέξετε 
 msgid "Search I2P"
 msgstr "Αναζήτηση I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Ενδιαφέρονται eepsites"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "διαχειριστής τούνελ I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Διαχειριστής Tούνελ I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po
index 6fa1fa8ecaf54d1f8aeadc5ec7477a88a58215ea..160093eab4ddb16654ead733db954d30eb21edc5 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: 2014-10-30 20:10+0000\n"
+"POT-Creation-Date: 2015-02-18 20:15+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
@@ -26,7 +26,7 @@ msgstr ""
 #. {0,number,####} prevents 1234 from being output as 1,234 in the English locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1472
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -35,7 +35,7 @@ msgstr[1] ""
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1476
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -44,7 +44,7 @@ msgstr[1] ""
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1480
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -53,64 +53,64 @@ msgstr[1] ""
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1486
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr ""
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1489
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr ""
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr ""
 
@@ -119,89 +119,89 @@ msgstr ""
 #. setTunnelStatus("Not expecting tunnel requests: Advertised bandwidth too low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr ""
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr ""
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr ""
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels: Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr ""
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:175
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:187
 #, 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:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:194
 msgid "Reseed failed."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
 #, java-format
 msgid "See {0} for help."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "reseed configuration page"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:380
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:485
 msgid "Reseeding: fetching seed URL."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:437
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:580
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -234,7 +234,7 @@ msgstr ""
 msgid "Known fast peers"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:442
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr ""
 
@@ -243,49 +243,58 @@ msgstr ""
 msgid "No transports (hidden or starting up?)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:570
 msgid "Unsupported signature type"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+msgid "No support for our signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
 msgid "Unreachable on any transport"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:654
 msgid "Router Transport Addresses"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:630
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:646
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:682
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:647
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:649
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:651
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:652
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1186
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2563
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -294,248 +303,255 @@ msgstr ""
 msgid "Peer"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:652
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The remote peer, identified by router hash"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:653
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1187
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:689
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:654
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:690
 msgid "Inbound connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:656
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:692
 msgid "Outbound connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:694
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:696
 msgid "We offered to introduce them (help other peers traverse their firewall)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:661
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:697
 msgid "How long since a packet has been received / sent"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:661
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1189
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2569
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:697
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1190
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:698
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:698
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:699
 msgid "How long ago this connection was established"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1191
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:699
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2581
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:700
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:700
 msgid "The difference between the peer's clock and your own"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:701
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:666
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:702
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:703
 msgid "The maximum number of concurrent messages to send"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:668
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:704
 msgid "The number of pending sends which exceed congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:705
 msgid "The slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:670
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:706
 msgid "The round trip time in milliseconds"
 msgstr ""
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The standard deviation of the round trip time in milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:708
 msgid "The retransmit timeout in milliseconds"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:709
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1193
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:710
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:710
 msgid "The total number of packets sent to the peer"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711
 msgid "The total number of packets received from the peer"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:712
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:712
 msgid "The total number of packets retransmitted to the peer"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:713
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:713
 msgid "The total number of duplicate packets received from the peer"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -543,280 +559,276 @@ msgstr ""
 #. {0} is TCP or UDP
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
 #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
 #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1181
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1182
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1183
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1188
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1195
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1196
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2624
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1266
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2789
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2570
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2582
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2590
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2594
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2597
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2599
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2604
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2626
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2628
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2632
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2640
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2642
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr ""
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2648
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2707
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:220
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr ""
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:378
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:618
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:646
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:677
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:889
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:922
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1001
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1323,8 +1335,8 @@ msgid "Add Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr ""
 
@@ -1355,9 +1367,9 @@ msgid "Plugin"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr ""
 
@@ -1379,7 +1391,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr ""
 
@@ -1392,7 +1404,7 @@ msgid "Stop"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr ""
@@ -1414,7 +1426,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1424,7 +1436,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1443,6 +1455,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1523,7 +1536,7 @@ msgstr ""
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr ""
 
@@ -1572,7 +1585,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr ""
 
@@ -1591,7 +1604,7 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr ""
 
@@ -1647,8 +1660,8 @@ msgid "UI"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr ""
@@ -1667,15 +1680,15 @@ msgid "Logging"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr ""
 
@@ -1688,7 +1701,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1798,16 +1811,16 @@ msgstr ""
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
@@ -2372,7 +2385,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2381,86 +2394,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr ""
 
@@ -2505,7 +2518,7 @@ msgid "Network error"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:44
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
 msgid "New router identity"
 msgstr ""
 
@@ -2517,80 +2530,84 @@ msgstr ""
 msgid "Out of memory error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
-msgid "Reseeded router"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "Reachability change"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:49
-msgid "Soft restart"
+msgid "Reseeded router"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:50
-msgid "Started router"
+msgid "Soft restart"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:51
-msgid "Stopped router"
+msgid "Started router"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:52
-msgid "Updated router"
+msgid "Stopped router"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Updated router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:54
 msgid "Watchdog warning"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:102
 msgid "Display Events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:106
 msgid "Events since"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:111
 msgid "Event type"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:117
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:148
 msgid "All events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:122
 msgid "Filter events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
 msgid "No events found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:171
 #, java-format
 msgid "No events found in previous {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
 #, java-format
 msgid "No \"{0}\" events found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:175
 #, java-format
 msgid "No \"{0}\" events found in previous {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:179
 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
 msgid "Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:182
 msgid "Event"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:184
 msgid "Details"
 msgstr ""
 
@@ -2732,12 +2749,12 @@ msgid "Graph settings saved"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
@@ -2768,17 +2785,17 @@ msgid "I2P Home Page Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
@@ -2788,17 +2805,17 @@ msgid "Router Console"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
@@ -2883,10 +2900,7 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
@@ -2967,7 +2981,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
@@ -3117,156 +3131,157 @@ msgid "Unpublished"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:152
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:193
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:195
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:187
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:187
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:189
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:255
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:305
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:326
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:326
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352
 msgid "Country"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411
 msgid "Our info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:405
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:407
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426
 #, java-format
 msgid "{0} ago"
 msgstr ""
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:417
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429
 msgid "Published"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431
 msgid "Signing Key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433
 msgid "Address(es)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:437
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3285,7 +3300,7 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
@@ -3366,7 +3381,7 @@ msgid "Failing"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
@@ -3577,7 +3592,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3628,281 +3643,281 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr ""
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3976,43 +3991,43 @@ msgstr ""
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -4020,31 +4035,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4052,40 +4067,40 @@ 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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4358,6 +4373,10 @@ msgstr ""
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr ""
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4674,7 +4693,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4762,11 +4781,11 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
@@ -4855,12 +4874,13 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4920,48 +4940,53 @@ msgstr ""
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6144,18 +6169,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_es.po b/apps/routerconsole/locale/messages_es.po
index 5b820671774055e779f9f9b782bbdd72fa54d3f1..e5015a008df817b7c3d3c16c0117afab99899c09 100644
--- a/apps/routerconsole/locale/messages_es.po
+++ b/apps/routerconsole/locale/messages_es.po
@@ -4,7 +4,7 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# rod156 <asteriskrodserv@gmail.com>, 2014
+# Foxlet <rodthefox@gmail.com>, 2014
 # "blabla", 2011
 # blabla <blabla@trash-mail.com>, 2011, 2012
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2012-2013
@@ -13,14 +13,14 @@
 # mixxy, 2011
 # punkibastardo <punkibastardo@gmail.com>, 2011, 2012
 # punkibastardo <punkibastardo@gmail.com>, 2011
-# strel, 2013-2014
+# strel, 2013-2015
 # Trolly, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-09-17 21:00+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 00:56+0000\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -49,7 +49,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -58,7 +58,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -67,64 +67,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 hora"
 msgstr[1] "{0} horas"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/d"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 día"
 msgstr[1] "{0} días"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
-msgstr "Excluído mediante el hash del router I2P: {0}"
+msgstr "Excluido mediante el identificador criptográfico (hash) del router I2P: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
-msgstr "Excluído mediante el hash del router I2P"
+msgstr "Excluido mediante el identificador criptográfico (hash) del router I2P"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
-msgstr "IP excluída mediante una entrada en blocklist.txt: {0}"
+msgstr "IP excluida mediante una entrada en blocklist.txt {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
-msgstr "IPs excluídas hasta el reinicio"
+msgstr "IPs excluidas hasta el reinicio"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
-msgstr "IPs excluídas permanente"
+msgstr "IPs excluidas permanente"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "De"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "A"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "ninguno"
 
@@ -134,94 +134,96 @@ msgstr "ninguno"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Rechazando túneles: Iniciando"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
-msgstr "Rechazando túneles: Elevado retardo de los mensajes"
+msgstr "Rechazando túneles: Elevado retardo del mensaje"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Rechazando la mayoría de los túneles: Elevado número de peticiones"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Rechazando túneles: Límite alcanzado"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Rechazando túneles: Límite de ancho de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Rechazando la mayoría de los túneles: Límite de ancho de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Aceptando la mayoría de los túneles"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Aceptando túneles"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Rechazando túneles: Apagando"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Rechazando túneles"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
-msgstr "Resembrando (`reseeding`)"
+msgstr "Resembrando (reseed)"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "El resembrado sólo obtuvo 1 router I2P."
 msgstr[1] "El resembrado sólo obtuvo {0} routers I2P."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "El resembrado falló."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Consulte {0} para obtener ayuda."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
-msgstr "página de configuración del resembrado"
+msgstr "página de configuración del resembrado (reseed)"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
-msgstr "Resembrando: obteniendo URL de la semilla (`seed`)"
+msgstr "Resembrando: Descargando URL de la semilla (seed)."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
-msgstr "Resembrando: obteniendo información del router I2P desde la URL de la semilla (`seed`) ({0} exitosos, {1} errores)."
+msgstr "Resembrando: Descargando información del router I2P de la URL de la semilla (seed) ({0} exitosos, {1} errores)."
 
 #. NOTE TO TRANSLATORS - each of these phrases is a description for a
 #. statistic
@@ -229,31 +231,31 @@ msgstr "Resembrando: obteniendo información del router I2P desde la URL de la s
 #. Please keep relatively short so it will fit on the graphs.
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:33
 msgid "Message receive rate (bytes/sec)"
-msgstr "Tasa de recepción de mensajes (bytes/s)"
+msgstr "Tasa de recepción de mensajes (Bytes/s)"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:34
 msgid "Message send rate (bytes/sec)"
-msgstr "Tasa de envío de mensajes (bytes/seg)"
+msgstr "Tasa de envío de mensajes (Bytes/s)"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:35
 msgid "Low-level send rate (bytes/sec)"
-msgstr "Tasa de envíos de bajo nivel (bytes/s)"
+msgstr "Tasa de envíos de bajo-nivel (Bytes/s)"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:36
 msgid "Low-level receive rate (bytes/sec)"
-msgstr "Tasa de recepciones de bajo nivel (bytes/s)"
+msgstr "Tasa de recepción de bajo-nivel (Bytes/s)"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:37
 msgid "How many peers we are actively talking with"
-msgstr "Con cuántos pares (`peers`) estamos hablando activamente"
+msgstr "El número de pares (peers) con los que está comunicándose activamente"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:40
 msgid "Known fast peers"
-msgstr "Pares (`peers`) rápidos conocidos"
+msgstr "Pares de nivel rápido conocidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
-msgstr "Entrada de NetDb"
+msgstr "Entrada de la base de datos de red (NetDb)"
 
 #. This used to be "no common transports" but it is almost always no
 #. transports at all
@@ -261,578 +263,595 @@ msgstr "Entrada de NetDb"
 msgid "No transports (hidden or starting up?)"
 msgstr "No hay transportes (¿ocultos o iniciándose?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Tipo de firma no soportado"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
-msgstr "Inalcanzable sobre cualquier transporte"
+msgstr "Inaccesible sobre cualquier transporte"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Direcciones de transporte del router I2P"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} se utiliza sólo para conexiones salientes"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP no está habilitado"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Los límites de conexión de su transporte se ajustan automáticamente basándose en su ancho de banda configurado."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Para rebasar estos límites, añada las configuraciones i2np.ntcp.maxConnections=nnn y i2np.udp.maxConnections=nnn en la página de configuración avanzada."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definiciones"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Par"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
-msgstr "El par (`peer`) remoto, identificado por el identificador criptrográfico (`hash`) de su router I2P"
+msgstr "Par (peer) remoto vía identificador criptrográfico (hash) de su router I2P"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dir"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Conexión entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Conexión saliente"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
-msgstr "Se han ofrecido a introducirnos (ayudar a otros pares a atravesar nuestro cortafuegos (`firewall`))"
+msgstr "Se han ofrecido a introducirnos (ayudar a otros pares a atravesar nuestro cortafuegos (firewall))"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
-msgstr "Nos hemos ofrecido a introducirles (ayudar a que otros pares (`peers`) atraviesen sus cortafuegos (`firewalls`))"
+msgstr "Nos hemos ofrecido a introducirles (ayudar a que otros pares a atraviesen sus cortafuegos (firewalls))"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "El tiempo que hace que un paquete ha sido recibido / enviado"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
-msgstr "Inactivo"
+msgstr "Sin actividad"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
-msgstr "Entrante/Saliente"
+msgstr "Entrada/Salida"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
-msgstr "La tasa de transferencia estabilizada de entrada / salida (KBytes por segundo)"
+msgstr "La tasa de transferencia estabilizada entrante / saliente (KBytes/s)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "El tiempo que hace que se estableció esta conexión"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Subida"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Desincronización"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
-msgstr "La diferencia entre el reloj del par (`peer`) y el suyo propio"
+msgstr "La diferencia entre el reloj del par (peer) y el suyo propio"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
-msgstr "La ventana de congestión, que es la cantidad de bytes que se pueden enviar sin recibir confirmación"
+msgstr "La ventana de congestión, que es la cantidad de bytes que se puede enviar antes de recibir una confirmación"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "El número de mensajes enviados a la espera de confirmación"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "El número máximo de mensajes simultáneos a enviar"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
-msgstr "El número de envíos pendientes que superan la ventana de congestión"
+msgstr "El número de envíos pendientes que exceden la ventana de congestión"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "El umbral del algoritmo de comienzo lento"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "El periodo de ida y vuelta en milisegundos"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "El periodo de espera de la retransmisión en milisegundos"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
-msgstr "Tamaño máximo actual de envío de paquete / tamaño máximo estimado de recepción de paquete (bytes)"
+msgstr "Tamaño máximo actual de envío de paquete / tamaño máximo estimado de recepción de paquete (Bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "Env"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
-msgstr "El número total de paquetes enviados al par (`peer`)"
+msgstr "El número total de paquetes enviados al par (peer)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "Rec"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
-msgstr "El número total de paquetes recibidos del par (`peer`)"
+msgstr "El número total de paquetes recibidos del par (peer)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Env dup"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
-msgstr "El número total de paquetes retransmitidos al par (`peer`)"
+msgstr "El número total de paquetes enviados de nuevo al par (peer)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Rec dup"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
-msgstr "El número total de paquetes duplicados recibidos del par (`peer`)"
+msgstr "El número total de paquetes duplicados recibidos del par (peer)"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Servicio"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Configuración de la interfaz común WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Estado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Ascendente"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Descendente"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Conexión PPP WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Periodo de actividad"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP externa"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Retransmisión en capa 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
-msgstr "Servicio de conexión por defecto"
+msgstr "Servicio de conexión predeterminado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Conexión IP WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
-msgstr "Configuración de la conexión Ethernet WAN"
+msgstr "Configuración del enlace Ethernet WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Dispositivo encontrado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Subdispositivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
-msgstr "Estado UPnP"
+msgstr "Estado de UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Deshabilitar dispositivos UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
-msgstr "UPnP se ha deshabilitado; ¿Tiene más de un dispositivo UPnP de pasarela (`gateway´) a Internet en su red local (`LAN`)?"
+msgstr "UPnP ha sido deshabilitado; ¿Tiene más de un dispositivo UPnP de pasarela (gateway) a Internet en su red local (LAN)?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
-msgstr "UPnP no ha encontrado ningún dispositivo UPnP compatible en su red local (`LAN`)."
+msgstr "UPnP no ha encontrado ningún dispositivo compatible-UPnP en su red local (LAN)."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
-msgstr "La actual dirección IP externa reportada por UPnP es {0}."
+msgstr "La dirección IP externa actual reportada por UPnP es {0}."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
-msgstr "La actual dirección IP externa no está disponible."
+msgstr "La dirección IP externa actual no está disponible."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
-msgstr "UPnP informa que la tasa descendente máxima es {0}bits/s"
+msgstr "UPnP informa de que la tasa descendente máxima es {0} bits/s"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
-msgstr "UPnP informa que la tasa ascendente máxima es {0}bits/s"
+msgstr "UPnP informa de que la tasa ascendente máxima es {0} bits/s"
 
 #. {0} is TCP or UDP
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "El puerto {1,number,#####} {0} fue retransmitido con éxito por UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "El puerto {1,number,#####} {0} no fue retransmitido por UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP no está habilitado."
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Desincronización excesiva del reloj: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
-msgstr "Conexiones NTCP (símil TCP)"
+msgstr "Conexiones NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Límite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Periodo de espera"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Cola de salida"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "¿Pendiente?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Saliente"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} par"
 msgstr[1] "{0} pares"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Conexiones UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
-msgstr "Ordenar por identificador criptográfico (`hash`) del par"
+msgstr "Ordenar por identificador criptográfico (hash) del par"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
-msgstr "Dirección/Presentación"
+msgstr "Dirección/Introducción"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
-msgstr "Ordenar por inactividad de entrada"
+msgstr "Ordenar por inactividad entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
-msgstr "Ordenar por inactividad de salida"
+msgstr "Ordenar por inactividad saliente"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Ordenar por tasa de entrada"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Ordenar por tasa de salida"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Ordenar por duración de la conexión"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
-msgstr "Ordenar por desincronización de reloj"
+msgstr "Ordenar por desincronización del reloj"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Ordenar por ventana de congestión"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Ordenar por umbral del algoritmo de comienzo lento"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Ordenar por periodo de ida y vuelta"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Ordenar por periodo de espera de retransmisión"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Ordenar por unidad de transmisión máxima de salida"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Ordenar por paquetes enviados"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Ordenar por paquetes recibidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Ordenar por paquetes retransmitidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Ordenar por paquetes recibidos más de una vez"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Nos hemos ofrecido a introducirles"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Se han ofrecido a introducirnos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Atascado"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 fallido"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} fallidos"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
-msgstr "Excluído"
+msgstr "Excluido"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "pendientes"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Descartando solicitudes de túnel: Demasiado lentos"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
-msgstr "Descartando solicitudes de túnel: Sobrecargados"
+msgstr "Descartando solicitudes de túnel: Saturado"
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr "Rechazando túneles: Modo oculto"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
-msgstr "Rechazando túneles: Sobrecarga de solicitudes"
+msgstr "Rechazando túneles: Saturación de solicitudes"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Rechazando túneles: Límite de la conexión"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
-msgstr "Descartando solicitudes de túnel: Carga alta"
+msgstr "Descartando solicitudes de túnel: Carga elevada"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Descartando solicitudes de túnel: Tiempo en cola"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Está disponible una nueva versión del complemento {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Fallo al buscar actualizaciones para el complemento {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "No hay ninguna versión nueva disponible para el complemento {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B transferidos"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Transferencia fallida de {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Actualización descargada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Reiniciando"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Actualización verificada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "de {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "El archivo de actualización no firmado de {0} está dañado"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
-msgstr "Copia fallida hacia {0}"
+msgstr "Fallo al copiar a {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
-msgstr "Las actualizaciones desde el interior de la red están deshabilitadas. Compruebe el administrador de paquetes."
+msgstr "Las actualizaciones desde el interior de la red están deshabilitadas. Revise el administrador de paquetes."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "No tiene permiso de escritura para el directorio de instalación de I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Primero tiene que actualizar a la versión {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
-msgstr "Requiere Java versión {0} pero la versión instalada de Java es {1}"
+msgstr "Requiere Java versión {0}, pero la versión instalada de Java es {1}"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:55
 #, java-format
@@ -840,167 +859,175 @@ msgid "Checking for update of plugin {0}"
 msgstr "Buscando actualizaciones para el complemento {0}"
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Actualizando"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr "Intentando instalar desde el archivo {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr "No se ha especificado archivo {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
-msgstr "Fallo al instalar desde el archivo {0}, copia fallida."
+msgstr "No se pudo instalar desde el archivo {0}, fallo al copiar."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "Descargando complemento desde {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Complemento descargado"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
-msgstr "No se pudo crear directorio del complemento {0}"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "El complemento de {0} está dañado"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "El complemento de {0} no contiene el fichero de configuración necesario"
+msgstr "No se pudo crear el directorio del complemento {0}"
 
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "El complemento de {0} contiene una clave no válida"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr "La verificación de la firma del complemento de {0} ha fallado"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr "Complemento no instalado - El firmante no es de confianza"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "El complemento de {0} está dañado"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "El complemento de {0} no contiene el fichero de configuración requerido"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
-msgstr "El complemento de {0} tiene nombre o versión no válido"
+msgstr "El complemento de {0} tiene un nombre o versión no válido"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr "El complemento {0} tiene versiones no coincidentes"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Este complemento requiere la versión {0} o superior de I2P"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "Este complemento requiere la versión {0} o superior de Java"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
-msgstr "El complemento descargado es sólo para instalaciones nuevas, pero el complemento ya está instalado"
+msgstr "El complemento descargado es sólo para instalaciones nuevas, pero ya hay una instalación previa"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
-msgstr "El complemento instalado no contiene el fichero de configuración necesario"
+msgstr "El complemento instalado no contiene el fichero de configuración requerido"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr "La firma del complemento descargado no coincide con la del instalado"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
-msgstr "El complemento descargado con versión {0} no es más reciente que la versión ya instalada"
+msgstr "La versión {0} del complemento descargado no es más reciente que la ya instalada"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
-msgstr "La actualización del complemento requiere tener instalada la versión {0} o superior del complemento"
+msgstr "La actualización del complemento requiere que la versión instalada sea {0} o superior"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
-msgstr "La actualización del complemento requiere tener instalada la versión {0} o inferior del complemento"
+msgstr "La actualización del complemento requiere que la versión instalada sea {0} o inferior"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
-msgstr "Este complemento requiere la versión de Jetty {0} o superior"
+msgstr "Este complemento requiere Jetty versión {0} o superior"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
-msgstr "Este complemento requiere la versión de Jetty {0} o inferior"
+msgstr "Este complemento requiere Jetty versión {0} o inferior"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr "No se pudo copiar el complemento al directorio {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
-msgstr "El complemento se instalará en el siguiente reinicio"
+msgstr "El complemento se instalará en el siguiente reinicio."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr "Este complemento es sólo para actualizaciones, pero no hay instalación previa"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr "No se pudo instalar el complemento en {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "El complemento {0} está instalado"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "El complemento {0} está instalado e iniciado"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
-msgstr "El complemento {0} está instalado pero no se inicia, revise los registros (`logs`)"
+msgstr "El complemento {0} está instalado pero no se pudo iniciar, revise los registros (logs)"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr "El complemento {0} está instalado pero no se pudo iniciar"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "No se pudo descargar el complemento de {0}"
@@ -1015,459 +1042,462 @@ msgstr "Actualizando desde {0}"
 msgid "No new version found at {0}"
 msgstr "No se encontró ninguna versión nueva en {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
-msgstr "La expulsión temporal expirará en {0}"
+msgstr "La exclusión temporal caducará en {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
-msgstr "Excluído hasta el reinicio o en {0}"
+msgstr "Excluido hasta el reinicio o en {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr "readmitir ahora"
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "Consola del router I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
-msgstr "Error al actualizar la configuración - por favor consulte los registros (`logs`) de errores"
+msgstr "Error al actualizar la configuración - por favor revise los registros (logs) de errores"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "Configuración guardada con éxito"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs"
-msgstr "Error al guardar la configuración (aplicada pero no guardada) - por favor consulte los registros (`logs`) de errores"
+msgstr "Error al guardar la configuración (aplicada pero no guardada) - por favor revise los registros (logs) de errores"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
-msgstr "Guardar configuración de cliente"
+msgstr "Guardar configuración del cliente"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "Guardar configuración de la interfaz"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr "Guardar configuración de la aplicación web"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "Guardar configuración del complemento"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Instalar complemento"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr "Actualizar todos los complementos instalados"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Error al detener complemento {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Complemento {0} eliminado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Error al eliminar complemento {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Complemento {0} detenido"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr "Aplicación web {0} detenida"
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
-msgstr "Añadido nuevo cliente"
+msgstr "Nuevo cliente añadido"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr "Se guardó con éxito la configuración del cliente"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
-msgstr "Índice de clientes defectuoso."
+msgstr "Índice de clientes dañado."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr "Cliente {0} detenido"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr "Cliente {0} iniciado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr "Cliente {0} eliminado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr "Se guardó la configuración de la aplicación web."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "Se guardó la configuración del complemento."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr "Aplicación web"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "iniciado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
-msgstr "Fallo al iniciar"
+msgstr "No se pudo iniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "No se pudo encontrar servidor."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "No se especificó URL del complemento."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "No se especificó URL de actualización para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr "Descarga de complemento o actualización ya en curso."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr "Actualizando todos los complementos"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr "URL {0} incorrecta"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr "Buscando actualizaciones para el complemento {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "Complemento {0} iniciado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "Error al iniciar el complemento {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
-msgstr "Añadir usuario {0}"
+msgstr "Usuario {0} añadido"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr "Se guardó la configuración de la interfaz"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr "Debe reiniciar para que surta efecto"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Editar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Añadir cliente"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "Clase y argumentos"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Cliente"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "¿Ejecutar al iniciar el router I2P?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr "Control"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "¿Ejecutar en el arranque?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "Clase y argumentos"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Descripción"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Complemento"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versión"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Firmado por"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Fecha"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Autor"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Licencia"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Enlace para actualizaciones"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Detener"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Actualización"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "¿Está seguro de que quiere eliminar {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Eliminar"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 msgid "Delete selected"
 msgstr "Eliminar seleccionados"
 
 #: ../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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr "Añadir elemento"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
-msgstr "Restaurar valores predeterminados"
+msgstr "Restablecer valores predeterminados"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Guardar"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:29
 msgid "Home page changed"
-msgstr "Se cambió la página de inicio"
+msgstr "Se cambió la página principal"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:51
 msgid "Restored default settings"
-msgstr "Se restauraron las configuraciones predeterminadas"
+msgstr "Se restablecieron los valores predeterminados"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:63
 msgid "No name entered"
-msgstr "No se ha introducido ningún nombre"
+msgstr "No se ha introducido nombre"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:68
 msgid "No URL entered"
-msgstr "No se ha introducido ninguna URL"
+msgstr "No se ha introducido URL"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:81
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:81
@@ -1480,12 +1510,12 @@ msgid "Removed"
 msgstr "Eliminado"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Añadir clave"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Eliminar clave"
 
@@ -1505,19 +1535,19 @@ msgstr "Clave para"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34
 msgid "added to keyring"
-msgstr "añadida al juego de claves (`keyring`)"
+msgstr "añadida al juego de claves (keyring)"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36
 msgid "Invalid destination or key"
-msgstr "Clave o destino no válido"
+msgstr "Destino o clave no válido"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41
 msgid "removed from keyring"
-msgstr "eliminada del juego de claves (`keyring`)"
+msgstr "eliminada del juego de claves (keyring)"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43
 msgid "not found in keyring"
-msgstr "no se encontró en el juego de claves (`keyring`)"
+msgstr "no se encontró en el juego de claves (keyring)"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45
 msgid "Invalid destination"
@@ -1525,22 +1555,22 @@ msgstr "Destino no válido"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:82
 msgid "Log overrides updated"
-msgstr "Se actualizaron las excepciones del registro (`log`)"
+msgstr "Se actualizaron las omisiones al registro (log)"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
-msgstr "Se guardó la configuración del registro (`log`)"
+msgstr "Se guardó la configuración de registro (log)"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
 msgid ""
 "Add additional logging statements above. Example: net.i2p.router.tunnel=WARN"
-msgstr "Añadir arriba argumentos adicionales para el registro (`logging`). Ejemplo: net.i2p.router.tunnel=WARN"
+msgstr "Añada arriba declaraciones de registro (log) adicionales. Ejemplo: net.i2p.router.tunnel=WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:49
 msgid ""
 "Or put entries in the logger.config file. Example: "
 "logger.record.net.i2p.router.tunnel=WARN"
-msgstr "O añadir argumentos como entradas en el fichero logger.config Ejemplo: logger.record.net.i2p.router.tunnel=WARN"
+msgstr "También puede hacerlo añadiendo entradas en el fichero logger.config, ejemplo: logger.record.net.i2p.router.tunnel=WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:50
 msgid "Valid levels are DEBUG, INFO, WARN, ERROR, CRIT"
@@ -1550,7 +1580,7 @@ msgstr "Los niveles válidos son DEBUG, INFO, WARN, ERROR, CRIT (depuración, in
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1559,30 +1589,30 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Eliminar"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:125
 msgid "Select a class to add"
-msgstr "Seleccione una clase a agregar"
+msgstr "Seleccione una clase a añadir"
 
 #. stat groups for stats.jsp
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
@@ -1595,53 +1625,54 @@ msgid "Home Page"
 msgstr "Página principal"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Red"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr "Barra de resumen"
 
@@ -1650,8 +1681,8 @@ msgid "UI"
 msgstr "Interfaz de usuario"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Túneles"
@@ -1661,24 +1692,24 @@ msgid "Clients"
 msgstr "Clientes"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
-msgstr "Juego de claves"
+msgstr "Juego de claves (keyring)"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
 msgid "Logging"
 msgstr "Registro"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
-msgstr "Pares"
+msgstr "Pares (peers)"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Estadísticas"
 
@@ -1688,150 +1719,146 @@ msgstr "Avanzado"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr "Comprobando de nuevo la accesibilidad al router I2P..."
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Actualizando dirección IP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr "Actualizando la configuración de IPv6"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr "Deshabilitando TCP por completo"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
-msgstr "Actualizando la dirección TCP a {0}"
+msgstr "Actualizando la dirección de TCP a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr "Deshabilitando TCP entrante"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
-msgstr "Actualizando la dirección TCP de entrada a automático"
+msgstr "Actualizando la dirección del TCP entrante a automático"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr "Actualizando el puerto TCP a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
-msgstr "Advertencia: no se recomienda usar puertos inferiores al 1024"
+msgstr "Advertencia - No se recomienda usar puertos inferiores al 1024"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr "Puerto no válido"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
-msgstr "Actualizando el puerto de entrada TCP a automático"
+msgstr "Actualizando el puerto TCP entrante a automático"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr "Actualizando el puerto UDP a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr "Reiniciando de forma controlada en modo router I2P oculto"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr "Reiniciando de forma controlada para salir del modo router I2P oculto"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr "Habilitando UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr "Deshabilitando UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
-msgstr "Habilitando el modo ordenador portátil"
+msgstr "Habilitando el modo portátil"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
-msgstr "Deshabilitando el modo ordenador portátil"
+msgstr "Deshabilitando el modo portátil"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr "Deshabilitando UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr "Habilitando UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr "Solicitando introductores SSU (UDP seguro semiconfiable)"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr "Dirección no válida"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
-msgstr "El nombre del equipo (host) o dirección IP {0} no es enrutable públicamente"
+msgstr "El nombre de equipo (host) o la dirección IP {0} no es enrutable públicamente"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
-msgstr "Actualizando el porcentaje de cuota de ancho de banda"
+msgstr "Actualizando el porcentaje de ancho de banda compartido"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr "Se actualizaron los límites de ancho de banda"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits por segundo"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "o {0} bytes por mes como máximo"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
-msgstr "Expulsar par (peer) hasta el reinicio"
+msgstr "Excluir par hasta el reinicio"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23
 #, java-format
 msgid "Manually banned via {0}"
-msgstr "Excluído manualmente mediante {0}"
+msgstr "Excluido manualmente mediante {0}"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
 msgid "banned until restart"
-msgstr "excluído hasta el reinicio"
+msgstr "excluido hasta el reinicio"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38
@@ -1840,9 +1867,9 @@ msgid "Invalid peer"
 msgstr "Par (peer) no válido"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
-msgstr "Readmitir par (peer)"
+msgstr "Readmitir par"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
 msgid "unbanned"
@@ -1850,12 +1877,12 @@ msgstr "readmitido"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35
 msgid "is not currently banned"
-msgstr "no se encuentra excluído"
+msgstr "no se encuentra excluido"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
-msgstr "Ajustar bonus de pares (peers)"
+msgstr "Ajustar bonificaciones del par"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47
 msgid "Bad speed value"
@@ -1863,16 +1890,16 @@ msgstr "Valor de velocidad erróneo"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52
 msgid "Bad capacity value"
-msgstr "Valor de la capacidad erróneo"
+msgstr "Valor de capacidad erróneo"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:61
 msgid "Unsupported"
 msgstr "No soportado"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
-msgstr "Guardar cambios y resembrar (reseed) ahora"
+msgstr "Guardar cambios y resembrar ahora"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:23
 msgid "Reseeding is already in progress"
@@ -1881,7 +1908,7 @@ msgstr "El resembrado (reseed) ya está en marcha"
 #. skip the nonce checking in ReseedHandler
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:26
 msgid "Starting reseed process"
-msgstr "Iniciando el proceso de resembrado"
+msgstr "Iniciando el proceso de resembrado (reseed)"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:83
 msgid "Configuration saved successfully."
@@ -1889,9 +1916,9 @@ msgstr "Configuración guardada con éxito."
 
 #. 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "Apagar inmediatamente"
 
@@ -1946,120 +1973,120 @@ msgstr[1] "Por favor espere a que los enrutamientos vigentes expiren para {0} t
 msgid "Restart in {0}"
 msgstr "Reinicio en {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "Apagar de forma controlada"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "Apagado controlado iniciado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "Cancelar apagado controlado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "Apagado controlado cancelado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "Reinicio controlado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "Reinicio controlado solicitado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "Reinicio brusco"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "Reinicio brusco solicitado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr "Renovar clave y reiniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
-msgstr "Renovación de clave después de reinicio controlado"
+msgstr "Renovando clave después de un reinicio controlado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr "Renovar clave y apagar"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
-msgstr "Renovación de clave después de apagado controlado"
+msgstr "Renovando clave después de un apagado controlado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Ejecutar I2P al arrancar el sistema"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "No ejecutar I2P al arrancar el sistema"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
-msgstr "Deshechar hilos"
+msgstr "Volcar hilos"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
-msgstr "Hilos desechados hacia {0}"
+msgstr "Hilos volcados hacia {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
-msgstr "Mostrar consola en el arranque"
+msgstr "Mostrar consola al iniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
-msgstr "La consola se mostrará al arrancar el sistema"
+msgstr "La consola se mostrará al iniciar el router I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
-msgstr "No mostrar consola en el arranque"
+msgstr "No mostrar consola al iniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
-msgstr "La consola no se mostrará al arrancar el sistema"
+msgstr "La consola no se mostrará al iniciar el router I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
-msgstr "Forzar GC"
+msgstr "Forzar 'recolección de basura'"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
-msgstr "Solicitada recogida completa de desechos"
+msgstr "Se socilitó procedimiento de  'recolección de basura' completo"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Servicio instalado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
-msgstr "Advertencia: no se pudo instalar el servicio"
+msgstr "Advertencia: No se pudo instalar el servicio"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Servicio eliminado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
-msgstr "Advertencia: no se pudo eliminar el servicio"
+msgstr "Advertencia: No se pudo eliminar el servicio"
 
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116
 msgid "Stat filter and location updated successfully to"
@@ -2078,7 +2105,7 @@ msgstr "Estadísticas completas deshabilitadas"
 msgid ""
 "Graph list updated, may take up to 60s to be reflected on the {0}Graphs "
 "Page{1}"
-msgstr "La lista de gráficos se actualizó, puede llevar hasta 60 s que se refleje en la Página{1} de Gráficos{0}"
+msgstr "La lista de gráficas se actualizó, puede llevar hasta 60 s que se refleje en la {0}Página de gráficas{1}"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:24
 msgid "Save order"
@@ -2091,20 +2118,20 @@ msgstr "El intervalo de refresco ha cambiado"
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:33
 #, java-format
 msgid "Refresh interval must be at least {0} seconds"
-msgstr "El intervalo de refresco tiene que ser de al menos {0} segundos"
+msgstr "El intervalo de refresco tiene que ser al menos de {0} segundos"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:35
 msgid "Refresh interval must be a number"
 msgstr "El intervalo de refresco tiene que ser un número"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
-msgstr "Restablecer todos los valores por defecto"
+msgstr "Restablecer todos los valores predeterminados"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:40
 msgid "Full summary bar default restored."
-msgstr "Se restablecieron todos los valores por defecto de la barra de resumen."
+msgstr "Se restablecieron todos los valores predeterminados de la barra de resumen."
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:41
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:45
@@ -2113,13 +2140,13 @@ msgid "Summary bar will refresh shortly."
 msgstr "La barra de resumen se refrescará en breve."
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr "Restablecer valores de barra de resumen mínima"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:44
 msgid "Minimal summary bar default restored."
-msgstr "Se restablecieron los valores por defecto de la barra de resumen mínima."
+msgstr "Se restablecieron los valores predeterminados de la barra de resumen mínima."
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:61
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:83
@@ -2141,178 +2168,174 @@ msgstr "Movido"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136
 msgid "Saved order of sections."
-msgstr "Se guardó el orden de las secciones."
+msgstr "Se guardó el orden de las secciones"
 
 #. 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
-msgstr "Se actualizaron las configuraciones para todos los grupos (pools) de túneles."
+msgstr "Se actualizaron las configuraciones para todos los depósitos (pools) de túneles."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
-msgstr "Se guardó con éxito la configuración de túnel exploratorio."
+msgstr "Se guardó con éxito la configuración de túneles exploratorios."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
-msgstr "Error al guardar la configuración (aplicada pero no guardada) - por favor consulte los registros (logs) de errores."
+msgstr "Error al guardar la configuración (aplicada pero no guardada) - por favor revise los registros (logs) de errores."
 
 #. * dummies for translation
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 salto"
 msgstr[1] "{0} saltos"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 túnel"
 msgstr[1] "{0} túneles"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr "Túneles exploratorios"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr "Túneles de cliente para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr "ADVERTENCIA DE ANONIMATO - Los ajustes incluyen túneles de 0 saltos."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr "ADVERTENCIA DE ANONIMATO - Los ajustes incluyen túneles de 1 salto."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr "ADVERTENCIA DE RENDIMIENTO - Los ajustes incluyen túneles de gran longitud."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr "ADVERTENCIA DE RENDIMIENTO - Los ajustes incluyen grandes cantidades de túneles."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "Longitud"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "Aleatorización"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "Cantidad"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr "Cantidad en reserva"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "Opciones de entrada"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "Opciones de salida"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr "Añadir usuario"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
-msgstr "Se guardó el cambio en el tema de decoración."
+msgstr "Se guardó el cambio del tema de decoración."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr "Refresque la página para verlo."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
-msgstr "Se guardó la opción de consola móvil."
+msgstr "Se guardó la opción de consola móvil/celular"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
-msgstr "No se ha introducido el nombre del usuario"
+msgstr "No se ha introducido el nombre de usuario"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr "No se ha introducido la contraseña"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr "Usuario {0} eliminado"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25
 msgid "Set theme universally across all apps"
-msgstr "Establecer el tema para todas las aplicaciones"
+msgstr "Establecer el tema decorativo para todas las aplicaciones"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:37
 msgid "Force the mobile console to be used"
-msgstr "Forzar el uso de la consola móvil"
+msgstr "Forzar el uso de la consola móvil/celular"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr "Checo"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Danés"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Alemán"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Griego"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Inglés"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Español"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Francés"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr "Hebreo"
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "Húngaro"
@@ -2351,596 +2374,734 @@ msgid "Russian"
 msgstr "Ruso"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr "Añada un usuario y contraseña para habilitar."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Añadir"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Actualización o comprobación ya en marcha"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Actualización disponible; tratando de descargarla"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Actualización disponible, pulse el botón de la izquierda para descargarla"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Ninguna actualización disponible"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
-msgstr "Actualizando URL de noticias a {0}"
+msgstr "Actualizando URL de news (usenet) a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Actualizando equipo (host) del proxy a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Actualizando puerto del servidor proxy a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Actualizando frecuencia de refresco a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nunca"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Actualizando política de actualización a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Actualizando URLs de actualización."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Actualizando claves de confianza."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
-msgstr "Actualizando URL de actualización sin firma a {0}"
+msgstr "Actualizando URL de actualización no firmada a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Cada"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Sólo notificar"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Sólo descargar y verificar"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Descargar, verificar y reiniciar"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
+msgstr "Inicio abortado"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
+msgstr "Habilitado como router de inundación (floodfill)"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
+msgstr "Se cambió la IP"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
+msgstr "Se cambió el puerto"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
+msgstr "Se cambió la hora"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
+msgstr "Caído"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
+msgstr "Error crítico"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr "Se instaló una nueva versión"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr "La instalación falló"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr "Error de red"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr "Nueva identidad del router"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr "Deshabilitado como router de inundación (floodfill)"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr "Error por memoria llena"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr "Router I2P resembrado"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr "Reinicio suave"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr "Router I2P iniciado"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr "Router I2P detenido"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr "Router I2P actualizado"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr "Advertencia del vigilante"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr "Mostrar eventos"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr "Eventos desde"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr "Tipo de evento"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr "Todos los eventos"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr "Filtrar eventos"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr "No se encontraron eventos"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr "No se encontraron eventos en el anterior {0}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr "No se encontraron eventos \"{0}\""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr "No se encontraron eventos \"{0}\" en el anterior {1}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "Hora"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr "Evento"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr "Detalles"
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
-msgstr "El formulario enviado no es válido, probablemente porque utilizó el botón 'atrás' ó 'recargar' de su navegador. Por favor, reenvíelo."
+msgstr "El envío de formulario no es válido, probablemente utilizó el botón 'atrás' ó 'recargar' de su navegador. Por favor, reenvíelo."
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
+#: ../java/src/net/i2p/router/web/FormHandler.java:229
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Si el problema persiste, verifique que tiene habilitadas las cookies en su navegador."
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
 msgid "Combined bandwidth graph"
 msgstr "Gráfico de ancho de banda combinado"
 
 #. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
 #, java-format
 msgid "{0} for {1}"
 msgstr "{0} para {1}"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Uso de ancho de banda"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
 #, java-format
 msgid "ending {0} ago"
 msgstr "finalizado hace {0}"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
 msgid "Larger"
 msgstr "Más grande"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
 msgid "Smaller"
 msgstr "Más pequeño"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
 msgid "Taller"
 msgstr "Más alto"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
 msgid "Shorter"
-msgstr "Más corto"
+msgstr "Más bajo"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
 msgid "Wider"
 msgstr "Más ancho"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
 msgid "Narrower"
 msgstr "Más estrecho"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
 msgid "Larger interval"
 msgstr "Intervalo más grande"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
 msgid "Smaller interval"
 msgstr "Intervalo más pequeño"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr "Intervalo anterior"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr "Intervalo siguiente"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr "Graficar promedios"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr "graficar eventos"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr "Todos los horarios son UTC."
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr "Configurar visualización de la gráfica"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr "Seleccionar estadísticas"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "Periodos"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "o"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "Tamaños de imagen"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "ancho"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "alto"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "píxeles"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
-msgstr "Retardo de refresco"
+msgstr "Retardo del refresco"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
-msgstr "¿Almacenar datos de gráficos en el disco?"
+msgstr "¿Almacenar datos de gráficas en el disco?"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
-msgstr "Guardar ajustes y volver a dibujar los gráficos"
+msgstr "Guardar ajustes y volver a dibujar las gráficas"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
-msgstr "Se guardó la configuración de gráficos"
+msgstr "Se guardó la configuración de la gráfica"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
-msgstr "Libreta de direcciones"
+msgstr "Addressbook (libreta de direcciones)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
-msgstr "Administrar su fichero hosts de I2P aquí (resolución de nombres de dominios I2P)"
+msgstr "Administre su fichero hosts de I2P aquí (resolución de nombres de dominios I2P)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr "Configurar ancho de banda"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
-msgstr "Configuración de ancho de banda de I2P"
+msgstr "Configuración del ancho de banda de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr "Configurar idioma"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
-msgstr "Selección de idioma de la consola"
+msgstr "Selección del idioma de la consola"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr "Personalizar página principal"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
-msgstr "Configuración de página principal de I2P"
+msgstr "Configuración de la página principal de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Cliente de correo web anónimo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
-msgstr "Ayuda de router I2P"
+msgstr "Ayuda del router I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
-msgstr "Consola del router"
+msgstr "Consola del router I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Cliente BitTorrent anónimo integrado"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Servidor web local"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr "El proyecto Anoncoin"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
-msgstr "Informes de errores"
+msgstr "Informes de fallos"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
-msgstr "Rastreador de errores"
+msgstr "Rastreador de fallos"
 
 #. "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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr "Foro de desarrollo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr "Foro de desarrollo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
-msgstr "Rastreador (tracker) de BitTorrent"
+msgstr "Tracker (rastreador) de BitTorrent"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr "diftracker"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr "Aplicaciones de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
-msgstr "FAQ"
+msgstr "Preguntas frecuentes"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
-msgstr "Preguntas frecuentes"
+msgstr "Preguntas frecuentes (FAQ)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr "Foro de la comunidad"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr "Foro"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid ""
 "A public anonymous Git hosting site - supports pulling via Git and HTTP and "
 "pushing via SSH"
 msgstr "Un sitio de alojamiento Git público y anónimo - soporta tomado (pull) mediante Git y HTTP, e impulsado (push) mediante SSH"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr "Alojamiento Git anónimo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr "HiddenGate"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr "Microblog"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
-msgstr "Su principal servicio de mircroblogging en I2P"
+msgstr "El principal servicio de mircroblogging en I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr "Javadocs"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr "Documentación técnica"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-msgstr "Sitio web de microblogging rápido y simple"
-
+#. "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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr "Repositorios de Debian y Tahoe-LAFS"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr "Alojamiento web gratuito"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
-msgstr "Alojamiento de eepsites gratuito con PHP y MySQL"
+msgstr "Alojamiento de eepsites (sitios web en I2P) gratuito con PHP y MySQL"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr "Pastebin de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr "Pastebin"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr "News (usenet) de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr "Directorio de complementos"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
-msgstr "Complementos"
+msgstr "Complementos (plugins)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr "Tracker (rastreador BitTorrent) de 'Postman'"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
-msgstr "Página de principal de I2P"
+msgstr "Página principal de I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr "Sitio web del proyecto"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr "Estadísticas de la red I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr "Documentos técnicos"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
-msgstr "Wiki 'Trac'"
+msgstr "Trac Wiki"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr "Wiki de 'Ugha'"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr "Aplicaciones BitTorrent 'Seedless' y 'Robert'"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr "Sitio principal de 'Sponge'"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr "El proxy HTTP no está activo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, java-format
 msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Su navegador no está correctamente configurado para utilizar el proxy HTTP en {0}"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nombre"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr "URL"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr "Cola de tareas de I2P"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr "Ejecutores de las tareas"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr "Tareas activas"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr "comenzó hace {0}"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr "Tareas recién finalizadas"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr "finalizado hace {0}"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr "Listo/esperando tareas"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 msgid "Scheduled jobs"
-msgstr "Tareas programados"
+msgstr "Tareas programadas"
 
 #. translators: {0} is a job name, {1} is a time, e.g. 6 min
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr "{0} comenzará en {1}"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
-msgstr "Estadística tareas totales"
+msgstr "Estadística de tareas totales"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr "Tarea"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr "En cola"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr "Ejecuciones"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr "Media"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr "Hora"
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr "Máx"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr "Mín"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr "Pendientes"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr "Resumen"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "Ubicación del fichero"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "No hay mensajes de registro (log)"
 
@@ -2970,172 +3131,181 @@ msgstr "Todos los routers I2P con estadísticas completas"
 msgid "LeaseSets"
 msgstr "LeaseSets"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr "Router I2P"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "no se encuentra en la base de datos de red"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr "LeaseSet"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Local"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "No publicado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Añadir a la libreta de direcciones local"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Caduca en {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Caducó hace {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
-msgstr "Puerta de enlace"
+msgstr "Pasarela (gateway)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Túnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "No inicializado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Estadísticas del router I2P en la base de datos de red"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Recuento"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "País"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
-msgstr "Nuestra información"
+msgstr "Información propia"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
-msgstr "Información del par (peer) para"
+msgstr "Información del par para"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
-msgstr "Campo completo"
+msgstr "Entrada completa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "hace {0}"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publicado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Clave firmante"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Dirección(es)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "coste"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
-msgstr "Oculto o iniciandose"
+msgstr "Oculto o iniciándose"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU con introductores"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP y SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP y SSU con introductores"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
-msgstr "SSU con introductores, sólo IPv6"
+msgstr "SSU-introductores sólo IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "SSU IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
-msgstr "SSU con introductores, IPv6"
+msgstr "SSU-introductores IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "NTCP IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
-msgstr "NTCP y SSU, IPv6"
+msgstr "NTCP-SSU IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
-msgstr "NTCP y SSU con introductores, IPv6"
+msgstr "NTCP-SSU-introductores IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
-msgstr "NTCP y SSU con introductores, sólo IPv6"
+msgstr "NTCP-SSU-introductores sólo IPv6"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:252
 #, java-format
@@ -3145,243 +3315,243 @@ msgstr "News (usenet) actualizadas hace {0}."
 #: ../java/src/net/i2p/router/web/NewsHelper.java:258
 #, java-format
 msgid "News last checked {0} ago."
-msgstr "News (usenet) chequeadas hace {0}."
+msgstr "News (usenet) comprobadas hace {0}."
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:267
 msgid "Hide news"
-msgstr "Ocultar news (usenet) "
+msgstr "Ocultar news"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
-msgstr "Mostrar news (usenet) "
+msgstr "Mostrar news"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
-msgstr "Buscando actualizaciones para complementos"
+msgstr "Buscando actualizaciones de complementos"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] "1 complemento actualizado"
 msgstr[1] "{0} complementos actualizados"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
-msgstr "Comprobación de actualizaciones de complementos completada"
+msgstr "Búsqueda de actualizaciones de complementos finalizada"
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
 msgstr[0] "Mostrando 1 perfil reciente."
 msgstr[1] "Mostrando {0} perfiles recientes."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
 msgstr[0] "Ocultando 1 perfil antiguo."
 msgstr[1] "Ocultando {0} perfiles antiguos."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
 msgstr[0] "Ocultando 1 perfil estándar."
 msgstr[1] "Ocultando {0} perfiles estándar."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr "Grupos (Capacidades)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Velocidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "Capacidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "Integración"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr "Rápido, alta capacidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
-msgstr "Alta  Capacidad"
+msgstr "Alta capacidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr "Fallando"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
-msgstr "Integrados"
+msgstr "Integrado"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr "Inaccesible"
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
-msgstr "Fallos en el test"
+msgstr "Test fallido"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "perfil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
-msgstr "Indicativos de capacidad"
+msgstr "Capacidades"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr "Valor entero"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr "Última constancia"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr "Última constancia desde"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr "Último envío correcto"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr "Último envío fallido"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr "Tiempo resp. 10m"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr "Tiempo resp. 1h"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr "Tiempo resp. 1d"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr "Última búsqueda exitosa"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr "Última búsqueda fallida"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr "Último guardado exitoso"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr "Último guardado fallido"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
-msgstr "Tasa de error a 1h"
+msgstr "Tasa de fallos a 1h"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
-msgstr "Tasa de error a 1d"
+msgstr "Tasa de fallos a 1d"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr "Umbrales"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr "pares (peers) rápidos"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr "pares de alta capacidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr "pares bien integrados"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr "según lo determinado por el organizador del perfil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr "grupos"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr "capacidades en la base de datos de red (netDb), no se usan para determinar los perfiles"
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr "capacidades"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid ""
 "peak throughput (bytes per second) over a 1 minute period that the peer has "
 "sustained in a single tunnel"
 msgstr "rendimiento máximo (bytes por segundo) durante un periodo de 1 minuto que el par (peer) ha sostenido en un solo túnel"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "velocidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr "capacidad"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr "¿a cuántos túneles podemos pedirles que se unan en una hora?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
-msgstr "¿cuántos nuevos pares (peers) nos han indicado últimamente?"
+msgstr "¿cuántos pares (peers) nuevos nos han indicado ellos últimamente?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr "integración"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
-msgstr "¿Está el par (peer) excluído, o es inalcanzable, o están fallando sus tests de túnel?"
+msgstr "¿el par está excluido, o es inalcanzable, o están fallando sus tests de túnel?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr "estado"
 
 #. 0
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:12
 msgid "Floodfill "
-msgstr "Inundación (floodfill)"
+msgstr "Router de inundación (floodfill)"
 
 #. 2
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:14
@@ -3394,17 +3564,17 @@ msgstr "Elegir motor de búsqueda"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:57
 msgid "GO"
-msgstr "¡Adelante!"
+msgstr "IR"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:60
 msgid "Statistics gathered during this router's uptime"
-msgstr "Estadísticas recogidas durante el funcionamiento de este router I2P"
+msgstr "Estadísticas recogidas durante el periodo de funcionamiento de este router I2P"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:63
 msgid ""
 "The data gathered is quantized over a 1 minute period, so should just be "
 "used as an estimate."
-msgstr "Los datos recogidos se cuantifican en periodos de 1 minuto, por lo que sólo deben utilizarse como estimación."
+msgstr "Los datos recogidos se cuantifican en intervalos de 1 minuto, por lo que sólo deben utilizarse como estimación."
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:64
 msgid "These statistics are primarily used for development and debugging."
@@ -3425,7 +3595,7 @@ msgstr "Media móvil de eventos por periodo"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:124
 msgid "Highest events per period"
-msgstr "Número más alto de eventos por periodo"
+msgstr "Valor más alto de eventos por periodo"
 
 #. if (showAll && (curFreq.getMaxAverageEventsPerPeriod() > 0) &&
 #. (curFreq.getAverageEventsPerPeriod() > 0) ) {
@@ -3446,7 +3616,7 @@ msgid "Lifetime average frequency"
 msgstr "Frecuencia media del total de vida"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3459,7 +3629,7 @@ msgstr "tasa"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:170
 msgid "Average"
-msgstr "Promedio"
+msgstr "Media"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:173
 msgid "Highest average"
@@ -3469,8 +3639,8 @@ msgstr "Promedio máximo"
 #, java-format
 msgid "There was 1 event in this period."
 msgid_plural "There were {0} events in this period."
-msgstr[0] "Hubo 1 evento en este período."
-msgstr[1] "Hubo {0} eventos en este período."
+msgstr[0] "Hubo 1 evento en este periodo."
+msgstr[1] "Hubo {0} eventos en este periodo."
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:202
 #, java-format
@@ -3487,7 +3657,7 @@ msgstr "Recuento medio de eventos"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:211
 msgid "Events in peak period"
-msgstr "Eventos en periodo de pico"
+msgstr "Eventos en periodo pico"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:219
 msgid "Graph Data"
@@ -3497,387 +3667,392 @@ msgstr "Graficar datos"
 msgid "Graph Event Count"
 msgstr "Graficar recuento de eventos"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exportar datos como XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Valor medio del total de vida"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
-msgstr "Ayuda del router I2P y preguntas frecuentes"
+msgstr "Ayuda del router I2P y preguntas frecuentes (FAQ)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
-msgstr "Ayuda y FAQ"
+msgstr "Ayuda y preguntas frecuentes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
-msgstr "Configurar el arranque de clientes y aplicaciones web (servicios); iniciar servicios inactivos"
+msgstr "Configurar el inicio de clientes y aplicaciones web (servicios); iniciar manualmente servicios inactivos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Servicios I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configurar router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Datos internos de I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
-msgstr "Ver los túneles existentes y el estado de construcción de túneles"
+msgstr "Mostrar túneles existentes y estado de creación de túneles"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
-msgstr "Mostrar todas las conexiones con los pares (peers) actuales"
+msgstr "Mostrar todas las conexiones actuales con los pares (peers)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Mostrar perfiles de rendimiento de los pares recientes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Mostrar la lista de todos los routers I2P conocidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB (base de datos de red)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Informe de salud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Registros (logs)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Graficar el rendimiento del router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Estadísticas textuales de rendimiento del router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
-msgstr "Destinos locales"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr "Túneles locales"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "Administrador de servicios ocultos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "General"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Su identidad local es la identificación única de su router I2P, similar a una dirección IP, pero específica de I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
-msgstr "Nunca la revele nadie, ya que puede exponer su dirección IP real."
+msgstr "NUNCA LA REVELE A NADIE, ya que puede exponer su dirección IP pública real."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Identidad local"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "La identificación única de su router I2P es "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
-msgstr "nunca la revele a nadie"
+msgstr "NUNCA LA REVELE A NADIE"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "mostrar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
-msgstr "La versión de I2P que está ejecutando"
+msgstr "La versión del software I2P que está ejecutando"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
-msgstr "El tiempo que ha estado ejecutándose para esta sesión"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Tiempo de actividad"
+msgstr "El tiempo que lleva ejecutándose para esta sesión"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
-msgstr "Ayuda con la configuración del cortafuegos (firewall) y del router I2P para un rendimiento óptimo de I2P"
+msgstr "Ayuda con la configuración del cortafuegos (firewall) y del router I2P para un rendimiento óptimo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "Vea más información en el wiki"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Advertencia: ECDSA no está disponible. Actualice su Java o su sistema operativo"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configurar actualizaciones de I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Actualización de I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Pares (peers) con los que nos hemos comunicado en los últimos minutos / última hora"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Activo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Número de pares disponibles para crear túneles de cliente"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Rápido"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Número de pares disponibles para crear túneles exploratorios"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Alta capacidad"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
-msgstr "Número de pares disponibles para consultas de la base de datos de red"
+msgstr "Número de pares disponibles para consultas a la base de datos de red"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Número total de pares (peers) en nuestra base de datos de red"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Conocidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configurar asignación de ancho de banda para el router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
-msgstr "Ancho de banda entrante/saliente"
+msgstr "Ancho de banda de entrada/salida"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Usado"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
-msgstr "Usado para crear y probar túneles, y comunicarse con pares de inundación (floodfill peers)"
+msgstr "Usado para crear y probar túneles, y comunicarse con los pares de inundación (floodfill)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Exploratorios"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Túneles que está usando para proporcionar o acceder a servicios en la red"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
-msgstr "Túneles en los que está participando, aportando de forma directa ancho de banda a la red. "
+msgstr "Túneles en los que está participando, aportando de forma directa ancho de banda a la red"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Participando en"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "La relación entre los saltos de túnel que proporciona y los que usa - un valor mayor que 1,00 indica una aportación positiva a la red"
+msgstr "La relación entre el número de saltos de los túneles que proporciona y el número de saltos de los que usa - un valor mayor que 1,00 indica una aportación positiva a la red"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Relación de compartido"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
-msgstr "¿Qué hay en la cola de tareas del router?"
+msgstr "¿Qué hay en la cola de tareas del router I2P?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Congestión"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indica el rendimiento del router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Demora de tareas"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
-msgstr "Indica lo rápido que se envían mensajes a otros routers I2P"
+msgstr "Indica cómo de rápido se envían mensajes a otros routers I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
-msgstr "Demora del mensaje"
+msgstr "Demora de mensajes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
-msgstr "Tiempo de ida y vuelta de un test de túnel"
+msgstr "Duración del viaje de ida y vuelta de un test de túnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Demora de túneles"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
-msgstr "Solicitudes en cola desde otros routers I2P para participar en túneles"
+msgstr "Solicitudes en cola de otros routers I2P para participar en túneles"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Peticiones pendientes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
-msgstr "Noticias y actualizaciones"
+msgstr "News (usenet) y actualizaciones"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:143
 msgid "ERR-Client Manager I2CP Error - check logs"
-msgstr "ERR-Error IC2P del Administrador de Clientes - comprobar registros (logs)"
+msgstr "ERROR-Error IC2P del administrador de clientes - compruebe los registros (logs)"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:150
 #, java-format
 msgid "ERR-Clock Skew of {0}"
-msgstr "ERR-Desincronización del reloj de {0}"
+msgstr "ERROR-Desincronización del reloj de {0}"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Probando"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "Correcto"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr "ERROR-Direcciones de TCP no resueltas"
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
-msgstr "ERR-Dirección TCP privada"
+msgstr "ERROR-Dirección de TCP privada (interna)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
-msgstr "ERR-NAT simétrico"
+msgstr "ERROR-NAT simétrico"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
-msgstr "WARN-Tras cortafuegos (firewall) con TCP entrante habilitado"
+msgstr "WARN-Bloqueado por cortafuegos (firewall) y TCP entrante habilitado en el router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
-msgstr "WARN-Tras cortafuegos (firewall) y router de inundación (floodfill)"
+msgstr "WARN-Bloqueado por cortafuegos (firewall) y habilitado como router I2P de inundación (floodfill)"
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr "Bloqueado por cortafuegos (firewall)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
-msgstr "Desconectado: compruebe el cable de red"
+msgstr "Desconectado - compruebe el cable de red"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
-msgstr "ERR-Puerto UDP en uso - Establezca i2np.udp.internalPort=xxxx en la configuración avanzada y reinicie"
+msgstr "ERROR-Puerto UDP en uso - Establezca i2np.udp.internalPort=xxxx en la configuración avanzada y reinicie"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
-msgstr "ERR-No hay pares (peers) activos, compruebe la conexión de red y el cortafuegos (firewall)"
+msgstr "ERROR-No hay pares (peers) activos, compruebe la conexión a la red y el cortafuegos (firewall)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
-msgstr "ERR-UDP deshabilitado y host/puerto TCP entrante no establecido"
+msgstr "ERROR-UDP deshabilitado y equipo(host)/puerto-TCP-entrante no establecido"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
-msgstr "WARN-Tras cortafuegos (firewall) con UDP deshabilitado"
+msgstr "WARN-Bloqueado por cortafuegos (firewall) y UDP deshabilitado en el router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
-msgstr "Agregar/eliminar/editar y controlar sus túneles de cliente y servidor"
+msgstr "Añadir/eliminar/editar y controlar sus túneles de cliente y servidor"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Servidor"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "Servicio oculto"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Mostrar túneles"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
-msgstr "Leases expirados"
+msgstr "Leases (túneles asignados) caducados"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Reconstruyendo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
-msgstr "hace"
+msgstr "atrás"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Listo"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Construyendo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Creando túneles"
 
@@ -3885,31 +4060,31 @@ msgstr "Creando túneles"
 #. 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "clientes compartidos"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Pulse \"Reiniciar\" para instalar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Pulse \"Apagar\" y reinicie para instalar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Actualización disponible"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Descargar actualización {0}"
@@ -3918,40 +4093,40 @@ msgstr "Descargar actualización {0}"
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
-msgstr "Descargar actualización<br>no firmada del {0}"
+msgstr "Descargar actualización<br>no firmada de {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Ayuda con la configuración del cortafuegos (firewall)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Comprobar conexión de red y NAT/cortafuegos"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Resembrar (reseed)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Orden"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Techo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Abajo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Fondo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Seleccione una sección a añadir"
 
@@ -3977,160 +4152,160 @@ msgstr "med"
 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176
 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189
 msgid "max"
-msgstr "max"
+msgstr "máx"
 
 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177
 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190
 msgid "now"
 msgstr "ahora"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr "configurar"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr "Túneles de clientes para"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
-msgstr "inerte"
+msgstr "muerto"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "Túneles participantes"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr "Recibir en"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr "Enviar sobre"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr "Tasa"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr "Rol"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr "Uso"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr "periodo de gracia"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
-msgstr "Extremo saliente"
+msgstr "Extremo de salida"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr "Pasarela (gateway) entrante"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr "Participante"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr "Visualización limitada a los {0} túneles con mayor uso"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr "Túneles participantes inactivos"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr "Uso de ancho de banda del total de vida"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr "Caducidad"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr "Extremo"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
-msgstr "Creación de túnel en marcha"
+msgstr "Creación de túnel en curso"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr "entrante"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr "saliente"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
-msgstr "No hay túneles, esperando que termine el periodo de gracia."
+msgstr "No hay túneles. Esperando a que termine el periodo de gracia."
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr "entrada"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr "salida"
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
-msgstr "libreta de direcciones"
+msgstr "addressbook"
 
 #: ../java/strings/Strings.java:13
 msgid "i2psnark"
-msgstr "I2PSnark"
+msgstr "i2psnark"
 
 #: ../java/strings/Strings.java:14
 msgid "i2ptunnel"
-msgstr "I2PTunnel"
+msgstr "i2ptunnel"
 
 #: ../java/strings/Strings.java:15
 msgid "susimail"
-msgstr "Susimail"
+msgstr "susimail"
 
 #: ../java/strings/Strings.java:16
 msgid "susidns"
-msgstr "SusiDNS"
+msgstr "susidns"
 
 #: ../java/strings/Strings.java:17
 msgid "routerconsole"
-msgstr "Consola del router I2P"
+msgstr "routerconsole"
 
 #. clients, taken from clients.config, for ConfigClientsHelper
 #. note that if the wording changes in clients.config, we have to
 #. keep the old string here as well for existing installs
 #: ../java/strings/Strings.java:22
 msgid "Web console"
-msgstr "Consola Web"
+msgstr "Consola web"
 
 #: ../java/strings/Strings.java:23
 msgid "SAM application bridge"
-msgstr "Puente de la aplicación SAM (mensajería anónima simple)"
+msgstr "Puente (bridge) de SAM (mensajería anónima simple)"
 
 #: ../java/strings/Strings.java:24
 msgid "Application tunnels"
@@ -4138,23 +4313,23 @@ msgstr "Túneles de aplicaciones"
 
 #: ../java/strings/Strings.java:25
 msgid "My eepsite web server"
-msgstr "Mi servidor web de eepsites"
+msgstr "El servidor web de mi eepsite (web en I2P)"
 
 #: ../java/strings/Strings.java:26
 msgid "I2P webserver (eepsite)"
-msgstr "Servidor web de I2P (eepsites)"
+msgstr "Servidor web de I2P (eepsite)"
 
 #: ../java/strings/Strings.java:27
 msgid "Browser launch at startup"
-msgstr "Iniciar navegador en el arranque"
+msgstr "Abrir navegador al iniciar el router I2P"
 
 #: ../java/strings/Strings.java:28
 msgid "BOB application bridge"
-msgstr "Puente de la aplicación BOB (puente abierto básico)"
+msgstr "Puente (bridge) de BOB (puente abierto básico)"
 
 #: ../java/strings/Strings.java:30
 msgid "Open Router Console in web browser at startup"
-msgstr "Abrir la consola del router en el navegador web en el arranque"
+msgstr "Abrir la consola del router I2P en el navegador web al iniciar el router I2P"
 
 #: ../java/strings/Strings.java:37
 msgid "IRC proxy"
@@ -4166,7 +4341,7 @@ msgstr "eepsite"
 
 #: ../java/strings/Strings.java:39
 msgid "I2P webserver"
-msgstr "Servidor web I2P"
+msgstr "Servidor web de I2P"
 
 #: ../java/strings/Strings.java:40
 msgid "HTTP Proxy"
@@ -4202,7 +4377,7 @@ msgstr "oscuro"
 
 #: ../java/strings/Strings.java:53
 msgid "light"
-msgstr "luminoso"
+msgstr "claro"
 
 #: ../java/strings/Strings.java:54
 msgid "midnight"
@@ -4210,11 +4385,11 @@ msgstr "medianoche"
 
 #: ../java/strings/Strings.java:58
 msgid "BandwidthLimiter"
-msgstr "BandwidthLimiter"
+msgstr "LimitadorAnchoBanda"
 
 #: ../java/strings/Strings.java:59
 msgid "ClientMessages"
-msgstr "ClientMessages"
+msgstr "MensajesClientes"
 
 #: ../java/strings/Strings.java:60
 msgid "Encryption"
@@ -4224,17 +4399,21 @@ msgstr "Cifrado"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
-msgstr "InNetPool"
+msgstr "DepósitoTúnelesRed"
 
 #: ../java/strings/Strings.java:64
 msgid "JobQueue"
-msgstr "JobQueue"
+msgstr "ColaTareas"
 
 #: ../java/strings/Strings.java:65
 msgid "NetworkDatabase"
-msgstr "NetworkDatabase"
+msgstr "BaseDatosRed"
 
 #: ../java/strings/Strings.java:66
 msgid "ntcp"
@@ -4242,7 +4421,7 @@ msgstr "ntcp"
 
 #: ../java/strings/Strings.java:69
 msgid "Stream"
-msgstr "Flujo de datos (stream)"
+msgstr "Stream"
 
 #: ../java/strings/Strings.java:70
 msgid "Throttle"
@@ -4260,7 +4439,7 @@ msgstr "udp"
 #. may or may not be worth translating
 #: ../java/strings/Strings.java:77
 msgid "host"
-msgstr "host"
+msgstr "equipo(host)"
 
 #: ../java/strings/Strings.java:78
 msgid "key"
@@ -4322,343 +4501,351 @@ msgstr "itag1"
 msgid "itag2"
 msgstr "itag2"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr "configurar ancho de banda"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr "El router I2P está caído"
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
-msgstr "Actualizar (s)"
+msgstr "Refrescar (s)"
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr "Limitador de ancho de banda"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
-msgstr "I2P funcionará mejor si configura sus tasas de modo que coincidan con la velocidad de su conexión a Internet."
+msgstr "I2P funcionará mejor si configura sus tasas de transferencia de modo que coincidan con la velocidad de su conexión a Internet."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr "KB/s de entrada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr "KB/s de salida"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr "Compartir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr "NOTA"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, java-format
 msgid "You have configured I2P to share only {0} KBps."
 msgstr "Ha configurado I2P para compartir sólo {0} KB/s."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr "I2P requiere al menos 12KB/s para habilitar el compartido."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr "Por favor, habilite el compartido (participación en túneles) configurando un mayor ancho de banda."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 msgid ""
 "It improves your anonymity by creating cover traffic, and helps the network."
 msgstr "Esto mejorará su anonimato creando tráfico de cobertura, y ayudará a la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr "Ha configurado I2P para compartir {0} KB/s."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 msgid ""
 "The higher the share bandwidth the more you improve your anonymity and help "
 "the network."
 msgstr "Cuanto mayor sea el ancho de banda compartido, mayor será la mejora de su anonimato y su contribución a la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr "Página de configuración avanzada de la red"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr "configuración avanzada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr "Configuración avanzada de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr "Configuración de I2P avanzada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr "Algunos cambios pueden requerir un reinicio para que surtan efecto."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr "Para realizar cambios, edite el fichero {0}."
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr "configuración de clientes"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
-msgstr "Configuración de clientes I2P"
+msgstr "Configuración de clientes de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr "Configuración de clientes"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
-msgstr "Los clientes de Java que se enumeran a continuación son iniciados por el router I2P y se ejecutan en la misma JVM."
+msgstr "Los clientes Java que se enumeran a continuación son iniciados por el router I2P y se ejecutan en la misma máquina virtual de Java (JVM)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
-msgstr "Tenga precaución aquí al cambiar cualquier configuración. La 'consola del router I2P' y los 'túneles de aplicaciones' se requieren para la mayoría de usos de I2P. Estas sólo deberían cambiarlas los usuarios avanzados."
+msgstr "Tenga precaución aquí al cambiar cualquier configuración. La 'consola del router I2P' y los 'túneles de aplicación' se requieren para la mayoría de usos de I2P. Sólo deberían cambiarlas los usuarios avanzados."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr "Para cambiar otras opciones de clientes, edite el fichero"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr "Todos los cambios requieren reiniciar para que surtan efecto."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
-msgstr "Configuración avanzada de la interfaz del cliente"
+msgstr "Configuración avanzada de la interfaz de cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
-msgstr "Configuración de la interfaz exterior de I2CP (protocolo cliente de I2P)"
+msgstr "Configuración de la interfaz externa de I2CP (protocolo de clientes de I2P)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr "Habilitada sin SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr "Habilitada con SSL obligatorio"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
-msgstr "Deshabilitada - Los clientes fuera de este proceso Java podrían no conectarse"
+msgstr "Deshabilitada - Los clientes fuera de este proceso Java no podrán conectar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
-msgstr "Puerto I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
 msgid "I2CP Interface"
 msgstr "Interfaz I2CP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Puerto I2CP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorización"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
-msgstr "Requerir nombre de usuario y contraseña"
+msgstr "Solicitar nombre de usuario y contraseña"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr "La configuración por defecto funcionará para la mayoría de la gente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr "Cualquier cambio realizado aquí también debe configurarse en el cliente externo."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr "Muchos clientes no soportan SSL o autorización."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr "Configuración de aplicaciones web"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4666,9 +4853,9 @@ msgid ""
 "(e.g. i2psnark),front-ends to another client or application which must be "
 "separately enabled (e.g. susidns, i2ptunnel), or have no web interface at "
 "all (e.g. addressbook)."
-msgstr "Las aplicaciones web Java que se enumeran a continuación son iniciadas por el cliente de consola web, y se ejecutan en la misma máquina vitual de Java (JVM) que el router I2P. Por lo general son aplicaciones web accesibles a través de la consola del router I2P. Pueden ser aplicaciones completas (i2psnark por ejemplo), interfaces de usuario de otro cliente, o aplicaciones que deben ser habilitadas por separado (por ejemplo susidns e i2ptunnel), o que no tienen interfaz web ninguna (por ejemplo adressbook)."
+msgstr "Las aplicaciones web Java que se enumeran a continuación son iniciadas por el cliente webConsole (consola web), y se ejecutan en la misma máquina vitual de Java (JVM) que el router I2P. Por lo general son aplicaciones web accesibles a través de la consola del router I2P. Pueden ser aplicaciones completas (por ejemplo i2psnark), interfaces gráficas de otros clientes o aplicaciones (que habrían de ser habilitados por separado como susidns o i2ptunnel), u otras que no tienen interfaz web alguna (por ejemplo addressbook)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4676,1461 +4863,1473 @@ msgid ""
 "preferred method."
 msgstr "Una aplicación web también se puede deshabilitar eliminando el archivo .war del directorio webapps; sin embargo, el archivo .war y la aplicación web volverán a aparecer al actualizar el router I2P a una nueva versión, así que el método permanente preferido es deshabilitar la aplicación web aquí."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr "Configuración de complementos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr "Los complementos enumerados a continuación son iniciados por el cliente webConsole (consola web)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr "Instalación de complementos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr "Busca complementos disponibles en {0}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr "Para instalar un complemento, introduzca la URL de descarga:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr "configuración de página principal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr "Página principal predeterminada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
-msgstr "Utilizar página principal anterior"
+msgstr "Utilizar página principal antigua"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr "Motores de búsqueda"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
-msgstr "Eepsites recomendados"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "Servicios ocultos de interes"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
-msgstr "Servicios locales"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
+msgstr "Aplicaciones y configuración"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
-msgstr "configuración de juego de claves"
+msgstr "configuración del juego de claves"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
-msgstr "Configuración de juego de claves (keyring) de I2P"
+msgstr "Configuración del juego de claves (keyring) de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
-msgstr "El juego de claves (keyring) del router I2P se utiliza para descifrar leaseSets (túneles a un destino) cifrados."
+msgstr "El juego de claves del router I2P se utiliza para descifrar LeaseSets (túneles al mismo destino) cifrados."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
-msgstr "El juego de claves (keyring) puede contener claves para destinos cifrados locales o remotos."
+msgstr "El juego de claves puede contener claves para destinos cifrados locales o remotos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr "Adición manual al juego de claves"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
-msgstr "Introduzca las claves para destinos cifrados remotos aquí."
+msgstr "Introduzca claves para destinos cifrados remotos aquí."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr "Las claves para los destinos locales deben introducirse en la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr "página de I2PTunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
-msgstr "Nombre del destino, hash o clave completa"
+msgstr "Nombre dest., ident. (hash), o clave completa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr "Clave de cifrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
-msgstr "configuración de registro (log)"
+msgstr "configuración de registro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
-msgstr "Configuración del registro (log) de I2P"
+msgstr "Configuración de registro (logging) de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
-msgstr "Configurar las opciones del registro (log) de I2P"
+msgstr "Configurar las opciones de registro de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
-msgstr "Fichero del registro (log)"
+msgstr "Fichero de registro (log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "Edite {0} para cambiar"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
-msgstr "(el símbolo '@' será reemplazado durante la rotación del registro (log))"
+msgstr "(el símbolo '@' será reemplazado durante la rotación del registro)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
-msgstr "Formato de anotación del registro (log)"
+msgstr "Formato de apunte del registro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
-msgstr "(usa 'd' = fecha, 'c' = clase, 't' = hilo, 'p' = prioridad, 'm' = mensaje)"
+msgstr "(use 'd' = fecha, 'c' = clase, 't' = hilo, 'p' = prioridad, 'm' = mensaje)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
-msgstr "Formato de fecha del registro (Iog)"
+msgstr "Formato de fecha del registro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = mes, 'dd' = día, 'HH' = hora, 'mm' = minuto, 'ss' = segundo, 'SSS' = milisegundo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
-msgstr "Tamaño máximo del fichero de registro (log)"
+msgstr "Tamaño máximo del fichero de registro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Nivel predeterminado de registro (log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG e INFO (depuración e información) no se recomiendan por defecto, ya que ralentizarían drásticamente el router I2P)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
-msgstr "Excepciones al nivel de registro (log)"
+msgstr "Excepciones al nivel de registro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nueva excepción"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr "configuración de red"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr "Configuración de la red I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr "Configuración de IP y transporte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr "Hay ayuda debajo."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
-msgstr "Configuración UPnP"
+msgstr "Configuración de UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
-msgstr "Habilitar a UPnP para abrir puertos del cortafuegos"
+msgstr "Habilitar a UPnP para abrir puertos del cortafuegos (firewall)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr "Estado de UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
-msgstr "Configuración IP"
+msgstr "Configuración de IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
-msgstr "Nombre del equipo (host) o dirección IP accesible externamente"
+msgstr "Nombre del equipo (host) o dirección IP accesible desde el exterior"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr "Utilizar todos los métodos de detección automática"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
-msgstr "Deshabilitar detección de direcciones IP de UPnP"
+msgstr "Deshabilitar detección de direcciones IP mediante UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
-msgstr "Ignorar dirección IP de la interfaz local"
+msgstr "Ignorar dirección IP de la interfaz local de red"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
-msgstr "Utilizar detección de direcciones IP sólo por SSU"
+msgstr "Utilizar detección de direcciones IP sólo mediante SSU"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr "Modo oculto - no se publica la IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
-msgstr "(evita el tráfico de participantes)"
+msgstr "(evita el tráfico participante)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr "Especificar nombre de equipo (host) o IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
-msgstr "Acción al cambiar de IP"
+msgstr "Acción cuando cambia la IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
-msgstr "Modo portátil - Cambia la identificación del router y el puerto UDP cuando cambia la IP para mejorar el anonimato"
+msgstr "Modo portátil - Para mejorar el anonimato reemplaza la identidad del router I2P y el puerto UDP cuando la IP cambia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr "Experimental"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr "Configuración de IPV6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr "Deshabilitar IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr "Habilitar IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr "Preferir IPv4 sobre IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr "Preferir IPv6 sobre IPv4"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr "Sólo usar IPv6 (deshabilitar IPv4)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr "Configuración UDP:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr "Puerto UDP:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr "Deshabilitar por completo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr "(seleccionar sólo si se encuentra tras un cortafuegos (firewall) que bloquea el UDP saliente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
-msgstr "Configuración TCP"
+msgstr "Configuración de TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr "Utilizar dirección IP detectada automáticamente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
-msgstr "actualmente"
+msgstr "en la actualidad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
-msgstr "si no estamos bloqueados por cortafuegos (firewall)"
+msgstr "si no está bloqueado por cortafuegos (firewall)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
-msgstr "Siempre utilizar la dirección IP detectada automáticamente (no bloqueado por cortafuegos)"
+msgstr "Utilizar siempre la dirección IP detectada automáticamente (no bloqueado por cortafuegos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr "Deshabilitar entrantes (bloqueado por cortafuegos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr "(seleccionar sólo si está detrás de un cortafuegos (firewall) que regula o bloquea el TCP saliente)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
-msgstr "Puerto TCP externamente accesible"
+msgstr "Puerto TCP accesible desde el exterior"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr "Usar el mismo puerto configurado para UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
-msgstr "Elegir un puerto"
+msgstr "Especificar puerto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr "Notas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
-msgstr "a) ¡No revele sus números de puerto a nadie! b) La modificación de estos ajustes reiniciará el router I2P."
+msgstr "a) NO REVELE SUS NÚMEROS DE PUERTO A NADIE b) La modificación de estos ajustes reiniciará el router I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr "Ayuda de configuración"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
-msgstr "Aunque I2P funcionará detrás de la mayoría de cortafuegos (firewalls), las velocidades e integración en la red mejorarán generalmente si el puerto de I2P es retransmitido tanto por UDP como por TCP."
+msgstr "Aunque I2P funcionará detrás de la mayoría de cortafuegos (firewalls), las velocidades e integración en la red generalmente mejorarán si el puerto de I2P es retransmitido tanto por UDP como por TCP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
-msgstr "Si es posible, por favor permita el paso por el cortafuegos (firewall) de los paquetes TCP y UDP no solicitados hasta usted."
+msgstr "Si es posible, por favor permita el paso por el cortafuegos hasta usted de los paquetes TCP y UDP no solicitados."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
-msgstr "Si no puede ser, I2P soporta UPnP (Universal Plug and Play) y apertura dinámica (hole punching) de UDP mediante \"introducciones SSU\" (equivalente UDP en I2P) para la repetición de tráfico."
+msgstr "Si no puede, para repetir el tráfico I2P soporta UPnP (Universal Plug and Play) y apertura dinámica (hole punching) de UDP mediante \"introducciones SSU\"."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
-msgstr "La mayoría de las opciones anteriores son para situaciones especiales, por ejemplo, cuando UPnP no funciona correctamente, o un cortafuegos (firewall) que no está bajo su control está perjudicando."
+msgstr "La mayoría de las opciones de arriba son para situaciones especiales, por ejemplo, cuando UPnP no funciona correctamente, o un cortafuegos que no está bajo su control está perjudicando."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
-msgstr "Puede que algunos cortafuegos como aquellos con NATs simétricos no funcionen bien con I2P."
+msgstr "Puede que algunos cortafuegos, como aquellos con NATs simétricos, no funcionen bien con I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
-msgstr "UPnP se utiliza para comunicarse con dispositivos de puerta de enlace a Internet (IGDs), para detectar su dirección IP externa y retransmitirles los puertos"
+msgstr "UPnP se utiliza para comunicarse con dispositivos de pasarela a Internet (IGDs), para detectar la dirección IP externa y retransmitir hacia esta los puertos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr "El soporte de UPnP está en fase beta, y puede no funcionar por varias razones"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr "No se encontró ningún dispositivo con compatibilidad UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr "UPnP deshabilitado en el dispositivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr "Un software cortafuegos (firewall) interfiere con UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
-msgstr "Errores en la implementación de UPnP del dispositivo"
+msgstr "Fallos en la implementación UPnP del dispositivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
-msgstr "Múltiples cortafuegos/dispositivos-de-router en la ruta de conexión a Internet"
+msgstr "Múltiples cortafuegos/routers en la ruta de conexión a Internet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
-msgstr "El dispositivo UPnP fue sustituído, reiniciado, o ha cambiado de dirección"
+msgstr "El dispositivo UPnP fue reemplazado, reiniciado, o ha cambiado de dirección"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr "Revise el estado de UPnP aquí."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
-msgstr "UPnP puede ser habilitado o deshabilitado arriba, pero un cambio requiere un reinicio del dispositivo router para que surta efecto."
+msgstr "UPnP puede ser habilitado o deshabilitado arriba, pero un cambio requiere un reinicio del router I2P para que surta efecto."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
-msgstr "Los nombres de equipos (hosts) introducidos arriba se publicarán en la base de datos de red."
+msgstr "Los nombres de equipo (host) introducidos arriba se publicarán en la base de datos de red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr "<b>No son privados.</b>"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr "Además, <b>no debe introducir una dirección IP privada</b> como 127.0.0.1 o 192.168.1.1."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
-msgstr "Si especifica una dirección IP o nombre de equipo (host) incorrecto, o no configura correctamente el NAT o cortafuegos (firewall), el rendimiento de la red se degradará considerablemente."
+msgstr "Si especifica una dirección IP o nombre de equipo (host) incorrecto, o no configura correctamente el NAT el o cortafuegos (firewall), el rendimiento de la red se degradará considerablemente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr "En caso de duda, deje los ajustes con los valores predeterminados."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr "Ayuda de accesibilidad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr "Si cree que ha abierto el cortafuegos (firewall) pero I2P todavía estima que sigue bloqueado por uno, recuerde que podría tener múltiples cortafuegos, por ejemplo cortafuegos por software o en dispositivos de router externos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr "Si hay un error, los <a href=\"logs.jsp\">registros (logs)</a> también pueden ayudar a diagnosticar el problema."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr "El puerto UDP no parece estar bloqueado por un cortafuegos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr "El puerto UDP parece estar bloqueado por un cortafuegos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr "Como los métodos de detección de cortafuegos (firewall) no son 100% fiables, esto puede haber aparecido por error."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
-msgstr "Sin embargo, si aparece constantemente, debería comprobar si tanto sus cortafuegos internos como externos tienen los puertos abiertos."
+msgstr "No obstante, si aparece constantemente, debería comprobar si tanto sus cortafuegos internos como externos dejan pasar sus puertos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
-msgstr "I2P funcionará bien aún estando bloqueado por un cortafuegos, no hay motivo de preocupación. Si está detrás de un cortafuegos (firewall), el router I2P utiliza \"introductores\" para repetir las conexiones entrantes."
+msgstr "I2P funcionará bien aún estando bloqueado por un cortafuegos, no hay motivo de preocupación. Cuando esté bloqueado por un cortafuegos, el router I2P utilizará \"introductores\" para retransmitir las conexiones entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
-msgstr "No obstante, obtendrá más tráfico participante y ayudará más a la red si puede abrir su(s) cortafuego(s)."
+msgstr "No obstante, conseguirá más tráfico participante y ayudará más a la red si puede abrir su(s) cortafuego(s)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr "Si cree que ya lo ha hecho, recuerde que puede que tenga tanto cortafuegos por hardware como por software, o que puede estar tras otro cortafuegos institucional fuera de su control."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
-msgstr "Además, algunos routers no pueden encaminar correctamente TCP y UDP por el mismo puerto, o pueden tener otras limitaciones o bugs que les impidan pasar tráfico a través de I2P."
+msgstr "Además, algunos dispositivos de router no pueden retransmitir correctamente TCP y UDP por el mismo puerto, o pueden tener otras limitaciones o fallos que les impidan hacer pasar el tráfico a través de la red I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
-msgstr "El router está probando si tu puerto UDP está bloqueado por un cortafuegos."
+msgstr "El router I2P está comprobando si su puerto UDP está bloqueado por un cortafuegos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
-msgstr "El router no está configurado para publicar su dirección, por lo tanto, no espera conexiones entrantes."
+msgstr "El router I2P no está configurado para publicitar su dirección, por tanto no espera conexiones entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr "El modo oculto se activa automáticamente para mayor protección en algunos países."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
-msgstr "AVISO - Bloqueado por cortafuegos y rápido"
+msgstr "WARN - Bloqueado por cortafuegos, y nivel rápido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
-msgstr "Has configurado I2P para compartir más de 128 kbps de ancho de banda, pero te encuentras bloqueado por un cortafuegos"
+msgstr "Ha configurado I2P para compartir más de 128 KB/s de ancho de banda, pero se encuentra bloqueado por un cortafuegos (firewall)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
-msgstr "Aunque I2P funcionará bien con esta configuración, si realmente tiene más de 128 kbps de ancho de banda para compartir, será mucho más útil a la red si abre los puertos de su router."
+msgstr "Aunque I2P funcionará bien con esta configuración, si de veras tiene más de 128 KB/s de ancho de banda para compartir, será mucho más útil a la red si abre los puertos en su cortafuegos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
-msgstr "AVISO - Bloqueado por cortafuegos y Floodfill"
+msgstr "WARN - Bloqueado por cortafuegos, y router I2P de inundación"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
-msgstr "Has configurado I2P ser un router floodfill, pero estás bloqueado por un cortafuegos."
+msgstr "Ha configurado I2P para que sea un router de inundación (floodfill), pero está bloqueado por un cortafuegos (firewall)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
-msgstr "Para mejorar la participación como router floodfill, deberías abrir tu cortafuegos."
+msgstr "Para optimizar la participación como router de inundación, debe abrir los puertos del cortafuegos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
-msgstr "AVISO - Bloqueado por cortafuegos con TCP entrante activado"
+msgstr "WARN - Bloqueado por cortafuegos, y con TCP entrante habilitado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
-msgstr "Has configurado TCP entrante, sin embargo el puerto UDP está bloqueado por un cortafuegos, y por lo tanto es probable que el puerto TCP esté bloqueado también."
+msgstr "Ha habilitado el TCP entrante en el router I2P, sin embargo el puerto UDP está bloqueado por cortafuegos (firewall), y por tanto es probable que el puerto TCP también esté bloqueado."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
-msgstr "Si el puerto TCP está bloqueado por un cortafuegos con TCP entrante habilitado, los routers no podrán ponerse en contacto con el tuyo a través de TCP, lo que perjudicará a la red."
+msgstr "Si su puerto TCP está bloqueado por cortafuegos con el TCP entrante habilitado en su router I2P, otros routers I2P no podrán contactar con usted a través de TCP, lo que perjudicará a la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
-msgstr "Por favor, ¡abre los puertos del cortafuegos o desactiva TCP entrante arriba!"
+msgstr "Por favor, abra los puertos en el cortafuegos o deshabilite arriba el TCP entrante."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
-msgstr "AVISO - Bloqueado por cortafuegos con UDP deshabilitado"
+msgstr "WARN - Bloqueado por cortafuegos, y con UDP deshabilitado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
-msgstr "Has configurado TCP entrante, sin embargo has deshabilitado UDP."
+msgstr "Ha habilitado el TCP entrante en el router I2P, sin embargo ha deshabilitado UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
-msgstr "Parece que estás siendo bloqueado por un cortafuegos en TCP, por lo tanto el router no puede aceptar conexiones entrantes."
+msgstr "Parece que está bloqueado por cortafuegos (firewall) sobre TCP, por tanto su router I2P no puede aceptar conexiones entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
-msgstr "Por favor, ¡abre el cortafuegos o habilita UDP!"
+msgstr "Por favor abra sus puertos TCP en el cortafuegos, o habilite UDP en el router I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
-msgstr "ERR - desviación de reloj"
+msgstr "ERROR - Desincronización del reloj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
-msgstr "El reloj del sistema está desviado, lo que hará difícil participar en la red."
+msgstr "El reloj de su sistema está desincronizado, lo que dificultará que participe en la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
-msgstr "Corrija su ajuste del reloj, si este error persiste."
+msgstr "Corrija los ajustes de su reloj si este error persiste."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
-msgstr "ERR - Dirección TCP privada"
+msgstr "ERROR - Dirección de TCP privada (interna)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
-msgstr "Nunca debes anunciar una dirección IP no enrutable, como 127.0.0.1 o 192.168.1.1 como tu dirección externa."
+msgstr "Nunca debe publicitar como su dirección externa una dirección IP (interna) no enrutable del tipo 127.0.0.1 o 192.168.1.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
-msgstr "Corrija la dirección o desactive TCP entrante arriba."
+msgstr "Corrija la dirección o deshabilite el TCP entrante arriba."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
-msgstr "ERR - NAT Simétrico"
+msgstr "ERROR - NAT Simétrico"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
-msgstr "I2P ha detectado que está siendo bloqueado por un NAT simétrico."
+msgstr "I2P ha detectado que está siendo bloqueado un cortafuegos con NAT simétrico."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
-msgstr "I2P no funciona bien detrás de este tipo de cortafuegos. Probablemente no serás capaz de aceptar conexiones entrantes, lo que limitará tu participación en la red."
+msgstr "I2P no funciona bien detrás de este tipo de cortafuegos. Probablemente no podrá aceptar conexiones entrantes, lo que limitará su participación en la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
-msgstr "ERR - el puerto UDP está en uso - ¡Establece i2np.udp.internalPort=xxxx en configuración avanzada reinicia!"
+msgstr "ERROR - El puerto UDP está en uso - Cámbielo en i2np.udp.internalPort=xxxx en la configuración avanzada y reinicie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
-msgstr "I2P no pudo enlazar con el puerto 8887 o el otro puerto configurado."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
+msgstr "I2P no pudo ser ligado al puerto establecido en la página de configuración avanzada de red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
-msgstr "Comprueba si otro programa está utilizando el puerto configurado. Si es así, cierra el programa o configura I2P para utilizar un puerto diferente."
+msgstr "Compruebe si otro programa está utilizando el puerto configurado. Si es así, cierre el programa o configure I2P para utilizar un puerto diferente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
-msgstr "Esto puede ser un error transitorio, si el otro programa ya no utiliza el puerto."
+msgstr "Esto puede ser un error transitorio si el otro programa ya no utiliza el puerto."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr "Sin embargo, siempre es necesario reiniciar después de que aparezca este error."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
-msgstr "ERR - UDP deshabilitado y el host/puerto de entrada TCP no ha sido establecido"
+msgstr "ERROR - UDP deshabilitado, y equipo(host)/puerto-TCP entrante no establecido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
-msgstr "Arriba no has configurado TCP entrante con un nombre de host y puerto, sin embargo has deshabilitado UDP."
+msgstr "No ha configurado arriba el TCP entrante con un nombre de equipo (host) y puerto, no obstante ha deshabilitado UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr "Por lo tanto el router no puede aceptar conexiones entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
-msgstr "Por favor, configure un host y puerto TCP arriba o permita UDP."
+msgstr "Por favor configure arriba un equipo y puerto TCP, o habilite UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
-msgstr "ERR - Error Client Manager I2CP - verificar los registros"
+msgstr "ERROR - Error I2CP del administrador de clientes - revise los registros"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
-msgstr "Esto se debe generalmente a un conflicto en el puerto 7654. ¡Revisa los registros para verificarlo!"
+msgstr "Esto se debe generalmente a un conflicto en el puerto 7654. Revise los registros (logs) para verificarlo."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
-msgstr "¿Tienes otra instancia I2P funcionando? ¡Deten el programa en conflicto y reinicia I2P!"
+msgstr "¿Tiene otra instancia de I2P en ejecución? Detenga el programa que ocasiona el conflicto y reinicie I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr "configuración de pares"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
-msgstr "Configuración de los pares I2P"
+msgstr "Configuración de pares (peers) de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
-msgstr "Controles Manuales de pares"
+msgstr "Controles manuales de los pares"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
-msgstr "Hash del Router"
+msgstr "Identificador (hash) del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
-msgstr "Banear / Desbanear manualmente a un par"
+msgstr "Excluir / Readmitir manualmente a un par"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
-msgstr "Banear evitará que este par participe en cualquiera de los túneles que vayas crear."
+msgstr "La exclusión evitará que este par participe en cualquiera de los túneles que usted vaya a crear."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
-msgstr "Ajustar Perfil de Bonus"
+msgstr "Ajustar bonus de perfiles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
 "Capacity peers are used for some exploratory tunnels. Current bonuses are "
 "displayed on the"
-msgstr "Los bonus pueden ser positivos o negativos, y afectan a la inclusión de un par en los niveles 'Rápido' y 'de alta capacidad'. Los pares rápidos se utilizan para los túneles de clientes, los par de alta capacidad se utilizan para algunos túneles exploratorios. Los bonus actuales se muestran en la"
+msgstr "Los bonus pueden ser positivos o negativos, y afectan a la inclusión de un par en los niveles 'Rápido' y de 'Alta capacidad'. Los pares rápidos se utilizan para los túneles de clientes, los pares de alta capacidad se utilizan para algunos túneles exploratorios. Los bonus actuales se muestran en la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr "página de perfiles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
-msgstr "Pares (peers) exluídos"
+msgstr "Pares excluidos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
-msgstr "IPs excluídas"
+msgstr "IPs excluidas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
-msgstr "config para resembrar "
+msgstr "configuración de resembrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
-msgstr "Configuración del proceso de resembrar I2P"
+msgstr "Configuración de resembrado de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
-msgstr "Configuración de Resembrar"
+msgstr "Configuración de resembrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
-msgstr "Resembrar es el proceso de bootstrapping para encontrar otros routers cuando I2P se instala por primera vez o cuando al router le quedan muy pocas referencias de otros routers."
+msgstr "El resembrado (reseeding) es el proceso de inicialización utilizado para encontrar otros routers I2P cuando instala la aplicación por primera vez, o cuando a su router I2P le quedan muy pocas referencias de otros."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
-msgstr "El proceso de resembrar ha fallado, primero debes comprobar la conexión de red."
+msgstr "Si el resembrado ha fallado, primero debe comprobar la conexión a la red."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
-msgstr "¡Cambia estos parámetros solamente si HTTP está bloqueado por un cortafuegos restrictivo, el proceso de resembrar ha fracasado, y si tienes acceso a un proxy HTTP!"
+msgstr "Solamente cambie estos parámetros si HTTP está bloqueado por un cortafuegos (firewall) restrictivo, el proceso de resembrado ha fracasado, y tiene acceso a un proxy HTTP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
-msgstr "Ver {0} para obtener instrucciones sobre cómo resembrar manualmente."
+msgstr "Vea {0} para obtener instrucciones sobre cómo resembrar manualmente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
-msgstr "las preguntas más frecuentes"
+msgstr "las preguntas frecuentes (FAQ)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
-msgstr "Selección de URL resembradora"
+msgstr "Selección de URL de resembrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
-msgstr "Probar SSL primero y luego no-SSL"
+msgstr "Probar primero SSL y luego no-SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr "Usar SSL exclusivamente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr "Usar no-SSL exclusivamente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
-msgstr "URLs resembradoras"
+msgstr "URLs de resembrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
-msgstr "Habilitar Proxy HTTP?"
+msgstr "¿Habilitar proxy HTTP?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
-msgstr "Host HTTP Proxy"
+msgstr "Equipo (host) del proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
-msgstr "Puerto HTTP Proxy"
+msgstr "Puerto del proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
-msgstr "Utilizar autorización Proxy HTTP?"
+msgstr "¿Utilizar autorización para el proxy HTTP?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
-msgstr "Nombre de usuario Proxy HTTP"
+msgstr "Nombre de usuario del proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
-msgstr "Contraseña Proxy HTTP"
+msgstr "Contraseña del proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
-msgstr "Activar Proxy HTTPS?"
+msgstr "¿Habilitar proxy HTTPS?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
-msgstr "Host Proxy HTTPS"
+msgstr "Equipo (host) del proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
-msgstr "Puerto Proxy HTTPS"
+msgstr "Puerto del proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
-msgstr "Usar Autorización Proxy HTTPS?"
+msgstr "¿Utilizar autorización para el proxy HTTPS?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
-msgstr "Nombre de usuario Proxy HTTPS"
+msgstr "Nombre de usuario del proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
-msgstr "Nombre de usuario Proxy HTTPS"
+msgstr "Contraseña del proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
-msgstr "configuración de servicios"
+msgstr "configuración del servicio"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
-msgstr "Configuración de Servicios I2P"
+msgstr "Configuración del servicio I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
-msgstr "Apagar el router"
+msgstr "Apagar el router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
-msgstr "El apagado controlado permite al router cumplir los acuerdos que ya ha hecho antes de apagar, pero puede tardar unos minutos."
+msgstr "El apagado controlado permite al router I2P cumplir los acuerdos ya negociados antes de apagar, pero puede tardar unos minutos."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
-msgstr "Si tienes que apagar el router inmediatamente, también tienes esa opción"
+msgstr "Si tiene que apagar inmediatamente el router I2P, también tiene esa opción."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
-msgstr "Si deseas que el router se reinicie después del apagado, puedes elegir una de las siguientes opciones."
+msgstr "Si quiere que el router I2P se reinicie después de apagarlo, puede elegir una de las siguientes opciones."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
-msgstr "Esto es útil en algunas situaciones - por ejemplo, si has cambiado algunas opciones de aplicaciones cliente que sólo se leen al iniciar, como la contraseña de la consola del router o tu interfaz de escucha."
+msgstr "Esto es útil en algunas situaciones - por ejemplo, si ha cambiado algunas opciones que las aplicaciones cliente sólo leen al iniciarse el router I2P, como la contraseña de routerconsole (consola del router I2P) o la interfaz de red que se escucha."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
-msgstr "Un reinicio controlado tardará unos minutos (pero tus pares te agradecerán tu paciencia), mientras que un reinicio duro lo hace inmediatamente."
+msgstr "Un reinicio controlado tardará unos minutos (pero sus pares (peers) apreciarán su paciencia), mientras que un reinicio duro se realiza inmediatamente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
-msgstr "Después de apagarse completamente, el router esperará 1 minuto antes de volverse a iniciar."
+msgstr "Después de apagarse completamente, el router esperará 1 minuto antes de volver a iniciarse."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
-msgstr "integración con la bandeja del sistema"
+msgstr "Integración con la bandeja del sistema"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
-msgstr "En la plataforma Windows, hay una pequeña aplicación que se queda en la bandeja del sistema, lo que le permite ver el estado del router"
+msgstr "En la plataforma Windows, hay una pequeña aplicación que se sitúa en la bandeja del sistema, permitiéndole ver el estado del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
-msgstr "(Más adelante, las aplicaciones I2P de clientes serán capaces de integrar su propia funcionalidad en la bandeja de sistema también)."
+msgstr "(más adelante, las aplicaciones cliente de I2P también serán capaces de integrar su propia funcionalidad en la bandeja del sistema)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
-msgstr "Si estás en Windows, puedes activar o desactivar ese icono aquí."
+msgstr "Si está en Windows, puede habilitar o deshabilitar ese icono aquí."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
-msgstr "Mostrar icono de la bandeja del sistema"
+msgstr "Mostrar icono de bandeja del sistema"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
-msgstr "Ocultar icono de la bandeja del sistema"
+msgstr "Ocultar icono de bandeja del sistema"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
-msgstr "Lanzar al iniciar"
+msgstr "Ejecutar en el arranque del sistema"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
-msgstr "Puedes controlar si I2P se ejecuta automaticamente al arrancar el equipo o no, seleccionando una de las siguientes opciones - I2P instalará (o eliminará) un servicio en consecuencia."
+msgstr "Puede controlar si I2P se ejecuta automáticamente al arrancar el sistema o no seleccionando una de las siguientes opciones - I2P instalará (o eliminará) un servicio en consecuencia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
-msgstr "Si usted prefiere la línea de comandos, también puede ejecutar"
+msgstr "Si usted prefiere la línea de comandos, también puede ejecutar la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr "Nota"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
-msgstr "Si estás ejecutando I2p como servicio en este momento, quitarlo hará que se apague el router de inmediato."
+msgstr "Si está ejecutando I2P como servicio en este momento, eliminarlo hará que se apague el router I2P de inmediato."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
-msgstr "Es recomendable que consideres el apagado controlado como se indica arriba, para ello, ejecuta uninstall_i2p_service_winnt.bat."
+msgstr "Como alternativa puede considerar el apagado controlado, como se indica arriba, y luego ejecutar uninstall_i2p_service_winnt.bat para desinstalarlo."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
-msgstr "Debugging"
+msgstr "Depuración"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
-msgstr "Ver cola de tareas"
+msgstr "Ver la cola de tareas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
-msgstr "A veces, puede ser útil depurar I2P consiguiendo un volcado de hilo. Para ello, selecciona la opción siguiente y revisa el dump en <a href=\"logs.jsp#servicelogs\">wrapper.log</a> ."
+msgstr "A veces puede ser provechoso depurar I2P obteniendo un volcado del hilo. Para ello, seleccione la opción siguiente y revise el volcado en <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
-msgstr "Iniciar el navegador al arrancar el router?"
+msgstr "¿Abrir el navegador al iniciar el router I2P?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
-msgstr "La interfaz de configuración principal de I2P es esta consola Web. Para tu comodidad I2P puede lanzar el navegador web en al iniciar apuntando a"
+msgstr "La interfaz de configuración principal de I2P es esta consola web. Para su comodidad, al iniciarse el router I2P, puede abrirse el navegador web apuntando a la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
-msgstr "configurar barra del resumen"
+msgstr "configuración de la barra de resumen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
-msgstr "Configuración de la barra del resumen"
+msgstr "Configuración de la barra de resumen de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
-msgstr "Intervalo de Recarga"
+msgstr "Intervalo de refresco"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr "segundos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
-msgstr "Modificar barra del resumen"
+msgstr "Personalizar barra de resumen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
-msgstr "config de estadísticas"
+msgstr "configuración de estadísticas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
-msgstr "Ajustes de Estadísticas I2P"
+msgstr "Configuración de estadísticas de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
-msgstr "Configurar colección de estadísticas I2P"
+msgstr "Configurar recopilación de estadísticas de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
-msgstr "Habilitar estadísticas completas?"
+msgstr "¿Habilitar estadísticas completas?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
-msgstr "Cambiar esto requiere un reinicio para que los cambios surtan efecto"
+msgstr "los cambios requieren reiniciar para que surtan efecto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
-msgstr "Archivo de estadísticas"
+msgstr "Fichero de estadísticas"
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
-msgstr "cambiar todos"
+msgstr "accionar todos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
-msgstr "Registro"
+msgstr "Registro (log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
-msgstr "Gráficas"
+msgstr "Gráfica"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr "Filtro avanzado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
-msgstr "Configuración de túneles"
+msgstr "configuración de túneles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
-msgstr "Configuración de túneles I2P"
+msgstr "Configuración de túneles de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr "La configuración por defecto funciona para la mayoría de gente."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
-msgstr "Hay un equilibrio fundamental entre el anonimato y el rendimiento."
+msgstr "Hay un equilibrio fundamental entre anonimato y rendimiento."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
-msgstr "Los túneles de más de tres saltos (por ejemplo, 2 + 0-2 saltos, 3 saltos+ 0-1 saltos, 3 saltos + 0-2 saltos), o una alta cantidad incluyendo túneles de respaldo, pueden reducir severamente el rendimiento o la fiabilidad."
+msgstr "Los túneles de más de 3 saltos (por ejemplo, 2 + 0-2 saltos, 3 + 0-1 saltos, 3 + 0-2 saltos), o una alta cantidad + una cantidad de túneles de respaldo, pueden reducir severamente el rendimiento o la fiabilidad."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
-msgstr "Puede resultar en un uso alto de CPU y/o un uso de gran ancho de banda de salida "
+msgstr "Puede producirse un elevado uso de la CPU y/o del ancho de banda de salida."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
-msgstr "Cambia esta configuración con cuidado, y ajústala en caso de tener problemas."
+msgstr "Cambie estas opciones con cuidado, y ajústelas en caso de tener problemas."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
-msgstr "Los cambios en los túneles exploratorios se almacenan en el archivo router.config."
+msgstr "Los cambios en las configuraciones de los túneles exploratorios se almacenan en el fichero router.config ."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
-msgstr "Los cambios en túnel de cliente son de carácter temporal y no se guardarán."
+msgstr "Los cambios en túneles de cliente son de carácter temporal y no se guardan."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
-msgstr "Para hacer cambios permanentes al túnel de cliente ve a la"
+msgstr "Para hacer cambios permanentes en túneles de cliente vea la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
-msgstr "Página túnel I2P"
+msgstr "página de i2ptunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
-msgstr "configuración IU"
+msgstr "configuración de la interfaz de usuario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
-msgstr "Interfaz de Usuario"
+msgstr "Configuración de la interfaz de usuario de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
-msgstr "Tema de la Consola del Router"
+msgstr "Tema decorativo de la consola del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
-msgstr "Lo sentimos, pero la selección de temas está deshabilitada para Internet Explorer."
+msgstr "Lo sentimos, pero la selección de temas decorativos está deshabilitada para Internet Explorer."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
-msgstr "Si no estás utilizando Internet Explorer, es probable que tu navegador se esté haciendo pasar por el IE, por favor, configura tu navegador (o proxy) para utilizar un agente de usuario diferente si deseas acceder a los temas de la consola."
+msgstr "Si no está utilizando Internet Explorer es probable que su navegador se esté haciendo pasar por él; por favor, configure su navegador (o proxy) para que utilice una cadena de agente de usuario distinta a la de IE si desea acceder a los temas decorativos de la consola."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
-msgstr "Idioma de la Consola del Router"
+msgstr "Idioma de la consola del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
-msgstr "Por favor, ¡contribuye al proyecto de traducción de la consola del router! Ponte en contacto con los desarrolladores en los canales #i2p-dev y #i2p-es del IRC para ayudar."
+msgstr "¡Por favor, contribuya al proyecto de traducción de la consola del router I2P! Contacte con los desarrolladores en los canales #i2p-dev y #i2p-es del IRC para ayudar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
-msgstr "Contraseña de la consola del router"
+msgstr "Contraseña de la consola del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
-msgstr "Actualización de la configuración"
+msgstr "configuración de actualizaciones"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
-msgstr "Configuración de actualizaciones I2P"
+msgstr "Configuración de actualizaciones de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
-msgstr "Comprobar si hay actualizaciones de I2P o noticias"
+msgstr "Comprobar si hay actualizaciones de I2P o de news (usenet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
-msgstr "Noticias &amp; actualizaciones de I2P"
+msgstr "Actualizaciones de I2P y news (usenet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
-msgstr "Comprobar si hay actualizaciones de noticias"
+msgstr "Comprobar si hay actualizaciones de news (usenet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
-msgstr "Actualizaciones de noticias"
+msgstr "Actualizaciones de news (usenet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
-msgstr "Actualizando"
+msgstr "Actualización en curso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
-msgstr "URL de noticias"
+msgstr "URL de news (usenet)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
-msgstr "Frecuencia de actualización"
+msgstr "Frecuencia de refresco"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr "Política de actualizaciones"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
-msgstr "¿Obtener noticias a través del eepProxy?"
+msgstr "¿Descargar news (usenet) a través del eepProxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
-msgstr "¿Actualizar utilizando el eepProxy?"
+msgstr "¿Actualizar a través del eepProxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
-msgstr "host eepProxy"
+msgstr "equipo (host) del eepProxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
-msgstr "puerto eepProxy"
+msgstr "puerto del eepProxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
-msgstr "URLs de actualizaciones"
+msgstr "URLs de actualización"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
-msgstr "Claves confiadas"
+msgstr "Claves de confianza"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
-msgstr "Actualizar con las versiones en desarrollo no firmadas?"
+msgstr "¿Actualizar con versiones de desarrollo no firmadas?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr "URL de versión no firmada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
-msgstr "Dispondrás de las actualizaciones a través de tu gestor de paquetes."
+msgstr "Las actualizaciones se entregarán mediante su administrador de paquetes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
-msgstr "Página de Inicio"
+msgstr "página principal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
-msgstr "¡Bienvenido a I2P!"
+msgstr "Bienvenido a I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
-msgstr "Libreta de direcciones I2P"
+msgstr "Addressbook (libreta de direcciones) de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
-msgstr "abrir en nueva solapa"
+msgstr "Abrir en una nueva pestaña"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
-msgstr "Tu navegador no soporta iFrames."
+msgstr "Su navegador no soporta iFrames."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
-msgstr "Pincha aquí para continuar."
+msgstr "Pulse aquí para continuar."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
-msgstr "Lo sentimos. Se ha producido un error interno."
+msgstr "¡Lo sentimos! Se ha producido un error interno."
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
-msgstr "Por favor, ¡informa sobre errores en {0} o {1}!"
+msgstr "Por favor informe de los fallos en {0} o {1}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
-msgstr "Puedes utilizar el nombre de usuario \"guest\" y contraseña \"guest\" si no deseas registrarte."
+msgstr "Puede utilizar el nombre de usuario \"guest\" (invitado) y la contraseña \"guest\" si no desea registrarse."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
-msgstr "Por favor, ¡incluye esta información en los informes de error!"
+msgstr "Por favor incluya esta información en los informes de fallo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
-msgstr "Detalles del error"
+msgstr "Detalles del fallo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Error {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
-msgstr "Versión I2P y entorno de ejecución"
+msgstr "Versión de I2P y entorno de ejecución"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
-msgstr "Ten en cuenta que la información del sistema, las marcas de tiempo del registro y los mensajes del registro pueden proporcionar pistas sobre tu ubicación. Por favor, ¡revisa todos los datos antes de incliurlos en un informe de error!"
+msgstr "Tenga en cuenta que la información del sistema operativo, el registro (log) de marcas de tiempo, y el registro (log) de mensajes, pueden proporcionar pistas sobre su ubicación. Por favor REVISE PREVIAMENTE TODOS LOS DATOS QUE INCLUYA EN SU INFORME DE FALLO,"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr "Página no encontrada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
-msgstr "Lo sentimos! Pareces estar intentando entrar en una página de la consola del router o un recurso inexistentes."
+msgstr "¡Lo sentimos! Parece que está solicitando una página o recurso no-existente de la consola del router I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr "Error 404"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr "no encontrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr "eventos"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr "Registro (log) de eventos de I2P"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
-msgstr "gráficos"
+msgstr "gráficas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
-msgstr "Gráficos de rendimiento de I2P"
+msgstr "Gráficas de rendimiento de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
-msgstr "Haga click en una bandera para elegir idioma. Click en 'configurar idioma' a continuación para cambiarlo después."
+msgstr "Haga clic en una bandera para elegir idioma. Para cambiarlo más adelante, haga clic debajo en 'configurar idioma'."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr "Buscar en I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr "Sitios de interés"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr "gestionador de túneles i2p"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr "Gestionador de Túneles I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
-msgstr "Jar File Dump"
+msgstr "Volcado de archivo Jar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr "cola de tareas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
-msgstr "Cola de trabajos del router I2P"
+msgstr "Cola de tareas del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
-msgstr "registros"
+msgstr "registros (logs)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
-msgstr "Registros del Router I2P"
+msgstr "Registros (logs) del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr "Registros críticos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr "Registros del router"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr "Registros de eventos"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr "Ver registros de eventos"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
-msgstr "Registros de servicio (Wrapper)"
+msgstr "Registros del servicio (wrapper)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
-msgstr "base de datos de la red"
+msgstr "base de datos de red"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
-msgstr "Base de datos de la Red I2P"
+msgstr "Base de datos de la red I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr "Aplicación web no encontrada"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
-msgstr "La Aplicación web no se está ejecutando"
+msgstr "La aplicación web no está ejecutándose"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
-msgstr "La aplicación web solicitada no se está ejecutando"
+msgstr "La aplicación web solicitada no está ejecutándose."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
-msgstr "Por favor visita la <a href=\"/configclients.jsp#webapp\">página de configuración de clientes</a> para iniciarla."
+msgstr "Por favor visite la <a href=\"/configclients.jsp#webapp\">página de configuración de clientes</a> para iniciarla."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr "conexiones con pares"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
-msgstr "pares de la red I2P"
+msgstr "Pares (peers) en la red I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr "perfiles de los pares"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
-msgstr "Perfiles de los pares de la red I2P"
+msgstr "Perfiles de los pares en la red I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr "Prueba"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr "estadísticas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr "Estadísticas del router I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
-msgstr "Deshabilitar la recarga de cada {0}"
+msgstr "Deshabilitar refresco cada {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr "torrents"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
-msgstr "Descargador de Torrents I2P"
+msgstr "Descargador de torrents de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
-msgstr "Sumario de túneles"
+msgstr "compendio de túneles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
-msgstr "Sumario de túneles I2P"
+msgstr "Compendio de túneles de I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr "Perfil del par"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
-msgstr "Perfil del par {0}"
+msgstr "Perfil para el par {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
-msgstr "correo"
+msgstr "correo web"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
-msgstr "Correo I2P"
+msgstr "Correo web de I2P"
diff --git a/apps/routerconsole/locale/messages_et.po b/apps/routerconsole/locale/messages_et.po
index c202d7d8efcd3c2c23390615e9e67bacd6c21c95..e28860f0e14a6634791c86dd20f46af1af0be308 100644
--- a/apps/routerconsole/locale/messages_et.po
+++ b/apps/routerconsole/locale/messages_et.po
@@ -5,13 +5,13 @@
 # 
 # Translators:
 # foo <foo@bar>, 2009
-# Marie Nepeta <hellomynameiscatbug@gmail.com>, 2013
+# Marie Nepeta <hellomynameiscatbug@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/I2P/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -40,7 +40,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -49,7 +49,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -58,64 +58,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 tund"
 msgstr[1] "{0} tundi"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "puudub"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 päev"
 msgstr[1] "{0} päeva"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Bännitud ruuteri hashi järgi: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Bännitud ruuteri hashi järgi"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP-bännitud blocklist.txt kirje {0} järgi"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "Uuesti käivitumiseni bännitud IP-d"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Jäädavalt bännitud IP-d"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Kust"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Kuhu"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "puudub"
 
@@ -125,92 +125,92 @@ msgstr "puudub"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Keeldun tunnelitest: Alles käivitun"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Keeldun tunnelitest: Kõrge sõnumite viive"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Keeldun enamusest tunnelitest: Palju päringuid"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Keeldun tunnelitest: Piirang ületatud"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Keeldun tunnelitest: Ribalaiuse piirang"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Keeldun enamusest tunnelitest: Ribalaiuse piirang"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Nõustun enamuse tunnelitega"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Nõustun tunnelitega"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Keeldun tunnelitest: Välja lülitumine"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Keeldun tunnelitest"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Hangin ruuterite kontakte"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Kontaktide hankel leiti vaid 1 ruuter."
 msgstr[1] "Kontaktide hankel leiti vaid {0} ruuterit."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Kontaktide hange ei õnnestunud."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Vaata {0} et leida abi."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "kontaktide hanke häälestusleht"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Kontaktide hange: toon loendi URL-i."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -244,7 +244,7 @@ msgstr "Kui mitme ruuteriga me aktiivselt räägime"
 msgid "Known fast peers"
 msgstr "Tuntud kiired ruuterid"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Võrguandmebaasi kirje"
 
@@ -254,45 +254,54 @@ msgstr "Võrguandmebaasi kirje"
 msgid "No transports (hidden or starting up?)"
 msgstr "Pole transpordi protokolle (peidus või alles käivitun?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Toetuseta allkirja tüüp"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Pole ühelgi transpordil kättesaadav"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Ruuteri transpordiprotokollide aadressid"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} kasutatakse vaid välja ühendumiseks"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP pole sisse lülitatud"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Abi"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Teie transpordiühenduste arvu piirid seatakse automaatselt,lähtudes kehtivaist ribalaiuse piiridest."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Et lubada piire ületada, kehtestage parameeter i2np.ntcp.maxConnections=nnn ning i2np.udp.maxConnections=nnn peenhäälestuse lehel."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definitsioonid"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -301,251 +310,258 @@ msgstr "Definitsioonid"
 msgid "Peer"
 msgstr "Ruuter"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Kauge ruuter, tuvastatud ruuteri hashi abil"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Suund"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Sisenev ühendus"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Väljuv ühendus"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Nad pakkusid end tutvustajaks (aitama teistel läbi me tulemüüri jõuda)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Me pakkusime end neile tutvustajaks (aitama teistel läbi nende tulemüüri jõuda)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Kaua on möödunud viimase paketi saamisest / saatmisest"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Sisse/Välja"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Silutud sisenev / väljuv sidekiirus (kilobaiti sekundis)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Kaua on möödunud ühenduse loomisest"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Üleval"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Ajanihe"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Teise ruuteri ja meie kella erinevus"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Ummikuaken, ehk mitu baiti neile võib saata ilma kinnituseta"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Kinnitust ootavate saadetud sõnumite arv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Suurim korraga saadetavate sõnumite arv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Ummikuakna ületavate ootel saatmiste arv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Aeglase käivitumise lävi"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Saatmise-kinnituse aeg millisekundites"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Uuesti saatmise ajalimiit millisekundites"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Kehtiv suurima saadetava paketi maht / oletatav suurim vastuvõetava paketi maht (baiti)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Ruuterile saadetud pakettide koguarv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Ruuterilt vastuvõetud pakettide koguarv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "TX dupl"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Ruuterile uuesti saadetud pakettide koguarv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "RX dupl"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Ruuterilt saadud duplikaatsete pakettide koguarv"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Teenus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Ühine WAN liidese häälestus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Staatus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tüüp"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Ülesvoolu"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Allavoolu"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP häälestus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Tööiga"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Väline IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Layer 3 (võrgutaseme) paketiedastus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Vaikimisi ühenduse teenus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP ühendus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet lingi häälestus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Leitud seade"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Alamseade"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP staatus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
-msgstr ""
+msgstr "Keelatud UPnP Seaded"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP on välja lülitatud; Kas teil on kohtvõrgus vähemalt üks UPnP internetilüüsi seade ?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP ei leidnud teie kohtvõrgust ühtegi UPnP-teadlikku, ühilduvat seadet."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "UPnP teatatud hetkel kehtiv väline IP aadress on {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Hetkel kehtiv väline IP aadress pole saadaval."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP teatab suurimaks allavoolu kiiruseks {0} bitti/sek"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP teatav suurimaks ülesvoolu kiiruseks {0} bitti/sek"
@@ -554,280 +570,276 @@ msgstr "UPnP teatav suurimaks ülesvoolu kiiruseks {0} bitti/sek"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} porti {1,number,#####} suunati edukalt UPnP abil."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} porti {1,number,#####} ei suunatud UPnP abil."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP pole sisse lülitatud"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Liiga suur ajanihe: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP ühendusi"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Piir"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Ajalimiit"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Väljuv järjek."
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Ummik?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Sisse"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Välja"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP ühendused"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sorteeri ruuteri hashi järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Suund/Tutvustamine"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sorteeri saabuva jõudeaja järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sorteeri väljuva jõudeaja järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sorteeri saabuva kiiruse järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sorteeri väljuva kiiruse järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sorteeri ühenduse ea järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sorteeri ajanihke järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sorteeri ummikuakna järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sorteeri aeglase käivitumise läve järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sorteeri saatmise-kinnituse viive järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sorteeri uuesti saatmise ajalimiidi järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sorteeri väljuva suurima saateühiku järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sorteeri saadetud pakettide arvu järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sorteeri vastuvõetud pakettide arvu järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sorteeri uuesti saadetud pakettide arvu järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sorteeri mitmekordselt vastuvõetud pakettide arvu järgi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Me pakkusime end neile tutvustajaks"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Nad pakkusid end meile tutvustajaks"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Venib"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 viga"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} viga"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Bännitud"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Eiran tunneliosaluse palveid: Liiga aeglane"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Eiran tunneliosaluse palveid: Ülekoormus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
-msgstr ""
+msgstr "Tunnelite tagasilükkamine: Varjatud režiimis"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Keeldun tunnelitest: Osaluspalvete ülekoormus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Keeldun tunnelitest: Ühenduste arvu piirang"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Eiran tunneliosaluse palveid: Kõrge koormus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Eiran tunneliosaluse palveid: Pikk järjekord"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Pluginale {0} on uus versioon"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Uuenduste otsing pluginale {0} ebaõnnestus"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Pluginale {0} uut versiooni ei ole"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B laetud"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Laadimine allikast {0} ebaõnnestus"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Uuendus alla laetud"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Käivitun uuesti"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Uuendus kontrollitud"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "allikast {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Allkirjata uuenduse fail allikast {0} on katki"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Ei suutnud kopeerida asukohta {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -853,12 +865,12 @@ msgstr ""
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
-msgstr ""
+msgstr "Faili pole määratud {0}"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
-msgstr ""
+msgstr "Faili tõmbamisest ebaõnnestus {0}, koopia ebaõnnestus"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
@@ -896,7 +908,7 @@ msgstr "Plugina {0} allkirja kontroll kukkus läbi"
 #. don't display signer, we're really checking the key not the signer name
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
 msgid "Plugin not installed - signer is untrusted"
-msgstr ""
+msgstr "Plugin ei ole paigaldatud - allkirjastaja ei ole usaldusväärne"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
 #, java-format
@@ -970,7 +982,7 @@ msgstr "Plugin nõuab Jetty versiooni {0} või madalamat"
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
-msgstr ""
+msgstr "Ei saa kopeerida pluginat kataloogi {0}"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
@@ -1231,17 +1243,17 @@ msgstr "Vale kliendi indeks."
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
-msgstr ""
+msgstr "Klient {0} peatatud"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
-msgstr ""
+msgstr "Klient {0} alustatud"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
-msgstr ""
+msgstr "Klient {0} kustutatud"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
@@ -1335,8 +1347,8 @@ msgid "Add Client"
 msgstr "Lisa klient"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
@@ -1367,9 +1379,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versioon"
 
@@ -1391,7 +1403,7 @@ msgstr "Litsents"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Veebileht"
 
@@ -1404,7 +1416,7 @@ msgid "Stop"
 msgstr "Peata"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Otsi uuendusi"
@@ -1426,17 +1438,17 @@ msgstr "Kustuta"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 msgid "Delete selected"
-msgstr ""
+msgstr "Kustuta valitu"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1444,17 +1456,18 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
-msgstr ""
+msgstr "Lisa ese"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
-msgstr ""
+msgstr "Taasta vaikimisi"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1467,15 +1480,15 @@ msgstr "Kodulehekülg muudetud"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:51
 msgid "Restored default settings"
-msgstr ""
+msgstr "Taastatud vaikimisi seaded"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:63
 msgid "No name entered"
-msgstr ""
+msgstr "Nime pole sisestatud"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:68
 msgid "No URL entered"
-msgstr ""
+msgstr "URL-i pole sisestatud"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:81
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:81
@@ -1535,7 +1548,7 @@ msgstr "Kehtetu sihtvõti"
 msgid "Log overrides updated"
 msgstr "Logimise erandkäsud uuendatud"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Logimise häälestus salvestatud"
 
@@ -1584,7 +1597,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Eemalda"
 
@@ -1603,7 +1616,7 @@ msgid "Home Page"
 msgstr "Avaleht"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Võrk"
 
@@ -1652,15 +1665,15 @@ msgstr "Võrk"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
-msgstr ""
+msgstr "Kokkuvõte baar"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
 msgid "UI"
 msgstr "Kasutajaliides"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnelid"
@@ -1679,15 +1692,15 @@ msgid "Logging"
 msgstr "Logimine"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Ruuterid"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistika"
 
@@ -1700,7 +1713,7 @@ msgstr "Peenhäälestus"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1714,7 +1727,7 @@ msgstr "Uuendan IP aadressi"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
-msgstr ""
+msgstr "IPv6 seade uuendamine"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
@@ -1746,7 +1759,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
-msgstr ""
+msgstr "Vale port"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
@@ -1767,11 +1780,11 @@ msgstr "Käivitun viisakalt uuesti, et väljuda peidetud ruuteri režiimist"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
-msgstr ""
+msgstr "UPnP võimaldamine"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
-msgstr ""
+msgstr "UPnP keelamine"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
@@ -1795,7 +1808,7 @@ msgstr "Nõuan SSU puhul tutvustajaid"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
-msgstr ""
+msgstr "Vale aadress"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
@@ -1810,16 +1823,16 @@ msgstr "Uuendan jagatava ribalaiuse protsenti"
 msgid "Updated bandwidth limits"
 msgstr "Uuendan ribalaiuse piiranguid"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bitti sekundis"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "või maksimaalselt {0} baiti kuus"
@@ -2044,7 +2057,7 @@ msgstr "Käivitudes ei avata ruuteri konsooli"
 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
-msgstr ""
+msgstr "Sunni GC-d"
 
 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
@@ -2385,7 +2398,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2394,86 +2407,86 @@ msgstr ""
 msgid "Password"
 msgstr "Parool"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Uuendus saadaval, proovin nüüd alla laadida"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Uuendus saadaval, klõpsa vasakul nuppu et alla laadida"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Uuendusi pole"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Uuendan uudiste URL-iks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Uuendan proxy serveriks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Proxy pordiks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Uuendan sageduseks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Uuendan uuenduste poliitikaks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Uuendan uuenduste URL-id."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Uuendan usaldatud võtmeid."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Uuendan allkirjastamata uuenduse URL-iks {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Iga"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Üksnes teata"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Lae alla ja kontrolli allkiri"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Lae alla, kontrolli ja käivitu uuesti"
 
@@ -2631,7 +2644,7 @@ msgid "{0} for {1}"
 msgstr "{0} for {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Ribalaiuse kasutus"
 
@@ -2745,12 +2758,12 @@ msgid "Graph settings saved"
 msgstr "Graafikute häälestus salvestatud"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Halda siit oma I2P nimefaili (I2P domeenide lahendamist)"
 
@@ -2781,17 +2794,17 @@ msgid "I2P Home Page Configuration"
 msgstr "I2P Avalehe Konfiguratsioon"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonüümne veebimeili klient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-post"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P ruuteri abi"
 
@@ -2801,17 +2814,17 @@ msgid "Router Console"
 msgstr "Ruuteri konsool"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Sisseehitatud anonüümne BitTorrenti klient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrentid"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Kohalik veebiserver"
 
@@ -2897,10 +2910,8 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2983,7 +2994,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nimi"
 
@@ -3133,148 +3144,157 @@ msgid "Unpublished"
 msgstr "Avaldamata"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Sihtvõti"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Aegub {0} pärast"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Aegus {0} eest"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Lüüs"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lüüsikirje"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Lähtestamata"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Võrguandmebaasi ruuterite statistika"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Arv"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transpordid"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Maa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Meie info"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Ruuter info ruuterile"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Täielik kirje"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Peidetud"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} eest"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Avaldatud"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Aadress(id)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "kulukus"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Peidetud või alles käivitub"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU tutvustajatega"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP ja SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP ja SSU tutvustajatega"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3293,7 +3313,7 @@ msgid "Hide news"
 msgstr "Peida uudised"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Näita uudised"
 
@@ -3374,7 +3394,7 @@ msgid "Failing"
 msgstr "Läbikukkuvad"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Hästi integreerunud"
 
@@ -3587,7 +3607,7 @@ msgid "Lifetime average frequency"
 msgstr "Tööea keskmine sagedus"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3638,282 +3658,282 @@ msgstr "Graafiku andmed"
 msgid "Graph Event Count"
 msgstr "Graafiku sündmuste arv"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Ekspordi andmed XML kujul"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Ruuteri tööea keskmine väärtus"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P ruuteri abi &amp; KKK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Abi &amp; KKK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Häälesta klientide ja veebirakenduste (teenuste) käivitumist; käivita magavaid teenuseid käsitsi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P teenused"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Häälesta I2P ruuterit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P sisemus"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Vaata tunnelite ja nende ehitamise staatust"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Näita kõiki ühendusi teiste ruuteritega"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Näita hiljutisi ruuterite jõudluse profiile"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profiilid"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Näita nimekirja kõigist tuntud I2P ruuteritest"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "Võrguandmebaas"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Terviseraport"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Logid"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Ruuteri jõudlusgraafikud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Graafikud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Ruuteri jõudlusinfo teksti kujul"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Kohalikud sihtvõtmed"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Üldine"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Kohalik identiteet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Sinu I2P ruuteri unikaalne ID on"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "ära seda kellelegi avalda"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "näita"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Kui kaua on ruuter käesolevas sessioonis töötanud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Tööiga"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Abi tulemüüri häälestamisel ja ruuteri jõudluse optimeerimisel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Aktiivne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Kiire"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Suure mahuga"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Tuntud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Häälesta ruuteri ribalaiuse piiranguid"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Ribalaius sisse/välja"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Kokku"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Kasutatud"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Avastamine"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Osalemine"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Jagamistase"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Mis on ruuteri tööde järjekorras?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Ummik"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Töö viive"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Sõnumi viive"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tunneli viive"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Järjekord"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3987,43 +4007,43 @@ msgstr "VIGA-UDP välja lülitatud, TCP vastuvõtu aadress/port häälestamata"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "HOIATUS-Tulemüüri taga ja UDP välja lülitatud"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Lisa/eemalda/muuda &amp; juhi oma kliendi- ja serveritunneleid"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Näita tunnelid"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Lüüsikirjed aegunud"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Ehitan uuesti"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "eest"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Valmis"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Ehitan"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Ehitan tunneleid"
 
@@ -4031,31 +4051,31 @@ msgstr "Ehitan tunneleid"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "ühised klienditunnelid"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Käivita uuesti et paigaldada"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Lülita välja et uuesti käivitamisel paigaldada"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versioon {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Lae alla uuendus {0}"
@@ -4064,40 +4084,40 @@ msgstr "Lae alla uuendus {0}"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Lae alla allkirjata<br>uuendus {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Abi tulemüüri häälestamisel"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Kontrolli võrguühendust ja kohtvõrgu ruuterit/tulemüüri"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Hangi ruuterite kontakte"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4370,6 +4390,10 @@ msgstr ""
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4687,7 +4711,7 @@ msgstr "Võrguseadete peenhäälestuse leht"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4775,13 +4799,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Keelatud - kliendi väljaspoolt Java virtuaalmasinat ei saa ühenduda"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP port"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP liides"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP port"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autoriseerimine"
@@ -4868,12 +4892,13 @@ msgid "Search Engines"
 msgstr "Otsingumootorid"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4933,48 +4958,53 @@ msgstr "Häälesta I2P logimise valikuid"
 msgid "Log file"
 msgstr "Logifail"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(sümbol '@' asendatakse logide rotatsiooni käigus)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Logikirje formaat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(kasuta 'd' = kuupäev, 'c' = klass, 't' = protsess, 'p' = prioriteet, 'm' = sõnum)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Logi kuupäeva vorming"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = kuu, 'dd' = päev, 'HH' = tund, 'mm' = minut, 'ss' = sekund, 'SSS' = millisekund)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Suurim logifaili maht"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Vaikimisi logimise tase"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG ja INFO pole vaikimisi tasemeks soovitatavad, kuna aeglustavad ruuterit oluliselt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Logitaseme erandid"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Uus erand"
 
@@ -6162,18 +6192,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_fi.po b/apps/routerconsole/locale/messages_fi.po
index 299b515651a6ca7a281773f74d884fb397590e02..6ac95358e3851d964404d30147a6b47ce58356ca 100644
--- a/apps/routerconsole/locale/messages_fi.po
+++ b/apps/routerconsole/locale/messages_fi.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-22 17:54+0000\n"
-"Last-Translator: oselotti\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -50,7 +50,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -59,64 +59,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 tunti"
 msgstr[1] "{0} tuntia"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr ""
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 päivä"
 msgstr[1] "{0} päivää"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Estetty reitittimen tiivisteen mukaan: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Estetty reitittimen tiivisteen mukaan"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP estetty blocklist.txt sisällön mukaan {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "ei mitään"
 
@@ -126,90 +126,92 @@ msgstr "ei mitään"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Torjutaan käytäviä: Pitkä viive"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Torjutaan useimpia käytäviä: Suuri määrä pyyntöjä"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Torjutaan käytäviä: Raja saavutettu"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Torjutaan käytäviä: Kaistanleveys rajoitettu"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Torjutaan useimpia käytäviä: Kaistanleveys rajoitettu"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Hyväksytään useimmat käytävät"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Hyväksytään käytäviä"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Torjutaan käytäviä: Järjestelmää suljetaan"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Torjutaan käytäviä"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, 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:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Lisätietoja kohdasta {0}."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -243,7 +245,7 @@ msgstr ""
 msgid "Known fast peers"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb merkintä"
 
@@ -253,298 +255,314 @@ msgstr "NetDb merkintä"
 msgid "No transports (hidden or starting up?)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP ei ole käytössä"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Ohje"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Tiedonsiirtorajasi on laskettu asettamasi kaistanleveyden perusteella."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Muuttaaksesi näitä rajoja, lisää asetukset i2np.ntcp.maxConnections=nnn ja i2np.udp.maxConnections=nnn erikoisasetussivulla."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Määritelmät"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Vertaissolmu"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Vertaissolmu, reitittimen tiivisteen mukaan tunnistettuna."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Sisääntuleva yhteys"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Ulosmenevä yhteys"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "He tarjoutuivat esittelemään meidät  (auttamaan muita vertaissplmuja pääsemään palomuurin ohi)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Me tarjoiduimme esittelemään heidät (auttamaan muita vertaissplmuja pääsemään palomuurin ohi)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Milloin on viimeksi lähetetty / vastaanotettu paketti"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Tyhjäkäynti"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Sisään/Ulos"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Tasoitettu sisään/ulos siirtonopeus (Ktavua sekunnissa)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Milloin tämä yhteys rakennettiin"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Toiminnassa"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Vääristymä"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Vertaissolmun ja sinun kellojesi välinen ero"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Tungosikkuna, eli kuinka monta tavua voidaan lähettää ilman kuittausta"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Kuinka monta viestiä odottaa kuittausta"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Suurin mahdollinen määrä, jota samanaikaisia viestejä voidaan lähettää"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Tungosikkunan tyhjentymistä odottavien lähetysten määrä"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Edestakaisen matkan aika millisekunneissa"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Uudelleenlähetyksen aikakatkaisu millisekunneissa"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Tämänhetkinen suurin lähetettävä paketin koko / arvioitu suurin vastaanotettava paketin koko (tavuina)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Vertaissolmulle lähetettyjen pakettien kokonaismäärä"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Vertaissolmulta vastaanotettujen pakettien kokonaismäärä"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Vertaissolmulle uudelleenlähetettyjen pakettien kokonaismäärä"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Vertaissolmulta vastaanotettujen toistettujen pakettien kokonaismäärä"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Palvelu"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Tila"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Ulkoinen IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP tila"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -553,275 +571,276 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Liian suuri aikavääristymä: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP-yhteydet"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Raja"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Aikakatkaisu"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Jono ulos"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Sisääntulevia"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Ulosmeneviä"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} vertainen"
+msgstr[1] "{0} vertaista"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP-yhteydet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Järjestä vertaissolmun tiivisteen mukaan."
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Suunta/Esittely"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Järjestä sisääntulevien mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Järjestä ulosmenevien mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Järjestä sisääntulonopeuden mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Järjestä ulosmenonopeuden mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Järjestä yhteyden keston mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Järjestä aikavääristymän mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Järjestä tungosikkunan mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Järjestä edestakaisen matkan keston mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Järjestä uudelleenlähetyksen aikakatkaisun mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Järjestä suurimman siirtäyksikön koon mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Järjestä lähetettyjen pakettien määrän mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Järjestä vastaanotettujen pakettien määrän mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Järjestä uudelleenlähetettyjen pakettien mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Järjestä useammin kuin kerran vastaanotettujen pakettien mukaan"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Me tarjoiduimme esittelemään heidät"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "He tarjoituivat esittelemään meidät"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Tukossa"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 epäonnistuminen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} epäonnistumista"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Estetty"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Torjutaan käytäväpyyntöjä: Liian hidas"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Torjutaan käytäväpyyntöjä: Ylikuormaa"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Torjutaan käytäviä: Pyyntöjen ylikuormitus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Pudotetaan käytäväpyyntöjä: Raskas kuorma"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Pudotetaan käytäväpyyntöjä: Jonotusaika"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
-msgstr ""
+msgstr "Päivitys ladattu"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
-msgstr ""
+msgstr "Uudelleenkäynnistetään"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -832,167 +851,175 @@ msgid "Checking for update of plugin {0}"
 msgstr ""
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
-msgstr ""
+msgstr "Päivitetään"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../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:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
+#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
+#. + signer + "</b>");
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
-msgid "Plugin from {0} is corrupt"
+msgid "Plugin from {0} contains an invalid key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
+msgid "Plugin signature verification of {0} failed"
 msgstr ""
 
-#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
-#. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
 #, java-format
-msgid "Plugin from {0} contains an invalid key"
+msgid "Plugin from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
 #, java-format
-msgid "Plugin signature verification of {0} failed"
+msgid "Plugin from {0} does not contain the required configuration file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Tämä lisäosa vaatii I2P:n version {0} tai uudemman"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "Tämä lisäosa vaatii Java-versio {0} tai uudempi"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr "Lisäosan asennus epäonnistui {0}:lla"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "Lisäosa {0} asennettu"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "Lisäosa {0} asennettu ja otettu käyttöön"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "Epäonnistui ladata lisäosa {0}:lta"
@@ -1007,127 +1034,129 @@ msgstr ""
 msgid "No new version found at {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr "Väliaikainen esto kestää vielä {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr "Estetty uudelleenkäynnistämiseen saakka tai vielä {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr "poista esto nyt"
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "I2P reitittimen ohjauspaneeli"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr "Virhe päivitettäessä asetuksia - tarkasta virhelokit."
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1135,313 +1164,314 @@ msgid ""
 msgstr "Virhe tallennettaessa asetuksia (sovellettu, mutta ei tallennettu) - tarkasta virhelokit."
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Asenna lisäosa"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
-msgstr ""
+msgstr "Päivitä kaikki asennetut lisäosat"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Virhe pysähtymättä lisäosa {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Poistettu lisäosa {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Virhe poistettaessa lisäosa {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Pysäytetty lisäosa {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr ""
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Käynnistä"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "käynnisty"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Ei käynnistynyt"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Ei löytänyt palvelinta"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "Ei määritelty lisäosan URL."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
-msgstr ""
+msgstr "Päivitetään kaikkia lisäosia"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "Käynnistetty lisäosa {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
-msgstr ""
+msgstr "Asiakas"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Suorita käynnistettäessä?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Suorita käynnistettäessä?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versio"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Pysäyttä"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Kirjoittaja"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Lupa"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Verkkosivu"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Tarkista päivitykset"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Oletko varma, että haluat poistaa {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Poista"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Tallenna"
 
@@ -1464,20 +1494,20 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:81
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:81
 msgid "Added"
-msgstr ""
+msgstr "Lisätty"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:98
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:107
 msgid "Removed"
-msgstr ""
+msgstr "Poistettu"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Lisää avain"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Poista avain"
 
@@ -1519,7 +1549,7 @@ msgstr "Virheellinen kohde"
 msgid "Log overrides updated"
 msgstr "Lokien ohitukset päivitetty."
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Lokiasetukset tallennettu"
 
@@ -1542,7 +1572,7 @@ msgstr "Sallittuja tasoja ovat DEBUG, INFO, WARN, ERROR, CRIT"
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1551,24 +1581,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Poista"
 
@@ -1587,53 +1617,54 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Verkko"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr ""
 
@@ -1642,8 +1673,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Käytävät"
@@ -1653,7 +1684,7 @@ msgid "Clients"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr "Avainrengas"
 
@@ -1662,17 +1693,17 @@ msgid "Logging"
 msgstr "Lokit"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
-msgstr "Peers"
+msgstr "Vertaiset"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
-msgstr ""
+msgstr "Tilastot"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Advanced"
@@ -1680,139 +1711,135 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Päivitetään IP-osoite"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
-msgstr ""
+msgstr "Otetaan UPnP käyttööön"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
-msgstr ""
+msgstr "Poistetaan UPnP käytöstä"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
-msgstr ""
+msgstr "Poistetaan UDP käytöstä"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
-msgstr ""
+msgstr "Otetaan UDP käyttöön"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
-msgstr ""
+msgstr "Virheellinen osoite"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bittiä sekunnissa"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "eli korkeintaan {0} tavua kuukaudessa"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr "Estä vertaissolmu uudelleenkäynnistykseen saakka"
 
@@ -1832,7 +1859,7 @@ msgid "Invalid peer"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr "Poista vertaissolmun esto"
 
@@ -1845,7 +1872,7 @@ msgid "is not currently banned"
 msgstr "ei ole tällä hetkellä estetty"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr ""
 
@@ -1862,7 +1889,7 @@ msgid "Unsupported"
 msgstr "Ei tuettu"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr ""
 
@@ -1881,9 +1908,9 @@ 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr ""
 
@@ -1938,118 +1965,118 @@ msgstr[1] ""
 msgid "Restart in {0}"
 msgstr "Uudelleenkäynnistykseen aikaa  {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "Sammuta kiltisti"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "Kiltti sammutus aloitettu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "Peru kiltti sammutus"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "Kiltti sammutus peruttu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "Kiltti uudelleenkäynnistys"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "Kilttiä uudelleenkäynnistystä pyydetty"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "Kova uudelleenkäynnistys"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "Kovaa uudelleenkäynnistystä pyydetty"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Käynnistä I2P käynnistäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "Älä käynnistä I2P:tä käynnistäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "Näytä ohjauspaneeli käynnistäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "Reitittimen ohjauspaneeli avataan käynnistettäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "Älä näytä ohjauspaneelia käynnistettäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr "Reitittimen ohjauspaneelia ei näytetä käynnistettäessä"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Palvelu asennettu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr "Varoitus: palvelun asentaminen epäonnistui"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Palvelu poistettu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr "Varoitus: palvelun poistaminen epäonnistui"
 
@@ -2090,7 +2117,7 @@ msgid "Refresh interval must be a number"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr ""
 
@@ -2105,7 +2132,7 @@ msgid "Summary bar will refresh shortly."
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr ""
 
@@ -2138,117 +2165,117 @@ 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
 msgstr "Virhe tallennettaessa asetuksia (sovellettu, mutta ei tallennettu) - tarkasta virhelokit."
 
 #. * dummies for translation
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 hyppy"
 msgstr[1] "{0} hyppyä"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "1 käytävä"
 msgstr[1] "{0} käytävää"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr "Tutkivia käytäviä"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr "ANONYMITEETTIVAROITUS - Asetukset sisältävät 0 hypyn käytäviä."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr "ANONYMITEETTIVAROITUS - Asetukset sisältävät yhden hypyn käytäviä."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr "SUORITUSKYKYVAROITUS - Asetukset sisältävät hyvin pitkiä käytäviä"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr "SUORITUSKYKYVAROITUS - Asetukset sisältävät suuria määriä tunneleita"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "Pituus"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "Satunnaisuus"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "Määrä"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr "Määrä varalla"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "Saapuva vaihtoehtoja"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "Lähtevä vaihtoehtoja"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr "Teema muutos tallennetaan."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr ""
@@ -2261,53 +2288,49 @@ msgstr ""
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "Arabia"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr "Tšekki"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Tanska"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Saksa"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
-msgstr ""
+msgstr "Viro"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Kreikka"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Englanti"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Espanja"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Ranska"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr ""
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
-msgstr ""
+msgstr "Unkari"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:87
 msgid "Italian"
@@ -2343,596 +2366,734 @@ msgid "Russian"
 msgstr "Venäjä"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Kiina"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Päivitys saatavilla, yritetään ladata nyt"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Päivitys saatavilla, klikkaa nappia vasemmalla ladataksesi"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Päivityksiä ei saatavilla"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
-msgstr ""
+msgstr "Sisäinen"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Joka"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Vain ilmoita "
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Vain lataa ja varmista"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Lataa, tarkista ja käynnistä"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
 msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "Aika"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+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:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr ""
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
 msgid "Smaller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
 msgid "Taller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
 msgid "Shorter"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
 msgid "Wider"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
 msgid "Narrower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
 msgid "Larger interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
 msgid "Smaller interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "tai"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "Kuvakoot"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "leveys"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "korkeus"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "pikseliä"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
-msgstr ""
+msgstr "Osoitekirja"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Sähköposti"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Reitittimen ohje"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr "Reitittimen ohjauspaneeli"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
-msgstr ""
+msgstr "Sisäänrakennettu anonyymi BitTorrent-asiakasohjelma"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
-msgstr "torrentit"
+msgstr "Torrentit"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Paikallinen web-palvelin"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr "UKK"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
-msgstr ""
+msgstr "Foorumi"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 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:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
-msgstr ""
+msgstr "I2P-uutiset"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
-msgstr ""
+msgstr "Lisäosat"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
-msgstr ""
+msgstr "I2P:n kotisivu"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, 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:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr "URL"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
-msgstr ""
+msgstr "aloitettiin {0} sitten"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 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:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
-msgstr ""
+msgstr "Työ"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "Tiedoston sijainti"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "Ei lokiviestejä"
 
@@ -2962,170 +3123,179 @@ msgstr ""
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr "Reititin"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "ei löytynyt verkkotietokannasta"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Paikallinen"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "Julkaisematon"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Kohde"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Lisää paikalliseen osoitekirjaan"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Käytävä"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Ei alustettu"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Lukumäärä"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Maa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Meidän tieto"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} sitten"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Julkaistu"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
-msgid "Address(es)"
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
+msgid "Address(es)"
+msgstr "Osoitteet"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU ja esittelijät"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP ja SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP, SSU ja esittelijät"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 vain SSU, esittelijät"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, esittelijät"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, esittelijät"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 vain NTCP, SSU, esittelijät"
 
@@ -3144,229 +3314,229 @@ msgid "Hide news"
 msgstr "Piilota uutiset"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Näytä uutiset"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr ""
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, 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:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, 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:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, 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:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr ""
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "profiili"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 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:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "nopeus"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr "Kuinka moneen käytävään voimme pyytää heitä osallistumaan tunnissa?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr "onko vertaissolmu estetty, saavuttamaton tai epäonnistuu käytäväkokeissa?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr ""
 
@@ -3438,7 +3608,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3489,282 +3659,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr ""
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Reitittimen ohje &amp; UKK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Ohje &amp; UKK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P Palvelut"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P Reitittimen asetukset"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P sisälmykset"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Näytä nykyiset käytävät ja käytävien rakentamistilanne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
-msgstr "profiilit"
+msgstr "Profiilit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Listaa kaikki tunnetut I2P reitittimet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Lokit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
-msgstr ""
+msgstr "Kuvaajat"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PKäytävä"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Yleinen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Paikallinen identiteetti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Tämän I2P reitittimen ainutlaatuinen identiteetti on"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "älä koskaan paljasta sitä kenellekään"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "näytä"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Nopea"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Tuttu"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Kaistaa sisään/ulos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Yhteensä"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Käytetty"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Jakosuhde"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Tungos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Käytävän viive"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3778,98 +3948,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr "VIRHE - aikavääristymää {0}"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Testataan"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr "VIRHE - Yksityinen TCP -osoite"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr "VIRHE - Symmetrinen NAT"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr "VAROITUS - Palomuurissa ja sisääntuleva TCP sallittu."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr "VAROITUS - Palomuurissa ja Floodfill"
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr "Palomuurissa"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr "Katkaistu - tarkista verkkokaapeli"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
 msgstr "VIRHE - UDP -portti käytössä. Aseta i2np.udp.internalPort=xxxx erikoisasetuksissa ja uudelleenkäynnistä"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr "VIRHE - Ei aktiivisia vertaissolmuja. Tarkista verkkoyhteys ja palomuuri."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr "VIRHE - UDP kielletty, eikä sisääntulevaa TCP:tä asetettu."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "VAROITUS - Palomuurissa ja UDP kielletty."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Palvelin"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Näytä käytävät"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Uudelleenrakentaa"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "sitten"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Valmis"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Rakentaa"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Rakentaa käytäviä"
 
@@ -3877,31 +4052,31 @@ msgstr "Rakentaa käytäviä"
 #. 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versio {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -3910,40 +4085,40 @@ msgstr ""
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -3976,122 +4151,122 @@ msgstr "maks"
 msgid "now"
 msgstr "nyt"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "Osallistuu käytäviin"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
-msgstr ""
+msgstr "sisään"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
-msgstr ""
+msgstr "ulos"
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
-msgstr ""
+msgstr "osoitekirja"
 
 #: ../java/strings/Strings.java:13
 msgid "i2psnark"
@@ -4210,12 +4385,16 @@ msgstr ""
 
 #: ../java/strings/Strings.java:60
 msgid "Encryption"
-msgstr ""
+msgstr "Salaus"
 
 #: ../java/strings/Strings.java:61
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PKäytävä"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4314,343 +4493,351 @@ msgstr ""
 msgid "itag2"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr ""
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr ""
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
-msgstr ""
+msgstr "Jaa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, 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:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 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:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 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:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr "erikoisasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr "I2P Erikoisasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr "Jotkut muutokset saattavat vaatia uudelleenkäynnistykset tullakseen voimaan."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr "asiakasasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr "I2P Asiakasasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4660,7 +4847,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4668,711 +4855,719 @@ msgid ""
 "preferred method."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr "avainnippuasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr "I2P avainnipun asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr "Kohteen nimi, tiiviste tai koko avain"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr "lokiasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr "I2P lokien asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Lokitiedoston maksimikoko"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Oletus loggaustaso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Loggaustason ohitukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr "verkkoasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
-msgstr "I2P verkon asetukset"
+msgstr "I2P-verkon asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr "Reititin testaa, onko UDP -porttisi palomuurin takana."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr "Reititintä ei ole asetettu julkaisemaan osoitettaan, eikä se siis odota sisääntulevia yhteyksiä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr "VAROITUS - Palomuurissa ja nopea"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr "Olet asettanut I2P reitittimesi jakamaan yli 128 kbps kaistaa, mutta olet palomuurin takana."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr "I2P toimii näillä asetuksilla, mutta jos sinulla todella on 128 kbps kaistaa jaettavaksi, verkolle on siitä enemmän hyötyä, jos avaat palomuurisi."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr "VAROITUS - Palomuurissa ja Floodfill"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr "Olet asettanut reitittimesi toimimaan Floodfill -palvelimena, mutta se on palomuurin takana."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr "Osallistuaksesi Floodfill -toimintaan optimaalisesti, sinun tulee avata palomuurisi."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr "VAROITUS - Palomuurissa ja sisääntuleva TCP -liikenne sallittu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr "Olet sallinut sisääntulevan TCP -liikenteen. UDP -porttisi on kuitenkin palomuurin takana ja siksi on luultavaa, että myös TCP -porttisi ovat."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr "Jos TCP -porttisi on palomuurin takana ja sisääntuleva TCP -liikenne sallittu, muut reitittimet eivät voi ottaa sinuun yhteyttä TCP:n kautta, mikä vahingoittaa verkkoa."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr "Avaa palomuurisi tai kiellä sisääntuleva TCP -liikenne ylempää."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr "VAROITUS - Palomuurissa ja UDP kielletty"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr "VIRHE - Aikavääristymä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr "Järjestelmäsi kello on väärässä ajassa, minkä takia sen on vaikea osallistua verkon toimintaan."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr "Jos tämä virhe jatkuu, korjaa kellosi asetukset. Sen tulisi tarkastaa aikansa NTP -protolollalla."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr "VIRHE - Yksityinen TCP osoite"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr "Et saa mainostaa osoitetta, johon ei voi muodostaa yhteyttä ulkopuolelta. Esimerkkejä tällaisista ovat 127.0.0.1 ja 192.168.1.1"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr "Korjaa osoite, tai kiellä sisääntuleva TCP-liikenne ylempänä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr "VIRHE - Symmetrinen NAT"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr "I2P havaitsi, että olet symmetriset NAT -palomuurin takana."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr "I2P ei toimi hyvin tällaisen palomuurin takaa. Luultavasti et voi ottaa vastaan sisääntulevia yhteyksiä, mikä haittaa osallistumistasi verkkoon."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr "VIRHE - UDP portti käytössä. - Asete i2np.udp.internalPort=xxxx erikoisasetuksissa ja uudelleenkäynnistä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
-msgstr "I2P ei voinut muodostaa yhteyttä porttiin 8887 tai johonkin muuhun määriteltyyn porttiin."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
+msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr "Tarkasta, käyttääkö joku muu ohjelma määriteltyä porttia. Jos, niin pysäytä tuo ohjelma tai aseta I2P käyttämään jotain muuta porttia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr "Tämä saattaa olla ohimenevä virhe, jos mikään muu ohjelma ei enää käytä porttia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr "Tämä virhe vaatii aina uudelleenkäynnistyksen, vaikka se olisikin tilapäinen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr "VIRHE - UDP kielletty, eikä sisääntulevaa TCP osoitetta/porttia asetettu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr "Et ole ylempänä asettanut sisääntulevaa TCP osoitetta (hostname) tai porttia, mutta olet kieltänyt UDP -liikenteen."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr "Reitittimesi ei voi hyväksyä sisääntulevia yhteyksiä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr "Aseta TCP host ylempänä tai salli UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr "vertaisasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr "I2P Vertaissolmujen asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr "Reitittimen tiiviste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr "Estä (ban) tai poista vertaissolmun esto manuaalisesti."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr "Estäminen estää tätä vertaissolmua osallistumasta käytäviin, jotka sinä luot."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5380,749 +5575,753 @@ msgid ""
 "displayed on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr "Estetyt vertaissolmut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr "Estetyt IP:t"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "UKK"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr "palveluasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr "tilastoasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr "I2P tilastojen asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr "Tee asetukset I2P tilastojen keruuseen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr "Kokoa kaikki tilastot?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr "Muutos tulee voimaan vasta uudelleenkäynnistyksen myötä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr "Tiedosto tilastoille"
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr "Suodatin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr "vaihda kaikki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr "Loki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr "Kuvaaja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr "Erikoissuodatin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr "käytäväasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr "I2P käytävien asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr "Oletusasetukset sopivat useimmille käyttäjille."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr "Anonymiteetin ja suorituskyvyn välillä on perustavanlaatuinen jännite."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr "Käytävät, jotka ovat pidempiä kuin 3 hyppyä  (esim. 2 hyppyä + 0-2 hyppyä, 3 hyppyä + 0-1 hyppyä, 3 hyppyä + 0-2 hyppyä) tai suuri määrä + suuri määrä varalla, voivat heikentää tehokkuutta tai luotettavuutta pahasti."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr "Seurauksena voi kulua paljon prosessoriaikaa ja/tai ulospäin menevää liikennettä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr "Ole huolellinen muuttaessasi näitä asetuksia, ja tee muutoksia vain, jos sinulla on ongelmia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr "i2pkäytävä sivu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr "käyttöliittymäasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr "I2P käyttöliittymän asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr "Reitittimen ohjauspaneelin teema"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr "Tämä osio on estetty Internet Explorer -selaimelta."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr "Ellet käytä IE:tä, selaimesi luultavasti teeskentelee olevansa IE. Jos haluat käyttää ohjauspaneelin teemoja, aseta selaimesi (tai proxysi) User Agent -tiedoksi jotain muuta."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr "Reitittimen ohjauspaneelin kieli"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr "Käytä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr "päivitysasetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr "I2P päivityksen asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr "Tarkasta päivitykset I2P-ohjelmistoon ja uutisiin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr "Uutiset &amp; I2P Päivitykset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr "Päivitys käynnissä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr "Uutis-URL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr "Päivitystiheys"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr "Päivityspolitiikka"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr "Päivitä eepProxyn kautta?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr "eepProxy isäntä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr "eepProxy -portti"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr "Päivitä URL:t"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr "Luotetut avaimet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr "Päivitä allekirjoittamattomaan tai kehitysversioon?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr "Allekirjoittamaton asennus URL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
-msgstr ""
+msgstr "I2P-Osoitekirja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr "Tapahtui sisäinen virhe."
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr "Ellet halua rekisteröityä, voit käyttää käyttäjätunnusta \"guest\" ja salasanaa \"guest\"."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr "Sisällytä nämä tiedot bugiraporttiisi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr "Vikatilanteen yksityiskohdat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Virhe {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr "I2P versio ja ympäristö"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr "Huomaa, että järjestelmän tiedot, lokien aikaleimat ja lokiviestit saattavat antaa vihjeitä sijainnistasi; tarkasta kaikki ennen kuin teet bugiraportin."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr "Sivua ei löytynyt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr "Vaikuttaa siltä, että haet olematonta reitittimen ohjauspaneelin sivua tai resurssia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr "Virhe 404"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr "ei löytynyt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr "kuvaajat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr "I2P suorituskyvyn kuvaajat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr "työjono"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr "I2P reitittimen työjono"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr "lokit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr "I2P reitittimen lokit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr "Kriittiset lokit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr "Reitittimen lokit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr "Palvelus (Wrapper) lokit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr "Web -sovellusta ei löytynyt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr "Web-sovellus ei käynnissä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr "Pyydetty Web-sovellus ei ole käynnissä."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr "yhteydet vertaissolmuihin"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
-msgstr "I2P verkon vertaissolmut"
+msgstr "I2P-verkon vertaissolmut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr "vertaissolmujen profiilit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
-msgstr "I2P verkon vertaissolmujen profiilit"
+msgstr "I2P-verkon vertaissolmujen profiilit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr "tilastot"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr "I2P reitittimen tilastot"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr "yhteenveto käytävistä"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr "I2P Käytävien yhteenveto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po
index 40885f80c23e53f00314525147f4378a24f0196e..5258514fc8505d09bb7b4b216c1835bf9b6f2f9d 100644
--- a/apps/routerconsole/locale/messages_fr.po
+++ b/apps/routerconsole/locale/messages_fr.po
@@ -7,6 +7,7 @@
 # bassmax, 2014
 # aylham <aylham@gmail.com>, 2011
 # aylham <aylham@gmail.com>, 2011
+# bassmax, 2014
 # Boxoa590, 2012-2013
 # ducki2p <ducki2p@gmail.com>, 2011
 # fo0 <foonikens@gmail.com>, 2011
@@ -16,13 +17,13 @@
 # Boxoa590, 2013
 # Boxoa590, 2012
 # jackjack <root@waka.site40.net>, 2011
-# Towinet, 2013-2014
+# Towinet, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-09-06 22:44+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 13:16+0000\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +43,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -51,7 +52,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -60,7 +61,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -69,64 +70,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0}h"
 msgstr[1] "{0} heures"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/d"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0}j"
 msgstr[1] "{0} jours"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Banni(s) par hachage routeur: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Banni par hachage du routeur"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP bannie(s) via entrée blocklist.txt {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "Adresses IP bannies jusqu'au redémarrage"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Adresses IP bannies de façon permanente"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "De"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Vers"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "aucun"
 
@@ -136,90 +137,92 @@ msgstr "aucun"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Rejet des tunnels : démarrage"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Refus de tunnels: (délai de messages élevé)"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Refuse la plupart des tunnels: (trop de requêtes)"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Refus de tunnels: (limite atteinte)"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Refus de tunnels: (limite de bande passante)"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Refuse la plupart des tunnels: (limite de bande passante)"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Accepte la plupart des tunnels"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Accepte les tunnels"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Refuse les tunnels: (arrêt en cours)"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Refus des tunnels"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Réamorçage"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Le réamorçage n''a trouvé qu''un seul routeur."
 msgstr[1] "Le réamorçage n''a trouvé que {0} routeurs."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Échec de réamorçage."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Voir {0} pour l'aide."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "page de configuration du réamorçage"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Réamorçage: collecte des URL sources."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -253,7 +256,7 @@ msgstr "Nombre de pairs actifs"
 msgid "Known fast peers"
 msgstr "Pairs rapides connus"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Entrée NetDb"
 
@@ -263,298 +266,314 @@ msgstr "Entrée NetDb"
 msgid "No transports (hidden or starting up?)"
 msgstr "Pas de transports (masqués ou en cours de démarrage ?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Type de signature non supporté"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Inaccessible sur tous transport"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Adresses de transport du routeur"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} est utilisé seulement pour les connexions sortantes"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP n'est pas activé"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Aide"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Vos limites de connexion de transport sont réglées automatiquement selon votre bande passante configurée."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Pour modifier ces limites, ajoutez  les réglages i2np.ntcp.maxConnections=nnn et i2np.udp.maxConnections=nnn dans la configuration avancée."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Définitions"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Le pair distant, identifié par son hachage routeur"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Sens"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Connexion entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Connexion sortante"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "A proposé de nous représenter (aide de la part d'autres pairs pour traverser notre pare-feu)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
-msgstr "Nous avons proposé de le représenter (aide à d'autres pairs pour traverser passer leur pare-feu)"
+msgstr "Nous avons proposé de le représenter (aide à d'autres pairs pour traverser leur pare-feu)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Temps écoulé depuis la dernière réception/émission d'un paquet "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "En attente"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Entrant/Sortant"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
-msgstr "Taux de transfert entrant/sortant lissé (ko/s)"
+msgstr "Taux de transfert entrant/sortant lissé (KO/s)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Depuis combien de temps cette connexion est établie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "En marche"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Dérive"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Écart de temps entre l'horloge du pair et la votre"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Fenêtre de congestion, en nombre d'octets transmissibles sans acquittement"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Nombre de messages en attente d'acquittement"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Nombre maximum de messages simultanés à envoyer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Nombre d'envois en attente qui débordent de la fenêtre de congestion"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Seuil de démarrage lent"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Aller-retour en ms"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Délai de retransmission en millisecondes"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Taille actuelle maximum de paquet envoyé / taille maximum estimée de paquet reçu (octets) "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Nombre de paquets envoyés au pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Nombre de paquets reçus du pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "TX dupl."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Nombre de paquets retransmis au pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "RX dupl."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Nombre de paquets en double reçus du pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Configuration de l'interface commune Internet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "État"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Type"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Montant"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Descendant"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Connexion Internet PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Lancé depuis"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Adresse IP externe"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Transfert niveau 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Service de connexion par défaut"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Connexion IP Internet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Configuration du lien Ethernet Internet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Appareil détecté"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "État d'UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Dispositifs UPNP désactivés"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP a été désactivé; peut-être avez-vous plus d'une passerelle Internet avec UPnP activé sur votre réseau local."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP n'a pas trouvé de passerelle compatible sur votre réseau local."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Adresse IP externe détectée par UPnP : {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "L'adresse IP externe n'est pas disponible."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP indique un débit descendant maximum de {0}b/s"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP indique un débit montant maximum de  {0}b/s"
@@ -563,276 +582,276 @@ msgstr "UPnP indique un débit montant maximum de  {0}b/s"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "Le port {0} {1,number,#####} est correctement transféré par UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "Le port {0} {1,number,#####} n'est pas transféré par UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP n'est pas activé"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Décalage excessif de l''horloge: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Connexions NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Échéance"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "File de sortie"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Réinscrit?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Entrant"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Sortant"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} pair"
 msgstr[1] "{0} pairs"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Connexions UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Tri par hachage de pair"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Direction/Introduction"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Tri par entrant inactif"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Tri par sortant inactif"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Tri par taux entrant"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Tri par taux sortant"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Tri par durée de connexion"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Tri par décalage d'horloge"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Tri par fenêtre de congestion"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Tri par seuil de démarrage lent"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Tri par durée d'aller-retour"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Tri pas dépassement de durée de retransmission"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Tri par MTU sortant"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Tri par paquets envoyés"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Tri par paquets reçus"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Tri par paquets renvoyés"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Tri par paquet reçus multiples"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Propositions de présentation à"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Ont proposé leur service"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Choqué"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 échec"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} échecs"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Banni"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "arriéré "
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Perte de demandes de tunnels: Trop lent"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Perte de demandes de tunnnels: Surchargé"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr "Rejette les tunnels: mode caché"
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Rejet de tunnels: surcharge de requêtes "
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Rejet de tunnels: limite de connexions"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Perte de tunnels: Forte charge"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Demandes de fermeture de tunnel: temps en file d'attente"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "La nouvelle version {0} du greffon est disponible"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Échec de la vérification de mise à jour du greffon {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Pas de nouvelle version pour le greffon {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}o transférés"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Échec de transfert depuis {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Mise à jour téléchargée"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Redémarrage en cours"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Mise à jour vérifiée"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "depuis {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Le fichier de mise à jour non signé de {0} est corrompu"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Échec de copie vers {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Mises à jour intra-réseau désactivées. Vérifiez le gestionnaire de paquet."
 
-
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Pas de permission d'écriture pour le répertoire d'installation I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Vous devez d''abord mettre à jour vers la version {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Nécessite la version {0} Java mais la version Java installée est {1}"
@@ -843,167 +862,175 @@ msgid "Checking for update of plugin {0}"
 msgstr "Recherche de mise à jour du greffon {0}"
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Mise à jour en cours"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr "Tentative d''installation depuis le fichier {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr "Pas de fichier spécifié {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
 msgstr "Echec à installer depuis fichier {0}, copie échouée."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "Téléchargement greffon depuis {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Greffon téléchargé"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr "Impossible de créer le répertoire du greffon {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "Le greffon de {0} est corrompu"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "Le greffon de {0} ne contient pas le fichier de configuration requis"
-
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "Le greffon de {0} contient une clef incorrecte."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr "Échec de vérification de signature du greffon {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr "Plugin non installé - le signataire n'est pas de confiance"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "Le greffon de {0} est corrompu"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "Le greffon de {0} ne contient pas le fichier de configuration requis"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr "La version ou le nom du greffon de  {0} est incorrect."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr "Versions désapairées du greffon {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Ce greffon nécessite I2P version {0} ou plus récente"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "Ce greffon nécessite Java version {0} ou plus récente"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr "La version du greffon téléchargée est faite pour les nouvelles installations, mais le greffon est déjà installé "
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr "Le greffon installé ne contient pas le fichier de configuration requis"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr "La signature du greffon téléchargé ne correspond pas à celle de celui qui est installé"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr "La version {0} du greffon téléchargé n'est pas plus récente que celle installée"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr "La mise à jour du greffon nécessite au moins la version {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr "La mise à jour du greffon nécessite au plus la version {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr "Le plugin nécessite Jetty version {0} ou plus"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr "Plugin nécessite Jetty version {0} ou moins"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr "Ne peut pas copier le plugin vers le répertoire {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr "Le plugin sera installé au prochain redémarrage."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr "Ce greffon est seulement une mise à jour, mais le greffon prérequis n'est pas installé"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr "Échec d''installation du greffon {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "Greffon {0} installé"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "Greffon {0} installé et démarré"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr "Greffon {0} installé, mais son démarrage a échoué. Vérifiez les historiques"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr "Greffon {0} installé, mais son démarrage a échoué"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "Échec de téléchargement du greffon {0}"
@@ -1018,127 +1045,129 @@ msgstr "Mise à jour depuis {0}"
 msgid "No new version found at {0}"
 msgstr "Pas de nouvelle trouvée sur {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr "Le bannissement temporaire expire dans {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr "Banni jusqu''au redémarrage ou dans {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr "lever le bannissement"
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "Console du routeur I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr "Erreur pendant la mise à jour de la configuration: contrôlez les historiques"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "Configuration sauvegardée avec succès"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1146,313 +1175,314 @@ msgid ""
 msgstr "Erreur pendant l'enregistrement de la configuration (appliquée mais non sauvegardée): contrôlez les historiques"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr "Enregistrer la configuration du client "
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "Enregistrer la configuration de l'interface"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr "Enregistrer la configuration WebApp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "Enregistrer la configuration de greffon"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Installer le greffon"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr "Mettre à jour tous les plugins installés"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Erreur d''arrêt du greffon {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Greffon {0} supprimé"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Erreur de suppression du greffon {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Greffon {0} arrêté"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr "Webapp arrêté {0}"
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Démarrer"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "Nouveau client ajouté"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr "Configuration du client enregistrée avec succès"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr "Index client incorrect."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr "Client {0} stoppé"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr "Client {0} lancé"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr "Client {0} supprimé"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr "Configuration de WebApp sauvegardée."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "Configuration de greffon sauvegardée."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr "WebApp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "démarré"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Echec de démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Pas pu trouver un serveur."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "URL du greffon non spécifiée."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "URL de mise à jour non spécifiée pour {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr "Greffon ou téléchargement de mise à jour déjà en cours d'exécution."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr "Mettre à jour tous les plugins"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr "Mauvaise URL {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr "Cherche de mise à jour du greffon {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "Greffon {0} démarré"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "Erreur de démarrage du greffon {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr "Utilisateur ajouté {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr "Interface de configuration sauvegardée"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr "Nécessite redémarrage pour prendre effet"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Modifier"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Ajouter un client"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "Classe et paramètres"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Clients"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Lancé au démarrage"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr "Actions"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Lancé au démarrage"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "Classe et paramètres"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Description"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Greffon"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Version"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Signé par"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Date"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Autheur"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Licence"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Site web"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Lien de mise à jour"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Arrêt"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Vérifier les mises à jour"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Mise à jour"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Voulez-vous vraiment supprimer {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Effacer"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 msgid "Delete selected"
 msgstr "Efface la sélection"
 
 #: ../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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr "Ajouter item"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr "Restaurer à l'origine"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1483,12 +1513,12 @@ msgid "Removed"
 msgstr "Retiré"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Ajouter la clé"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Supprimer la clé"
 
@@ -1530,7 +1560,7 @@ msgstr "Destination incorrecte"
 msgid "Log overrides updated"
 msgstr "Écrasement des historiques mis à jour"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Configuration des historiques enregistrée"
 
@@ -1553,7 +1583,7 @@ msgstr "Les niveaux autorisés sont DEBUG, INFO, WARN, ERROR, CRIT"
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1562,24 +1592,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1598,53 +1628,54 @@ msgid "Home Page"
 msgstr "Page d'accueil"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Réseau"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr "Panneau de contrôle"
 
@@ -1653,8 +1684,8 @@ msgid "UI"
 msgstr "Apparence"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnels"
@@ -1664,7 +1695,7 @@ msgid "Clients"
 msgstr "Clients"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr "Porte-clés"
 
@@ -1673,15 +1704,15 @@ msgid "Logging"
 msgstr "Historiques"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Pairs"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistiques"
 
@@ -1691,139 +1722,135 @@ msgstr "Avancé"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Enregistrer"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr "Vérification de l'accessibilité du routeur..."
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Mise à jour d'adresse IP en cours"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr "Mise à jour des réglages de IPv6"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr "Désactivation complète de TCP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr "Mise à jour de l''adresse TCP à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr "Désactivation TCP entrant"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr "Mise à jour adresse TCP entrante à \"Auto\""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr "Mise à jour du port TCP à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Avertissement - les ports inférieurs à 1024 ne sont pas recommandés"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr "port invalide"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr "Mise à jour port TCP entrant à \"Auto\""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr "Met à jour le port UDP à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr "Redémarrage respectueux en mode routeur caché"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr "Redémarrage respectueux pour sortie du mode routeur caché"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr "Activation UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr "Désactivation UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr "Activation mode portable"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr "Désactivation mode portable"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr "Activer UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr "Désactiver UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr "Nécessite des représentants SSU"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr "adresse invalide"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr "Le nom d'hôte ou l'IP {0} n'est pas routable publiquement"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr "Mise à jour du pourcentage de bande passante partagée"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr "Limitations mises à jour de la bande passante "
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits par seconde"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "= {0} o/mois  maximum"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr "Interdire pair jusqu'au redémarrage"
 
@@ -1843,7 +1870,7 @@ msgid "Invalid peer"
 msgstr "Pair pas valable"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr "Dé-banir le pair (lever le banissement)"
 
@@ -1856,7 +1883,7 @@ msgid "is not currently banned"
 msgstr "n'est pas banni actuellement"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr "Ajuster les bonus du pair"
 
@@ -1873,7 +1900,7 @@ msgid "Unsupported"
 msgstr "Non supportée"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr "Sauvegarder et réamorcer"
 
@@ -1892,9 +1919,9 @@ msgstr "Configuration sauvegardée avec succès."
 
 #. 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "Arrêter immédiatement"
 
@@ -1949,118 +1976,118 @@ msgstr[1] "Veuillez attendre qu'expirent les engagements d'acheminement de {0} t
 msgid "Restart in {0}"
 msgstr "Redémarrage dans {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "Arrêt respectueux"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "Arrêt respectueux initialisé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "Annuler l'arrêt respectueux"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "Arrêt respectueux annulé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "Redémarrage respectueux"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "Redémarrage respectueux demandé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "Redémarrage immédiat"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "Redémarrage immédiat demandé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr "Régénération de clé et redémarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr "Régénaration clé après redémarrage respecteux"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr "Régénération clé et arrêt"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr "Régénération clé après arrêt respectueux"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Lancer I2P au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "Ne pas lancer I2P au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr "Cliché des tâches"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr "Discussions déversés à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "Montrer la console au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "Afficher la console au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "Ne pas montrer la console au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr "Ne pas afficher la console au démarrage"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr "Forcer GC"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr "Nettoyage complet demandé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Service installé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr "Avertissement: impossible d'installer le service"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Service enlevé"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr "Avertissement: impossible de désinstaller le service"
 
@@ -2101,7 +2128,7 @@ msgid "Refresh interval must be a number"
 msgstr "Intervalle de rafraîchissement doit être un nombre"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr "Restaurer d'origine complètement"
 
@@ -2116,7 +2143,7 @@ msgid "Summary bar will refresh shortly."
 msgstr "La barre de sommaire va rafraîchir sous peu"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr "Restaurer d'origine au minimal"
 
@@ -2149,117 +2176,117 @@ msgstr "Sauvegarder l'ordre des sections"
 #. 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr "Mise à jour des réglages pour tous les groupes."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr "Configuration des tunnels exploratoires sauvegardée avec succès."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
 msgstr "Erreur pendant la sauvegarde de la configuration (appliquée mais non sauvegardée) : regardez les historiques d'erreur"
 
 #. * dummies for translation
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0} saut"
 msgstr[1] "{0} sauts"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0} tunnel"
 msgstr[1] "{0} tunnels"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr "Tunnels exploratoires"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr "Tunnels clients pour {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr "AVERTISSEMENT d'ANONYMAT: les réglages incluent des tunnels à 0 saut!"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr "AVERTISSEMENT d'ANONYMAT: les réglages incluent des tunnels à 1 saut!"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr "AVERTISSEMENT de PERFORMANCES: les réglages incluent des tunnels très longs!"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr "AVERTISSEMENT de PERFORMANCES: les réglages incluent un grand nombre de tunnels!"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "Longueur"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "Aléas"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "Nombre"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr "Secours"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "Options Entrants"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "Options Sortants"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr "Ajout utilisateur"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr "Changement de thème enregistré."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr "Réactualiser la page."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr "Option console mobile sauvegardée."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr "Pas de nom d'utilisateur entré"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr "Pas de mot de passe entré"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr "Utilisateur supprimé {0}"
@@ -2272,50 +2299,46 @@ msgstr "Régler le thème universellement dans toutes les applications"
 msgid "Force the mobile console to be used"
 msgstr "Force l'utilisation de la console mobile"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Danois"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Allemand"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr "Estonien"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Grec"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Anglais"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Terminé"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Français"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr "Hébreu"
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "Hongrois"
@@ -2354,596 +2377,734 @@ msgid "Russian"
 msgstr "Russe"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr "Slovaque"
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "vietnamien"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr "Ajouter un utilisateur et mot de passe pour l'activer."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Ajout"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Mise à jour ou vérification déjà en cours"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Mise à jour disponible, essai de téléchargement en cours"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Mise à jour disponible, cliquez sur le bouton de gauche pour la télécharger"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Pas de mise à jour disponible"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Mise à jour des nouvelles URL à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "interne"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Mise à jour hôte proxy  à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Mise à jour port proxy à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Mise à jour fréquence de rafraîchissement à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Jamais"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Mise à jour politique de mise à jour à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Mise à jour de l'URL de mises à jour."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Mise à jour des clefs de confiance."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Mise à jour URL de mise à jour non signée à {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Tou(te)s les"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Notifier seulement"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Télécharger et vérifier seulement"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Télécharger, vérifier et redémarrer"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
-msgstr "Soumission de formulaire incorrecte: vous avez peut-être utilisé le bouton \"Page précédente\" ou \"Rechargement\" de votre navigateur. Merci de renvoyer."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
+msgstr "Démarage abandonné"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
-msgstr "Si le problème persiste, vérifiez que vous avez activé les cookies dans votre navigateur."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
+msgstr "Remplissage permis"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
-msgstr "Graphique combiné de bandes passantes"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
+msgstr "IP changée"
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
-msgstr "{0} pour {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
+msgstr "Port changé"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
-msgstr "Utilisation de la bande passante"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
+msgstr "Horloge a changé"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
-msgstr "termine {0} auparavant"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
+msgstr "Planté"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
-msgstr "Plus large"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
+msgstr "Erreur critique"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
-msgid "Smaller"
-msgstr "Plus petit"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr "Nouvelle version installée"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
-msgid "Taller"
-msgstr "Plus grand"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr "Installation échouée"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
-msgid "Shorter"
-msgstr "Plus court"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr "Erreur réseau"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
-msgid "Wider"
-msgstr "Plus large"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr "Nouvelle identité de routeur"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
-msgid "Narrower"
-msgstr "Plus étroit"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr "Remplissage désactivé"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
-msgid "Larger interval"
-msgstr "Intervalle plus large"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr "Erreur manque de mémoire"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
-msgid "Smaller interval"
-msgstr "Plus petit intervalle"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr "Routeur réamorçé"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr "Redémarrage  à chaud"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr "Routeur démarré"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr "Routeur arrêté"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr "Routeur mis à jour"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr "Avertissement du chien de garde"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr "Afficher évènements"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr "Évènements depuis"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr "Type d'évènement"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr "Tous évènements"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr "Filtrer évènements"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr "Pas d'évènements trouvés"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr "Pas d''évènements trouvés dans le précédent {0}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr "Pas d''évènements \"{0}\" trouvés"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr "Pas d''évènements \"{0}\" trouvés dans le(s) précédent {1}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "Temps"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr "Évènement"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr "Détails"
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+msgid ""
+"Invalid form submission, probably because you used the 'back' or 'reload' "
+"button on your browser. Please resubmit."
+msgstr "Soumission de formulaire incorrecte: vous avez peut-être utilisé le bouton \"Page précédente\" ou \"Rechargement\" de votre navigateur. Merci de renvoyer."
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr "Si le problème persiste, vérifiez que vous avez activé les cookies dans votre navigateur."
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr "Graphique combiné de bandes passantes"
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr "{0} pour {1}"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr "Utilisation de la bande passante"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr "termine {0} auparavant"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr "Plus large"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
+msgid "Smaller"
+msgstr "Plus petit"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
+msgid "Taller"
+msgstr "Plus grand"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
+msgid "Shorter"
+msgstr "Plus court"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
+msgid "Wider"
+msgstr "Plus large"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
+msgid "Narrower"
+msgstr "Plus étroit"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
+msgid "Larger interval"
+msgstr "Intervalle plus large"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
+msgid "Smaller interval"
+msgstr "Plus petit intervalle"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr "Précédent intervalle"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr "Intervalle suivant"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr "Tracer les moyennes"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr "les événements"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr "Toutes les heures sont en UTC"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr "Paramètres d'affichage des graphiques"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr "Choix des statistiques"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "Plage (mn)"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "ou"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "Taille des images"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "largeur"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "hauteur"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "pixels"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr "Actualiser toutes les"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr "Enregistrer les données de graphiques sur le disque ?"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr "Enregistrer les réglages et redessiner"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr "Réglages des graphiques enregistrés"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Gérer votre fichier d'hôtes I2P ici (I2P DNS)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr "Configure la bande passante"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr "Configuration bande passante I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
-msgstr "Configurer le langage"
+msgstr "Configurer la langue"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr "Sélection langage console"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr "Personnaliser la page d'accueil"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr "Configuration page d'accueil I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Client webmail anonyme"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Messagerie web"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Aide du routeur I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr "Console du routeur I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Client bittorrent anonyme"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Serveur web local"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr "Le projet Anoncoin"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr "Signalements de bug"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 msgstr "Traqueur bug"
 
 #. "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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr "Forum dev"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr "Forum développement"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr "Tracker Bittorrent"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr "diftracker"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr "Applications I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr "FAQ : questions fréquemment posées"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr "Forum communauté"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid ""
 "A public anonymous Git hosting site - supports pulling via Git and HTTP and "
 "pushing via SSH"
 msgstr "Un site d'hébergement Git public anonyme - soutient le pulling Git et HTTP et pushing via SSH"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr "Hébergement anonymous Git"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr "HiddenGate"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr "Microblog"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr "Votre premier service de microblogging sur I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr "Docs Java"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr "Documentation technique"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-msgstr "Site web simple et rapide de microblogging"
-
+#. "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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr "Dépôts Debian et Tahoe-LAFS"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr "Hébergement web libre"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr "Hébergement eepsite libre avec PHP et MySQL"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr "Pastebin I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr "Pastebin"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr "Actualités I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr "Répertoire add-on"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr "Tracker de Postman"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr "Page d'accueil I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr "Site web du projet"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr "Statistiques réseau I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr "Docs techniques"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr "Wiki Trac"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr "Wiki d'Ugha"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr "Applications BitTorrent Seedless et Robert"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr "Site principal de Sponge"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr "Le proxy HTTP n'est pas en place"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, java-format
 msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Votre navigateur n''est pas configuré correctement pour utiliser le proxy HTTP à {0}"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nom"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr "URL"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr "File d'attente job de I2P"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr "Exécuteurs de job"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr "Jobs actifs"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr "commencé {0} auparavant"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr "Jobs tout juste finis"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr "fini {0} auparavant"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr "Jobs prêts/en attente"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 msgid "Scheduled jobs"
 msgstr "Jobs prévus"
 
 #. translators: {0} is a job name, {1} is a time, e.g. 6 min
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr "{0} va démarrer dans {1}"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr "Statistiques totales des jobs"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr "Job"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr "Mis en file d'attente"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr "Lancés"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr "Moy"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr "Temps"
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr "Max"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr "Min"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr "En suspens"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr "Sommaire"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "Emplacement du fichier"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "Fichier pas trouvé"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "Historique vide"
 
@@ -2973,177 +3134,186 @@ msgstr "Tous routeurs avec statistiques complètes"
 msgid "LeaseSets"
 msgstr "Jeux de baux"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr "Routeur"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "non trouvé dans la NetDb"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr "Jeu de baux"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Local"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "Pas publié"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destination"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Ajouter au carnet d'adresses local"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Expirera dans {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Périmé il y a {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Bail"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Pas initialisé"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Statistiques NetDb du routeur "
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Nombre"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transports"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Pays"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Ce routeur"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Informations pair"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Détails"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Caché"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Mise à jour terminée"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "il y a {0}"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publié il y a"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Signature de clé"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adresse(s)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "coût"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Masqué ou en cours de démarrage"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU avec représentants"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP et SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP et SSU avec représentants"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 only SSU, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 NTCP seul, SSU, introducers"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:252
 #, java-format
 msgid "News last updated {0} ago."
-msgstr "Actualités mises à jour il y a {0}"
+msgstr "Actualités mises à jour il y a {0}."
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:258
 #, java-format
@@ -3155,229 +3325,229 @@ msgid "Hide news"
 msgstr "Cacher les actualités"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Montrer les actualités"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr "Vérifie pour mises à jour de plugin"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] "1 plugin mis à jour"
 msgstr[1] "{0} plugins mis à jour"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr "Verification de mise à jour de plugin accomplie"
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
 msgstr[0] "Affichage d'un profil récent."
 msgstr[1] "Affichage de {0} profils récents."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
 msgstr[0] "Masquage d'un très vieux profil."
 msgstr[1] "Masquage de {0} très vieux profils."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
 msgstr[0] "Masquage d'un profil standard."
 msgstr[1] "Masquage de {0} profils standards."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr "Groupes (capacités)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Vitesse"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "Capacité"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "Intégration"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr "Rapide, haute capacité"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr "Haute capacité"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "Standard"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr "Défaillant"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Bien intégrés"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr "Inaccessible"
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr "Échec de test"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "Profil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr "Possib."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr "Valeur intég."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr "Signalé la dernière fois"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr "Entendu depuis"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr "Dernier envoi OK"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr "Dernier envoi KO"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr "Tps de rép.(10mn)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr "Tps de rép. (1h)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr "Tps de rép.(1j)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr "Dernière req. OK"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr "Dernière req. KO"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr "Dernier stk.OK"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr "Dernier stk.KO"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr "Taux d'échec (1h)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr "Taux d'échec (1j)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr "Seuils"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr "pairs rapides"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr "pairs à haute capacités"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr "pairs bien intégrés"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr "tels que définis par le  gestionnaire de profils"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr "Groupes"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr "possibilités vues dans la base de données du réseau (non utilisées pour définir les profils)"
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr "Possib."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid ""
 "peak throughput (bytes per second) over a 1 minute period that the peer has "
 "sustained in a single tunnel"
 msgstr "débit crête (o/s) tenu sur 1mn par le pair sur un seul tunnel"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "Vitesse"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr "Capacité"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr "combien de tunnels nous pouvons lui demander de rejoindre en une heure."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr "sur combien de nouveaux pairs il nous a renseigné récemment."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr "Intégration"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr "Le pair banni, injoignable ou les tests de tunnels échouent."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr "État"
 
@@ -3449,7 +3619,7 @@ msgid "Lifetime average frequency"
 msgstr "Fréquence moyenne de durée de vie"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3500,282 +3670,282 @@ msgstr "Graphique de données"
 msgid "Graph Event Count"
 msgstr "Nombre d'évènements de graphiques"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exporter en XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Durée de vie moyenne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "Aide routeur I2P &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Aide &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "configurer le démarrage des clients et des applications web (services); démarrer manuellement les services arrêtés"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Services I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P Routeur Configuration"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Configuration"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "État des tunnels existants et de la création de tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Afficher toutes les connexions actuelles aux pairs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Afficher les profils de la performance récente des pairs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profils"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Afficher tous les routeurs I2P connus"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDb"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Bilan de santé"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Historiques"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Graphique de performances du routeur"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Graphes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Statistiques textuelles de performance du routeur"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
-msgstr "Destinations locales"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr "Tunnels locaux"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "Gestionnaire de services cachés"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Général"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Votre identité locale est votre identité unique de routeur I2P, semblable à une adresse ip, mais adaptée à I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Ne divulguez jamais ceci à personne, car il peut révéler votre IP monde réel."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Identité locale"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "L'identité unique de votre routeur commence par"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "Ne la révélez JAMAIS à PERSONNE ! (Cliquez pour l'afficher)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "Détails"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "La version du logiciel I2P que nous faisons fonctionner"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
-msgid "How long we've been running for this session"
-msgstr "Durée de cette session"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Lancé depuis"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
+msgid "How long we've been running for this session"
+msgstr "Durée de cette session"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Aide à la configuration du pare-feu et du routeur pour optimiser les performances d'I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "Pour plus d'informations lire le wiki"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Avertissement: ECDSA n'est pas disponible. Mettez à niveau votre Java ou OS"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configure mises à jour I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Mise à jour I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
-msgstr "Pairs dont nous avons parlé dans les dernières minutes / heure dernière"
+msgstr "Pairs auxquels nous avons parlé durant les dernières minutes / heure dernière"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Actifs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
-msgstr "Le nombre de pairs disponibles pour La construction de tunnels exploratoires"
+msgstr "Le nombre de pairs disponibles pour la construction de tunnels exploratoires"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Rapides"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Le nombre de pairs disponibles pour la construction de tunnels exploratoires"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Hautes capacités"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Le nombre de pairs disponibles pour les demandes de bases de données réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Le nombre total de pairs dans notre base de données réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Connus"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configurer la bande passante du routeur"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Bande passante entrante/sortante"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Totale"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Utilisée"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
-msgstr "Utilisé pour construire et tester des tunnels, et communiquer avec leurs pairs de remplissage par diffusion"
+msgstr "Utilisés pour construire et tester des tunnels, et communiquer avec les pairs de remplissage par diffusion"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Exploratoires"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunnels que nous utilisons pour fournir ou accéder à des services sur le réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunnels auxquels nous participons, contribuant ainsi directement à la bande passante du réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Participants"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "Le ratio de sauts tunnel que nous offrons aux sauts tunnel que nous utilisons - une valeur supérieure à 1,00 indique une contribution positive au réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Rapport de partage"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Afficher la file d'attente de travaux du routeur. "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Charge"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indique la performance du routeur"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Retard de tâches"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indique à quelle vitesse sont envoyés les messages sortants vers d'autres routeurs I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Retard de messages"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Temps aller-retour pour un essai tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Retard de tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
-msgstr "Requêtes en attente d'autres routeurs de participer dans les tunnels"
+msgstr "Requêtes en attente issues d'autres routeurs désireux de participer à des tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "En attente"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Nouvelles et mises à jour"
 
@@ -3789,98 +3959,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr "ERR - horloge décalée de {0}"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Test en cours"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr "ERR-Adresse TCP non résolue"
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr "ERR - Adresse TCP privée"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr "ERR - NAT symétrique"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr "WARN - pare-feu avec TCP entrant activé"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr "WARN - Pare-feu et Diffuseur"
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr "Bloqué par un pare-feu"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr "Déconnecté - vérifier le câble réseau"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
 msgstr "ERR-Port UDP en cours d'utilisation - Réglez i2np.udp.internalPort=xxxx dans la configuration avancée puis redémarrez"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr "ERR-Pas de pair actif, vérifiez votre connexion réseau et votre pare-feu"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr "ERR-UDP désactivé, mais port/hôte entrants TCP non renseignés"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN - Pare-feu avec UDP desactivé"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Ajoutez, modifiez/supprimez &amp; contrôlez vos tunnels clients et serveurs"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Serveur"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "Service caché"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Montrer les tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Bails périmés"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Reconstruction"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "il y a"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Prêt"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Construction"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Création des tunnels en cours"
 
@@ -3888,31 +4063,31 @@ msgstr "Création des tunnels en cours"
 #. 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "clients partagés"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Cliquez sur Redémarrer pour installer"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Cliquez sur \"Arrêter\" puis \"Démarrer\" pour installer"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Mise à jour disponible"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Télécharger la version {0}"
@@ -3921,40 +4096,40 @@ msgstr "Télécharger la version {0}"
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Télécharger la version<br> non signée {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Aide à la configuration du pare-feu"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Vérifier NAT/pare-feu"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Réamorçage"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Ordre"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Haut"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Bas"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Fond"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Sélection d'une section à ajouter"
 
@@ -3987,120 +4162,120 @@ msgstr "max"
 msgid "now"
 msgstr "maintenant"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr "configuration"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr "Tunnels clients pour"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr "Morts"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "Tunnels participants"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr "Reçoit sur"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr "Expiration"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr "Envoie sur"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr "Taux"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr "Rôle"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr "Utilisation"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr "délai de grâce"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr "Point terminal sortant"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr "Passerelle entrante"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr "Participant"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr "Affichage limité aux {0} tunnels avec le plus haut usage"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr "Tunnels participants inactifs"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr "Utilisation de la bande passante depuis le démarrage"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr "Echéance"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr "Participants"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr "Point terminal"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr "Création en cours"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr "entrant"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr "sortant"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr "Pas de tunnel; attente de la fin du délai de grâce"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr "entrés"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr "sortis"
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr "carnet d'adresses"
 
@@ -4227,6 +4402,10 @@ msgstr "Cryptage"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4325,343 +4504,351 @@ msgstr "itag1"
 msgid "itag2"
 msgstr "itag2"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr "Configurer la bande passante"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr "Routeur est en panne"
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr "Actualisation auto. (s)"
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr "Activer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr "Gestionnaire de bande passante"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr "I2P fonctionnera mieux si vous configurez les débits de réception et d'émission de façon à ce qu'ils correspondent à ceux de votre connexion Internet."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
-msgstr "ko/s entrants"
+msgstr "KO/s entrants"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
-msgstr "ko/s sortants"
+msgstr "KO/s sortants"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr "Partagés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr "NOTE"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, java-format
 msgid "You have configured I2P to share only {0} KBps."
 msgstr "Vous avez configuré I2P pour qu''il ne partage que {0} KO/s."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
-msgstr "I2P a besoin de plus de 12ko/s afin d'activer le partage de bande passante."
+msgstr "I2P a besoin de plus de 12 KO/S afin d'activer le partage de bande passante."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr "Merci d'activer le partage de bande passante (en participant aux tunnels) en augmentant votre bande passante, si possible."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 msgid ""
 "It improves your anonymity by creating cover traffic, and helps the network."
 msgstr "Cela aidera votre anonymat en cachant vos données parmi les données des autres, et cela améliorera le réseau."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
-msgstr "Vous avez configuré le partage I2P à {0}ko/s."
+msgstr "Vous avez configuré le partage I2P à {0} KO/S."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 msgid ""
 "The higher the share bandwidth the more you improve your anonymity and help "
 "the network."
 msgstr "En partageant davantage de votre bande passante, vous améliorerez votre anonymat et le réseau."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr "Page de configuration réseau avancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr "configuration avancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr "Configuration I2P avancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr "Configuration I2P avancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr "Pour prendre effet certains changement nécessitent un redémarrage."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr "Pour faire des changements, éditez le fichier {0}."
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr "configuration clients"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr "Configuration clients I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr "Préférences"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr "Les clients Java listés ci-dessous sont démarrés par le routeur et s'exécutent dans la même JVM."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr "Soyez prudent ici en changeant n'importe quelle préférence. La 'console du routeur' et les 'tunnels d'application' sont exigés pour la plupart des usages d'I2P. Seuls les utilisateurs avancés devraient changer ceux-ci."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr "Pour changer d'autres options du client, modifiez le fichier"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr "Tous les changements nécessitent un redémarrage pour prendre effet."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr "Configuration de l'interface client avancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr "Configuration de l'interface I2CP (I2P Client Protocol) externe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr "Activé sans SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr "Activé avec SLL requis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Désactivé: les clients hors de ce processus Java ne peuvent pas se connecter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
-msgstr "Port I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
 msgid "I2CP Interface"
 msgstr "Interface I2CP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Port I2CP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr "Requiert utilisateur et mot de  passe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr "Utilisateur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr "La configuration par défaut marchera pour la plupart des gens."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr "Tous les changements apportés ici doivent être répercutés dans le client externe."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr "De nombreux clients ne prennent pas en charge l'authentification ni SSL."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr "Configuration WebApp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4671,7 +4858,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr "Les applications Web Java listées ci-dessous sont démarrées par le client webConsole et s'exécutent dans la même JVM que le routeur. Il s'agit généralement d'applications web accessibles par la console du routeur. Il peut s'agir d'applications complètes (ex: i2pSnark), d'interfaces pour d'autres clients ou applications qui doivent être activées séparément (ex: susidns, i2ptunnel), ou n'ayant absolument aucune interface web (ex: le carnet d'adresses)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4679,711 +4866,719 @@ msgid ""
 "preferred method."
 msgstr "Une appli web peut aussi être désactivée en supprimant le ficher .war du répertoire des web apps; mais le fichier et la web app reviendront à l'occasion d'une mise à jour du routeur, et donc la désactivation depuis la console est la méthode recommandée."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr "Configuration de greffon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr "Les greffons listés ci-dessous sont démarrés par le client webConsole."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr "Installation de greffon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr "Chercher des plug-ins disponibles sur {0}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr "Pour installer un greffon, entrez son URL de téléchargement:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr "accueil config"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr "Page d'accueil par défaut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr "Utiliser la vieille page d'accueil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr "Moteurs de recherche"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
-msgstr "Sites Eep recommandés"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "Services cachés dignes d'intérêt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
-msgstr "Services locaux"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
+msgstr "Applications et Configuration"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr "Configuration du porte-clés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr "Configuration du porte-clés I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr "Le trousseau de clés du routeur est utilisé pour déchiffrer les jeux de baux (leaseSets) cryptés."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr "Le trousseau contient les clés pour des destinations cryptées locales ou distantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr "Ajout manuel de clés"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr "Saisissez ici les clés pour les destinations distantes chiffrées."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr "Les clés des destinations locales doivent être entrées sur la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr "page I2PTunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr "Nom de destination, empreinte, ou clé complète"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr "Clé de cryptage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr "configuration des historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr "Configuration des historiques I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr "Configuration des options d'historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr "Nom du fichier des historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "Editer {0} pour modifier"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(le caractère \"@\" sera remplacé lors des rotations d'historiques)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Format des enregistrements d'historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(utilisez \"d\" = date, \"c\" = classe, \"t\" = tâche, \"p\" = priorité, \"m\" = message)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Format de date des historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "(\"MM\" = mois, \"dd\" = jour, \"HH\" = heure, \"mm\" = minute, \"ss\" = seconde, \"SSS\" = milliseconde)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Taille max des fichiers d'historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Niveau d'historisation par défaut"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG et INFO sont déconseillés, car ils ralentissent drastiquement votre routeur)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Exceptions au niveau d'historisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nouvelle exception"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr "Interconnexion configuration"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr "Configuration I2P réseau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr "Configuration IP et transport "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr "Voir les explications ci-dessous."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr "Configuration UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr "Activer UPnP afin d'ouvrir les ports du pare-feu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr "État de UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr "Configuration IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr "Adresse IP ou nom d'hôte joignable de l'extérieur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr "Utiliser toutes les méthodes d'auto-détection"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr "Désactiver la détection de l'adresse IP par UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr "Ignorer l'adresse IP de l'interface locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr "N'utiliser que la détection d'adresse IP par SSU"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr "Mode caché - ne pas publier l'adresse IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr "(empêche le trafic participants)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr "Saisir l'adresse IP ou le nom d'hôte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr "Action quand l'IP change"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr "Mode IP publique dynamique/PC portable: modifie l'identité du router et le port UDP quand l'IP publique change, pour améliorer l'anonymat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr "Expérimental"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr "Configuration IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr "Désactiver IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr "Activer IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr "Préférer IPv4 à IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr "Préférer IPv6 à IPv4"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr "Utiliser uniquement IPv6 (désactiver IPv4)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr "Configuration UDP :"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr "Port UDP :"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr "Désactiver complètement"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr "(à choisir seulement si derrière un pare-feu qui bloque UDP sortant)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr "Configuration TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr "Utiliser l'adresse IP auto-détectée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr "actuellement"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr "si vous n'êtes pas bloqué par un pare-feu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr "Toujours utiliser l'adresse IP auto-détectée (non bloqué par pare-feu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr "Désactiver les connexions entrantes (car derrière un pare-feu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr "(selectionner seulement si derrière un pare-feu qui limite les connexions sortantes TCP)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr "Port TCP joignable de l'extérieur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr "Utiliser le même port qui a été configuré pour UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr "Saisir le port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr "Remarques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr "a) Ne révélez vos n° de ports à personne ! b) La modification de ces réglages redémarrera votre routeur. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr "Aide à la configuration"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr "Bien que I2P fonctionne derrière la plupart des pare-feux, votre vitesse et votre intégration au réseau seront généralement améliorées par la redirection des ports UDP et TCP d'I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr "Si vous le pouvez, ouvrez un port dans votre pare-feu pour recevoir les paquets UDP et TCP non sollicités."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr "Sinon, I2P est compatible UPnP (Universal Plug and Play) et perçage de trou UDP par \"représentations SSU\" pour relayer le trafic."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr "La plupart des options ci-dessous concernent des situations particulières, par exemple quand UPnP ne marche pas correctement, ou qu'un pare-feu hors de contrôle fait son pénible."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr "Certains types de pare-feu (tels que les NAT symétriques) empêchent un fonctionnement correct."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr "UPnP est utilisé pour communiquer avec des passerelles Internet afin de détecter l'adresse IP extérieure et de contrôler la redirection des ports."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr "La gestion par UPnP est toujours en développement, et peut ne pas fonctionner pour plusieurs raisons"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr "Aucun appareil compatible UPnP détecté"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr "UPnP est désactivé sur l'appareil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr "Interférence entre un pare-feu logiciel et UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr "Bogues dans l'implémentation UPnP de l'appareil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr "Il y a plusieurs routeurs/pare-feux entre le routeur I2P et l'Internet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr "Changement d'appareil UPnP, redémarrage, ou changement d'adresse IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr "Vérifier l'état d'UPnP ici."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr "Vous pouvez activer ou désactiver UPnP ci-dessus, mais afin de prendre en compte le changement il faut redémarrer le routeur I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr "Les noms d'hôtes saisis ci-dessus seront publiés dans la base de données du réseau I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr "Ils ne sont <b>pas privés</b>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr "De plus, <b>ne saisissez pas une adresse IP privée</b> telle que 127.0.0.1 ou 192.168.1.1."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr "Si vous saisissez une mauvaise adresse IP ou nom d'hôte, ou configurez votre NAT ou pare-feu incorrectement, votre intégration avec le réseau I2P sera substantiellement dégradée."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr "Dans le doute, laissez les réglages par défaut."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr "Aide à la joignabilité"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr "Si vous pensez que vous avez ouvert votre pare-feu et qu'I2P indique toujours que vous êtes derrière un pare-feu, n'oubliez pas que vous avez peut-être plusieurs pare-feux : par exemple celui de votre box DSL, ou un pare-feu logiciel dans votre ordinateur."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr "Si il y a une erreur, les <a href=\"logs.jsp\">historiques</a> peuvent aider au diagnostic."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr "Votre port UDP ne semble pas être bloqué par un pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr "Votre port UDP semble bloqué par un pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr "Comme les méthodes de détection de pare-feu ne sont pas fiables à 100%, ceci peut occasionnellement générer une erreur."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr "Cependant, si cela se reproduit systématiquement, vous devez vérifier que votre box et vos pare-feux internes sont ouverts pour votre port."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr "I2P fonctionne très bien derrière un pare-feu, ça n'est pas un problème. Derrière un pare-feu, le routeur utilise des  \"représentants\" pour relayer les connexions entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr "Cependant, vous obtiendrez davantage de trafic participant et aiderez davantage le réseau si vous avez la possibilité d'ouvrir vos pare-feux."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr "Si vous pensez que vous l'avez déjà fait, n'oubliez pas que vous avez peut-être un pare-feu matériel et logiciel, ou que vous êtes derrière un pare-feu supplémentaire sur lequel vous n'avez aucun contrôle (p.e. en entreprise)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr "De plus, certains pare-feux ne peuvent pas transférer correctement TCP et UDP sur le même port, ou pourraient  avoir d'autres limitations ou des bogues qui  les empêcheraient de passer le trafic à I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr "Le routeur teste actuellement si votre port UDP est bloqué."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr "Le routeur n'est pas configuré pour publier son adresse : il n'attend donc pas de connexions entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr "Le mode caché est automatiquement activé pour une protection accrue dans certains pays."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr "WARN - Pare-feu et Rapide"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
-msgstr "Vous avez configuré I2P pour partager plus de 128ko/s de bande passante, mais vous êtes bloqué par un pare-feu."
+msgstr "Vous avez configuré I2P pour partager plus de 128 KO/S de bande passante, mais vous êtes bloqué par un pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
-msgstr "Bien qu'I2P fonctionne correctement dans cette configuration, si vous avez vraiment plus de 128ko/s (~1Mb/s) de bande passante à partager, il serait bénéfique pour le réseau que vous ouvriez un port dans votre pare-feu."
+msgstr "Bien qu'I2P fonctionne correctement dans cette configuration, si vous avez vraiment plus de 128 KO/S (environ 1 MB/S) de bande passante à partager, il serait bénéfique pour le réseau que vous ouvriez un port dans votre pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr "WARN - Pare-feu et Floodfill"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr "Vous avez configuré I2P pour être un routeur de remplissage par diffusion, mais vous êtes derrière un pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr "Pour une meilleure participation en tant que diffuseur, vous devriez ouvrir votre pare-feu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr "WARN - Pare-feu avec TCP entrant activé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr "Vous avez configuré le TCP entrant,  cependant votre port UDP est bloqué par un pare-feu, en conséquence il est probable que votre port TCP le soit aussi."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr "Si votre port TCP est bloqué par un pare-feu et les connexions entrantes TCP activées, les routeurs ne pourront pas vous contacter via TCP, ce qui va perturber le réseau. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr "Merci d'ouvrir votre pare-feu ou de désactiver le TCP entrant ci-dessus."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr "WARN - Pare-feu avec UDP désactivé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr "Vous avez configuré le TCP entrant, mais vous avez désactivé UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr "Vous apparaissez comme étant bloqué par un pare-feu pour TCP, et en conséquence votre routeur ne peut pas accepter les connexions entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr "Merci d'ouvrir votre pare-feu ou d'activer UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr "ERR - Horloge décalée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr "L'horloge système est décalée, ce qui rend la participation au réseau difficile."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr "Corrigez votre réglage d'horloge si cette erreur persiste."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr "ERR - Adresse TCP privée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr "Vous ne devez jamais publier une IP non routable telle que 127.0.0.1 ou 192.168.1.1 en tant qu'adresse externe."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr "Corrigez cette adresse ou désactivez le TCP entrant ci-dessus."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr "ERR - NAT symétrique"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr "I2P a détecté que vous êtes derrière un NAT symétrique."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr "I2P marche mal derrière ce genre de pare-feu. Vous serez probablement incapable d'accepter de recevoir des connexions entrantes, ce qui limitera votre participation au réseau."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr "ERR - Port UDP en cours d'utilisation - réglez i2np.udp.internalPort=xxxx dans la configuration avancée puis redémarrez"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
-msgstr "I2P n'a pas pu s'attacher au port configuré."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
+msgstr "I2P a été incapable de se lier au port configuré, noté dans la page de configuration avancée du réseau."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr "Vérifiez si un autre logiciel utilise le port configuré pour I2P. Si oui, arrêtez ce logiciel ou configurez I2P afin qu'il utilise un port différent (dans Windows tapez netstat dans une boîte de commandes pour lister les ports utilisés par les logiciels)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr "Il s'agit peut-être d'une erreur passagère, si l'autre logiciel  n'utilise plus le port."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr "Cependant un redémarrage du routeur est toujours requis après cette erreur."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr "ERR - UDP est désactivé et l'hôte/port TCP entrant n'est pas défini."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr "Vous n'avez pas configuré le TCP entrant ci-dessus avec un nom d'hôte et un port, cependant vous avez désactivé UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr "Le routeur ne peut donc pas accepter de connexions entrantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr "Merci de configurer ci-dessus un nom et un port TCP, ou activer UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr "ERR - Erreur du gestionnaire de clients I2CP - vérifier l'historique"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr "Ceci est habituellement dû à un conflit de port 7654. Vérifiez dans l'historique (et pensez éventuellement à netstat   ;-)  )."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr "Avez-vous une autre instance d'I2P en cours d'exécution ? Arrêtez le logiciel en conflit puis redémarrez I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr "Configuration des pairs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr "Configuration des pairs I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr "Contrôle manuel des pairs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr "Empreinte du routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr "(Dé)banissement manuel d'un pair"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr "Le banissement empêchera ce pair de participer aux tunnels que vous créez."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr "Ajuster les bonus du profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5391,749 +5586,753 @@ msgid ""
 "displayed on the"
 msgstr "Les bonus peuvent être positifs ou négatifs, et influencent l'affectation des pairs dans les groupes \"Rapides\" et \"Hautes capacités\". Les pairs rapides sont utilisés pour les tunnels clients, et les pairs à hautes capacités pour certains tunnels exploratoires. Les bonus actuels sont affichés sur la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr "page des profils"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr "Pairs bannis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr "Adresses IP bannies"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr "Config réamorçage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr "Configuration du réamorçage d'I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr "Configuration réamorçage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr "Le réamorçage est le processus de lancement utilisé pour trouver d'autres routeurs lors de la première installation de I2P, ou lorsqu'il reste au routeur trop peu de références vers d'autres routeurs."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr "Si le réamorçage a échoué, vérifiez d'abord l'état de votre connexion au réseau."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr "Changez-les seulement si HTTP est bloqué par un pare-feu restrictif, si le réamorçage a échoué, et si vous avez accès à un mandataire (proxy) HTTP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr "Voir les instructions de réamorçage manuel sur {0}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "la FAQ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr "Sélection de l'URL de réamorçage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr "Tenter SSL, sinon repli sur non-SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr "Avec SSL seulement"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr "Sans SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr "URLs de réamorçage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr "Activer le proxy HTTP ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr "Hôte mandataire proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr "Port mandataire proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr "Utiliser l'autorisation proxy HTTP ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr "Nom d'utilisateur proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr "Mot de passe proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr "Activer le proxy HTTPS ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr "Hôte proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr "Port du proxy HTTP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr "Utiliser l'autorisation proxy HTTPS ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr "Nom d'utilisateur proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr "Mot de passe proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr "Configuration du service"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr "Configuration du service I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr "Arrêter le routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr "Un arrêt respectueux permet au routeur de satisfaire les accords en place avec d'autres routeurs avant la fermeture,  mais cela prendra quelques minutes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr "Si vous avez besoin d'arrêter le routeur I2P immédiatement, cette option est également disponible."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr "Si vous voulez que le routeur redémarre après l'arrêt, vous pouvez choisir une des possibilités suivantes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr "C'est utile dans certaines situations: p.e. quand vous faites un réglage que telle application cliente ne lit qu'au démarrage, comme le mot de passe de la console ou l'interface sur lequel elle écoute."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr "Un redémarrage respectueux prendra quelques minutes (mais vos pairs apprécieront votre patience), un redémarrage immédiat est quasi instantané."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr "Après le redémarrage du routeur, il attendra 1 minute avant de se relancer."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr "Intégration dans la zone de notification"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr "Sur Windows, une icône pour la zone de notification indiquant l'état du routeur "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr "(Ultérieurement, les applications clientes I2P pourront aussi intégrer leurs propres fonctionnalités dans la zone de notification système)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr "Si vous êtes sur Windows, vous pouvez (dés)activer cette icône ici."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr "Afficher l'icône de zone de notification"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr "Masquer l'icône de zone de notification"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr "Lancer au démarrage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr "Vous pouvez contrôler si I2P doit être lancé au démarrage ou pas en choisissant une des options suivantes : I2P installera le service en conséquence."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr "Si vous préférez la ligne commande, vous pouvez aussi exécuter la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr "Note"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr "Si vous exécutez actuellement I2P en tant que service, l'enlever arrêtera le routeur immédiatement."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr "Vous pouvez faire un arrêt respectueux, comme ci-dessus, puis lancer le fichier uninstall_i2p_service_winnt.bat."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr "Débogage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr "Afficher la file d'attente de travaux"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr "À l'occasion, il peut être utile de déboguer I2P à l'aide d'un cliché de tâches. Pour ce faire, cliquer sur le bouton ci-dessous et examiner le résultat dans  l'historique du <a href=\"logs.jsp#servicelogs\">service Wrapper</a>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr "Lancer le navigateur au démarrage du routeur?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr "La plus grande partie de la configuration d'I2P se fait dans cette console, et donc pour votre confort, I2P peut lancer au démarrage votre navigateur sur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr "configure barre sommaire"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr "Configuration barre de résumé I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr "Intervalle de rafraîchissement"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr "secondes"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr "Personnaliser la barre de résumé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr "config stats"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr "Configuration des statistiques d'I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr "Sélection des données à collecter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr "Activer toutes les statistiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr "la modification sera prise en compte au prochain démarrage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr "Fichier des statistiques"
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr "Filtre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr "basculer tout"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr "Histo."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr "Graph."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr "Filtre avancé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr "Configuration des tunnels"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr "Configuration des tunnels I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr "La configuration par défaut fonctionne pour la plupart des utilisateurs."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr "Il y a une contradiction fondamentale entre anonymat et performances."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr "Des tunnels à plus de 3 sauts (p.e. 2 sauts + 0-2 sauts, 3 sauts + 0-1 saut, 3 sauts + 0-2 sauts), ou en grand nombre avec une réserve de secours élevée, peuvent gravement réduire les performances ou la fiabilité. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr "Une haute charge CPU et/ou une haute utilisation de bande passante sortante peuvent en résulter. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr "Modifiez ces réglages avec prudence, et ajustez les en cas de problèmes."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr "Les modifications des réglages de tunnels exploratoires sont enregistrées dans le fichier router.config."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr "Les modifications des tunnels clients sont temporaires et ne sont pas enregistrées."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr "Pour faire des modifications permanentes à un tunnel client particulier, voyez la"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr "page i2ptunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr "configuration de la console"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr "Préférences de la console"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr "Thème de la console"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr "Sélection de thème indisponible pour Internet Explorer, désolé."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr "Si vous n'utilisez pas IE, c'est que votre navigateur tente de le faire croire; configurez-le (ou son proxy) pour qu'il utilise une chaîne User Agent différente si vous souhaitez pouvoir changer de thème."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr "Langue de la console"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr "S'il vous plaît contribuez au projet de traduction de la console routeur ! Contactez les développeurs sur #i2p-dev sur IRC pour aider."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr "Mot de passe de console du routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr "mise à jour config"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr "Configuration des mises à jour"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr "Vérification de mises à jour I2P et nouvelles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
-msgstr "Actualités &amp; mises à jour i2P"
+msgstr "Actualités et mises à jour I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr "Contrôle de mises à jour"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr "Mises à jour des nouvelles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr "Mise à jour en cours"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr "URL des actualités"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr "Fréquence d'actualisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr "Méthode de mise à jour"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr "Récupérer news à travers le eepProxy ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr "Mettre à jour via l'eeProxy ?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr "eeProxy hôte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr "Port eepProxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr "Mettre à jour à partir de ces URLs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr "Clés de confiance"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr "Mettre à jour avec les versions intermédiaires de développement non signées?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr "L'URL de version non signée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr "Les mises à jours seront relayées par votre gestionnaire de paquets"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr "accueil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr "Bienvenue sur I2P !"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr "Carnet d'adresses I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr "Ouvrir dans un nouvel onglet"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr "Votre navigateur n'est pas compatible iFrames."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr "Cliquer içi pour continuer."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr "Désolé! Une erreur interne est survenue."
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr "Merci de signaler les bogues sur {0} ou {1}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr "Vous pouvez utiliser l'identifiant \"guest\" et le mot de passe \"guest\" si vous ne souhaitez pas vous inscrire."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr "Veuillez inclure cette information dans les rapports de bugs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr "Détails de l'erreur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Erreur {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr "Version d'I2P & environnement d'exécution"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr "Veuillez prendre note que les informations système, les tampons horaires, et les messages d'historiques contiennent des indices susceptibles de révéler votre identité. Merci de vérifier tout ce que vous incluez dans un rapport de bogue."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr "Page introuvable"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr "Désolé! Vous avez demandé une page ou ressource de la console inexistante. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr "Erreur 404"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr "non trouvé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr "évènements"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr "Log d'évènements I2P"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr "graphiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr "Graphiques de performances I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr "Cliquez sur un drapeau pour sélectionner une langue. Cliquez sur 'configurer la langue' ci-dessous pour la changer plus tard."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr "Recherche I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr "Eepsites d'intérêt"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr "manager tunnel i2p"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr "Gestionnaire de tunnel I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Dump du fichier Jar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr "file d'attente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr "File d'attente de travaux du routeur I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr "historiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr "Fichier traces du routeur I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr "Historiques critiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr "Historiques du routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr "Logs d'évènements"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr "Vue logs d'évènement"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr "Historique du service Wrapper"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr "base de données réseau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr "Base de données réseau I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr "Application web introuvable"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr "Application web non lancée"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr "L'application web demandée n'est pas lancée."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr "Pour la lancer, rendez-vous sur <a href=\"/configclients.jsp#webapp\">configuration des clients</a>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr "connexions de pairs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
 msgstr "Pairs I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr "profils de pairs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
 msgstr "Profils de pairs I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr "Preuve"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr "statistiques"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr "Statistiques du routeur I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr "Désactiver l''actualisation automatique {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr "torrents"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr "Téléchargeur de torrent I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr "résumé des tunnels"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr "Résumé des tunnels I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr "Profils de pair"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr "Profil du pair {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr "webmail"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr "Webmail I2P"
diff --git a/apps/routerconsole/locale/messages_hu.po b/apps/routerconsole/locale/messages_hu.po
index 0fc0228d0e2c48c1a57eb77febc54195586d80c4..1334a16cd0c79aa9cce091a9863e0a273e64e3b6 100644
--- a/apps/routerconsole/locale/messages_hu.po
+++ b/apps/routerconsole/locale/messages_hu.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -39,7 +39,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -48,7 +48,7 @@ msgstr[1] "{0} mp"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -57,64 +57,64 @@ msgstr[1] "{0} perc"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 óra"
 msgstr[1] "{0} óra"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "nem elérhető"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 nap"
 msgstr[1] "{0} nap"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Kitiltva router hash alapján: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Router hash alapján kitiltva"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP kitiltva a blocklist.txt következő bejegyzése alapján: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP-k Kitiltva Újraindításig"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Állandóan kitiltott IP-k"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Innen"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Ide"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "semmi"
 
@@ -124,92 +124,92 @@ msgstr "semmi"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Alagutak elutasítva: indítás"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Alagutak elutasítva: Nagy üzenet késés"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Alagutak legtöbbje elutasítva: nagy számú kérés"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Alagutak elutasítva: Határ elérve"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Alagutak elutasítva: Sávszélesség korlát"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Alagutak legtöbbje elutasítva: Sávszélesség korlát"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Alagutak többségének elfogadása"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Alagutak elfogadása"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Alagutak elutasítva: kikapcsolás folyamatban"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Alagutak elutasítása"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Újratáplálás (reseed) folyamatban"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Az újratáplálás csak 1 routert hozott."
 msgstr[1] "Az újratáplálás csak {0} routert hozott."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Újratáplálás (reseed) sikertelen."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Segítségért lásd {0}."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "újratáplálás (reseed) beállítási oldal"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Újratáplálás: táplálási URL kézbesítése."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -243,7 +243,7 @@ msgstr "Hány társsal beszélünk aktívan"
 msgid "Known fast peers"
 msgstr "Ismert gyors társak"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb bejegyzés"
 
@@ -253,45 +253,54 @@ msgstr "NetDb bejegyzés"
 msgid "No transports (hidden or starting up?)"
 msgstr "Nincs átvitel (rejtett vagy indul)?"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Egyik átvitelen sem érhető el"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Router Átvitel Címek"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "A következő csak kimenő csatlakozásokhoz használva: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP nincs engedélyezve"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Segítség"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Átviteli csatlakozási korlátok automatikusan kerülnek beállításra a konfigurált sávszélesség alapján."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "E határok felülírásához a következő beállításokat a haladó beállitások oldalon: i2np.ntcp.maxConnections=nnn és i2np.udp.maxConnections=nnn ."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Meghatározások"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -300,251 +309,258 @@ msgstr "Meghatározások"
 msgid "Peer"
 msgstr "Társ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "A távoli társ, router hash alapján azonosítva"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Könyvtár"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Bejövő csatlakozás"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Kimenő csatlakozás"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Felajánlották, hogy bemutatnak minket (segít a többi társnak átmenni a tűzfalunkon)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Feljánlottuk, hogy bemutatjuk őket (segít a többi társnak átmenni a tűzfalukon)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Mennyi idő telt el az utolsó csomag fogadása / küldése óta"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Üres"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Be/Ki"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Finomított bejövő / kimenő átviteli ráta (KB / mp)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Mennyi ideje lett a kapcsolat létrehozva"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Fel"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Pontatlanság"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "A különbség a társ órája és a sajátod között"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "A torlódás ablak, azaz mennyi bájt küldhető visszaigazolás nélkül"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "A visszaigazolásra váró elküldött üzenetek száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Az egyszrre küldendő üzenetek maximális száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "A függőben lévő küldések, melyek túllépik a torlódás ablakot"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "A lassú indítás határérték"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "A körbejárási idő ezredmásodpercben."
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Újraközlés időtúllépése ezredmásodpercben"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Jelenlegi maximális küldési csomag méret / becsült maximális fogadási csomag méret (bájt)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "Küldött"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "A társnak küldött csomagok teljes száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "Fogadott"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "A társtól érkezett csomagok teljes száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Duplex Küldött"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "A társnak újraközölt csomagok teljes száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Duplex Fogadott"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "A társtól érkezett duplikált csomagok teljes száma"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Szolgáltatás"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN Általános Interfész Beállítás"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Státusz"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Típus"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Felfelé menő"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Lefelé jövő"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAP PPP Kapcsolat"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Indítás óta eltelt idő"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Külső IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "3. réteg Továbbítás"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Alapértelmezett Csatlakozási Szolgáltatás"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP Kapcsolat"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Megvan az Eszköz"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Aleszköz"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP Státusz"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP letiltva; van egynél több UPnP Internet Átjáró (Gateway) Eszköz a Helyi Hálózaton?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP nem talált UPnP-t használó kompatibilis eszköt a Helyi Hálózaton."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Az UPnP által visszajelzett jelenlegi külső IP Cím a következő: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "A jelenleg külső IP cím nem áll rendelkezésre."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "Az UPnP jelentése szerint a maximális lefelé jövő bitráta {0} bit/mp"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "Az UPnP jelentése szerint a maximális felfelé menő bitráta {0} bit/mp"
@@ -553,280 +569,276 @@ msgstr "Az UPnP jelentése szerint a maximális felfelé menő bitráta {0} bit/
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "UPnP sikeresen átirányította a következőt: {0} port {1,number,#####}."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "Nincs átirányítva az UPnP által a következő: {0} port {1,number,#####}."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP nincs engedélyezve"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Kimagasló óra pontatlanság: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP kapcsolatok"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Határ"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Kimenő Sor"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Visszanaplózva?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Bejövő"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Kimenő"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP csatlakozások"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Rendezés társ hash szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Irány/Bemutató"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Rendezés üres bejövő szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Rendezés üres kimenő szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Rendezés bejövő sebesség szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Rendezés kimenő sebeeség szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Rendezés kapcsolat indítása óta eltelt idő szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Rendezés óra eltérése szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Rendezés torlódás ablak szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Rendezés lassú indítás küszöb szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Rendezés körbejárási idő szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Rendezés újraátviteli időtúllépés szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Rendezés maximális kimenő továbbítási egységenként"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Rendezés küldött csomagok szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Rendezés fogadott csomagok szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Rendezés újraközvetített csomagok szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Rendezés több, mint egyszer fogadott csomagok szerint"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Fejajánlottuk, hogy bemutatjuk őket"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Felajánlották, hogy bemutatnak minket"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Eltömődött"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 sikertelen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} sikertelen"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Kitiltva"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Alagút kérések elvetése: túl lassú"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Alagút kérések elvetése: túlterhelt"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Alagutak elvetése: kérés túlterhelt"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Alagutak elvetése: Kapcsolódási korlát"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Alagút kérések elvetése: Magas töltöttség"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Alagút kérések elvetése: Sorba állítási idő"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Elérhető új kiegészítő verzió: {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "{0} kiegészítő frissítés keresése sikertelen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Nincs elérhető új verzió a következő kiegészítőhöz: {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} B átviltelre került."
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Sikertelen átvitel a következőtől: {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Frissítés letöltve"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Újraindítás"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Frissítés igazolva"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "innen {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Az aláírás nélküli frissítési fájl korrupt a következőtől: {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Sikertelen másolás a következőre: {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1334,8 +1346,8 @@ msgid "Add Client"
 msgstr "Kliens Hozzáadása"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Kliens"
 
@@ -1366,9 +1378,9 @@ msgid "Plugin"
 msgstr "Kiegészítő"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Verzió"
 
@@ -1390,7 +1402,7 @@ msgstr "Licensz"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Weboldal"
 
@@ -1403,7 +1415,7 @@ msgid "Stop"
 msgstr "Állj"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Frissítések ellenőrzése"
@@ -1425,7 +1437,7 @@ msgstr "Törlés"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1435,7 +1447,7 @@ msgstr "Kiválasztottak Törlése"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1454,6 +1466,7 @@ msgstr "Alapértelmezett Beállítások Visszaállítása"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1534,7 +1547,7 @@ msgstr "Érvénytelen célállomás"
 msgid "Log overrides updated"
 msgstr "Napló felülbírálás frissítve"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Napló beállítások elmentve"
 
@@ -1583,7 +1596,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Eltávolítás"
 
@@ -1602,7 +1615,7 @@ msgid "Home Page"
 msgstr "Kezdőlap"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Hálózat"
 
@@ -1658,8 +1671,8 @@ msgid "UI"
 msgstr "Kezelőfelület"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Alagút"
@@ -1678,15 +1691,15 @@ msgid "Logging"
 msgstr "Naplózás"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Társ"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statisztika"
 
@@ -1699,7 +1712,7 @@ msgstr "Haladó"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1809,16 +1822,16 @@ msgstr "A sávszélesség százalékos megosztása frissítés alatt"
 msgid "Updated bandwidth limits"
 msgstr "Sávszélesség korlátai frissítve"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bit másodpercenként"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "vagy maximum {0} bájt havonta"
@@ -2384,7 +2397,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -2393,86 +2406,86 @@ msgstr "Hozzáadás"
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Frissítés elérhető, kísérlet a letöltésre"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Frissítés elérhető, a letöltéshez kattints a bal oldalon lévő gombra"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Nincs elérhető frissítés"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Hírek URL frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "belső"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Proxy hoszt frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Proxy port frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Frissítési gyakoriság frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Soha"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Frissítési házirend frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "A frissítési URL-ek frissítése."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Megbízható kulcsok frissítése."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Nem aláírt frissítő URL frissítése a következőre: {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Összes"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Csak jelez"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Csak letöltés és igazolás"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Letöltés, igazolás és újraindítás"
 
@@ -2630,7 +2643,7 @@ msgid "{0} for {1}"
 msgstr "{0} {1} számára."
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Sávszélesség felhasználás"
 
@@ -2744,12 +2757,12 @@ msgid "Graph settings saved"
 msgstr "Ábra beállítások elmentve"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Címjegyzék"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "I2P hosts fájl kezelése itt (I2P domain név feloldás)"
 
@@ -2780,17 +2793,17 @@ msgid "I2P Home Page Configuration"
 msgstr "I2P Kezdőlap Beállítása"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anoním webes e-mail kliens"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-mail"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Router Segítség"
 
@@ -2800,17 +2813,17 @@ msgid "Router Console"
 msgstr "Router Konzol"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Beépített anoním BitTorrent Kliens"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrent"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Helyi web szerver"
 
@@ -2896,10 +2909,8 @@ msgstr "Java dokumentumok"
 msgid "Technical documentation"
 msgstr "Szakmai dokumentáció"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2982,7 +2993,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "A böngésződ nincs megfelelően beállítva, hogy HTTP proxyt használjon a következőn: {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Név"
 
@@ -3132,148 +3143,157 @@ msgid "Unpublished"
 msgstr "Nem közzétett"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Célállomás"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Lejár {0} belül"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Lejárt {0} ezelőtt"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Átjáró (Gateway)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Kiad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Alagút"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Nincs inicializálva"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Hálózati Adatbázis Router Statisztika"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Mennyiség"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Átvitel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Ország"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Mi infónk"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Társ infó a következőnek"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Teljes bejegyzés"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Frissített"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} előtt"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Közzétett"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Cím(ek)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "költség"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Rejtett vagy indul"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU bemutatókkal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP és SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP és SSU bemutatókkal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3292,7 +3312,7 @@ msgid "Hide news"
 msgstr "Hírek elrejtése"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Hírek mutatása"
 
@@ -3373,7 +3393,7 @@ msgid "Failing"
 msgstr "Elromló"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrált"
 
@@ -3586,7 +3606,7 @@ msgid "Lifetime average frequency"
 msgstr "Élethossz átlag gyakorisága"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3637,282 +3657,282 @@ msgstr "Ábra Adat"
 msgid "Graph Event Count"
 msgstr "Ábra Események Száma"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Adat exportálása XML-be"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Élethossz átlag érték"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Router Segítség és GYIK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Segítség és GYIK"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Beállítások a kliensek és webalkalmazások (szolgáltatások) indítására vonatkozóan; elfekvő szolgáltatások kézi indítása"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P Szolgáltatások"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P Router Beállítása"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P Belső"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Létező alagutak és alagút építési állapot megtekintése"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Minden jelenlegi társ csatlakozás megjelenítése"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "A legutóbbi társ teljesítmény profilok megjelenítése"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profil"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Minden ismert I2P router listájának megjelenítése"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Egészségi Állapot"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Napló"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Ábra router teljesítmény"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Ábra"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Szöveges router teljesítmény statisztika"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Helyi Célállomások"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PAlagút"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Általános"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Ezt ne tedd közzé, mert tartalmazza az igazi ip címedet."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Helyi Személyazonosság"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Egyedi I2P router azonosítód a következő:"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "soha ne fedd fel senkinek"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "Mutat"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "A futó I2P alkalmazás verziója"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Mióta fut ez a munkaszakasz"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Indítás óta eltelt idő"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Segítség a tűzfal és router beállítására az I2P optimális teljesítménye érdekében"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "I2P frissítések konfigurálása"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P frissítés"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Utóbbi percek/óra kapcsolatai"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Aktív"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "A kliens csatornát létrehozó kapcsolatok száma"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Gyors"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Nagy kapacitású"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "A hálózati adatbázisban szereplő összes kapcsolat száma"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Ismert"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "A router szávszélesség elosztásának beállítása"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Sávszélesség Be/Ki"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Összes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Használt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Felderítő"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Résztvevő"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Megosztási ráta"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Mi van a router munka várólistájában?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Torlódás"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "A router teljesítményét szemlélteti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Feladat késés"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Más I2P routereknek küldött üzenetek gyorsaságát szemlélteti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Üzenet késés"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Alagút lemaradás"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Vissznapló"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3986,43 +4006,43 @@ msgstr "HIBA-UDP letiltva és Bejövő TCP hoszt/port nincs beállítva"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "FIGYELEM-Tűzfalazva és UDP Letiltva"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Hozzáadás/Eltávolítás/Szerkesztés, valamint saját kliens és szerver alagutak vezérlése"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Szerver"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Alagutakat mutat"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Kiadás lejárt"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Újraépítés"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "előtt"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Kész"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Építés alatt"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Alagutak építés alatt"
 
@@ -4030,31 +4050,31 @@ msgstr "Alagutak építés alatt"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "osztott kliensek"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Telepítéshez kattints az újraindításra"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Telepítéshez kattints a lekapcsolás és újraindítás -ra"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "{0} Verzió"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "{0} Frissítés Letöltése"
@@ -4063,40 +4083,40 @@ msgstr "{0} Frissítés Letöltése"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Aláírás nélküli<br>Frissítés Letöltése {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Segítség a tűzfal beállításához"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Ellenőrizd a hálózati kapcsolatokat és a NAT-ot/tűzfalat"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Újratáplálás (reseed)"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4369,6 +4389,10 @@ msgstr "Titkosítás"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PAlagút"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetKészlet"
@@ -4686,7 +4710,7 @@ msgstr "Haladó hálózati beállítások lap"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4774,13 +4798,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Tiltva - Az e Java folyamaton kívüli kliensek nem csatlakozhatnak"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP Port"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP Felület"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP Port"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Hitelesítés"
@@ -4867,13 +4891,14 @@ msgid "Search Engines"
 msgstr "Keresőmotorok"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Javasol Eep Oldalak"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Helyi Szolgáltatások"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4932,48 +4957,53 @@ msgstr "Az I2P Naplózái Opcióinak Beállításai"
 msgid "Log file"
 msgstr "Naplófájl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(a '@' karakter a napló váltása alatt cserélve lesz)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Naplórögzítési formátum"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(használd a következőket: 'd' = dátum,  'c' = osztály(class), 't' = szál(thread), 'p' = elsőbbség(priority), 'm' = üzenet(message))"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Napló dátumformátum"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = hónap(month), 'dd' = nap(day), 'HH' = óra(hour), 'mm' = perc(minute), 'ss' = másodperc(second), 'SSS' = ezredmásodperc(millisecond))"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Naplófájl maximális mérete"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Alapértelmezett naplózási szint"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG és INFO nem javasolt alapértelmezett beállítások, mivel drasztikusan lelassítják a routert)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Naplózási szint felülbírálat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Új felülbírálat"
 
@@ -6161,18 +6191,6 @@ msgstr "Nyelv kiválasztásához kattints egy zászlóra. Későbbi átállítá
 msgid "Search I2P"
 msgstr "Keress az I2P-n"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Érdekes eep Oldalak"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar Fájl Lerakat"
diff --git a/apps/routerconsole/locale/messages_it.po b/apps/routerconsole/locale/messages_it.po
index 637dfc839edb72e1af08cfc506276fcf460e686b..da3233eb8ddb22fd9aaec7e9f7d25e8e23d415d8 100644
--- a/apps/routerconsole/locale/messages_it.po
+++ b/apps/routerconsole/locale/messages_it.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -47,7 +47,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -56,7 +56,7 @@ msgstr[1] "{0} sec"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -65,64 +65,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 ora"
 msgstr[1] "{0} ore"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 giorno"
 msgstr[1] "{0} giorni"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Bannato dall'' hash del router: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Bannato dall'' hash del router"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP bannato dalla voce {0} di blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP Bannati Fino al Riavvio"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP Permanentemente Bannati"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Da"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "A"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "nessuno"
 
@@ -132,92 +132,92 @@ msgstr "nessuno"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Rifiutando i tunnel: Avvio"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Rifiutando i tunnel: Alto ritardo nei messaggi"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Rifiutando la maggior parte dei tunnel: Alto numero di richieste"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Rifiutando i tunnel: Limite raggiunto"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Rifiutando i tunnel: Limite di banda raggiunto"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Rifiutando la maggior parte dei tunnel: Limite di banda raggiunto"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Accettando la maggior parte dei tunnel"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Accettando i tunnel"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Rifiutando i tunnel: Arresto"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Rifiutando i tunnel"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeding"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Il reseed ha recuperato solo 1 router."
 msgstr[1] "Il reseed ha recuperato solo {0} router."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed fallito"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Guarda {0} per aiuto"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "Pagina di configurazione del reseed"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseed: recupero dell'URL dei seed."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -251,7 +251,7 @@ msgstr "Con quanti peer stiamo attivamente comunicando"
 msgid "Known fast peers"
 msgstr "Peer veloci conosciuti"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Voce del NetDb"
 
@@ -261,45 +261,54 @@ msgstr "Voce del NetDb"
 msgid "No transports (hidden or starting up?)"
 msgstr "Nessun trasporto (nascosto o in avvio?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Irraggiungibile su ogni trasporto"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Indirizzo di trasporto del router"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} è usato solo per le connessioni in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP non è abilitato"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "I tuoi limiti di connessione per il trasporto sono automaticamente impostati basandosi sulla tua banda configurata."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Per sistemare questi limiti, aggiungi l'impostazione i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn nella pagina di configurazione avanzata."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definizioni"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -308,251 +317,258 @@ msgstr "Definizioni"
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Peer remoto, identificato dall'hash del router"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Cartella"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Connessione in ingresso"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Connessione in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Si sono offerti di introdurci (aiutano gli altri peer ad attraversare il firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Ci siamo offerti di introdurli (aiuta i peer ad attraversare il loro firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Quanto è passato dalla ricezione/invio di un pacchetto"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Inattivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Entrata/Uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Il tasso di trasferimento normalizzato in entrata / uscita (KBytes/secondo)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Quanto è passato dall'inizio di questa connessione"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Su"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Disallinea"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Differenza tra l'ora del peer e la tua"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Finestra di congestione, che corrisponde a quanti byte possono essere inviati senza ricevere conferma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Numero di messaggi inviati in attesa di conferma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Numero massimo di messaggi da inviare contemporaneamente"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Numero di invii in attesa che superano il limite della finestra di congestione"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "La soglia di avvio lento"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Tempo di ciclo in millisecondi"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Il timeout di ritrasmissione in millisecondi"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Dimensione corrente massima pacchetti in invio / dimensione massima stimata pacchetti in ricezione (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Il numero totale di pacchetti inviati al peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Il numero totale di pacchetti ricevuti dal peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Il numero totale di pacchetti ritrasmessi al peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Il numero totale di pacchetti duplicati ricevuti dal peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Servizio"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Configurazione Interfaccia Comune WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Stato"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Flusso in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Flusso in entrata"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Connessione WAN PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Intervallo di attività"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP esterno"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Inoltro Layer 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Servizio di Connessione di Default"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Connessione IP WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Configurazione Link WAN Ethernet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Trovato Dispositivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Sottodispositivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Stato UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Disabilita i dispositivi UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP è stato disabilitato. Hai più di un Dispositivo Internet Gateway UPnP sulla tua LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP non ha trovato nessun dispositivo compatibile UPnP-aware sulla tua LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "L''indirizzo IP esterno corrente riportato da UPnP è {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "L'indirizzo IP esterno corrente non è disponibile."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP  riporta che il tasso massimo di bit in entrata è {0}bit/sec"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP riporta che il tasso massimo di bit in uscita è {0}bit/sec"
@@ -561,280 +577,276 @@ msgstr "UPnP riporta che il tasso massimo di bit in uscita è {0}bit/sec"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} porta {1,number,#####} è stata inoltrata con successo da UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} porta {1,number,#####} non è stata inoltrata da UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP non è abilitato"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Ritardo del segnale di ciclo eccessivo: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Connessioni NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Intervallo"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Fuori dalla coda"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Arretrato?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "In ingresso"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "In uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} peer"
 msgstr[1] "{0} peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Connessioni UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Ordina secondo l' hash dei peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Direzione/Introduzione"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Ordina secondo il tempo di inattività dei tunnel in entrata"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Ordina secondo il tempo di inattività dei tunnel in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Ordina secondo la velocità dei tunnel in entrata"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Ordina secondo la velocità dei tunnel in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Ordina per tempo di connessione"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Ordina secondo la discrepanza di ciclo"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Ordina per finestra di congestione"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Ordina secondo la soglia di avvio lento"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Ordina per tempo di ciclo"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Ordina secondo l'intervallo di ritrasmissione"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Ordina secondo l'unità massima di trasmissione in uscita"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Ordina per pacchetti inviati"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Ordina per pacchetti ricevuti"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Ordina per pacchetti ritrasmessi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Ordina per pacchetti ricevuti più di una volta"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Ci siamo offerti di introdurli"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Hanno offerto di introdurci"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Congestionato"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 fallimento"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} fallimenti"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Bannato"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "ritardi"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Abbandono delle richieste tunnel: Troppo lento"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Abbandono delle richieste tunnel: Carico troppo elevato"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Rifiuto dei tunnel: Troppe richieste"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Rifiuto dei tunnels: Limite di connessioni raggiunto"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Abbandono delle richieste tunnel: Carico elevato"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Abbandono delle richieste tunnel: Tempo della coda scaduto"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Una nuova versione del plugin {0} è disponibile"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Controllo aggiornamenti per il plugin {0} fallito"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Nessuna nuova versione del plugin {0} è disponibile"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B trasferiti"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Trasferimento fallito da {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Aggiornamento scaricato"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Riavvio"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Aggiornamento verificato"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "da {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Il file di aggiornamento non firmato ricevuto da {0} è corrotto"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Copia a {0} fallita"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Aggiornamenti in-network disabilitati. Controlla il packet manager."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Non hai i permessi di scrittura per la cartella di installazione di I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Devi prima aggiornare alla versione {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Richiede la versione {0} di Java ma è installata la versione {1}"
@@ -1342,8 +1354,8 @@ msgid "Add Client"
 msgstr "Aggiugi client"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Client"
 
@@ -1374,9 +1386,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versione"
 
@@ -1398,7 +1410,7 @@ msgstr "Licenza"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Sito web"
 
@@ -1411,7 +1423,7 @@ msgid "Stop"
 msgstr "Ferma"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Verifica aggiornamento"
@@ -1433,7 +1445,7 @@ msgstr "Cancella"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1443,7 +1455,7 @@ msgstr "Elimina selezionati"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1462,6 +1474,7 @@ msgstr "Ripristina"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1542,7 +1555,7 @@ msgstr "Destinazione non valida"
 msgid "Log overrides updated"
 msgstr "Sovrascrittura dei log aggiornata"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Configurazione eventi salvata"
 
@@ -1591,7 +1604,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1610,7 +1623,7 @@ msgid "Home Page"
 msgstr "Pagina Principale"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Rete"
 
@@ -1666,8 +1679,8 @@ msgid "UI"
 msgstr "Interfaccia Utente"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnel"
@@ -1686,15 +1699,15 @@ msgid "Logging"
 msgstr "Registro"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peer"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistiche"
 
@@ -1707,7 +1720,7 @@ msgstr "Avanzate"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1817,16 +1830,16 @@ msgstr "Aggiornamento delle percentuali di condivisione di banda"
 msgid "Updated bandwidth limits"
 msgstr "Limiti di banda aggiornati"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bit al secondo"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "o {0} byte per mese al massimo"
@@ -2392,7 +2405,7 @@ msgstr "Nome Utente"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -2401,86 +2414,86 @@ msgstr "Aggiungi"
 msgid "Password"
 msgstr "Password"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Aggiornamento o controllo già in corso"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Aggiornamento disponibile, tentativo di scaricamento in corso"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Aggiornamento disponibile, fai click sul pulsante a sinistra per scaricarlo"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Nessun aggiornamento disponibile"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Aggiornando URL notizie a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Aggiornando host proxy a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Aggiornando porta proxy a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Aggiornando frequenza di aggiornamento a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Mai"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Aggiornando politica di aggiornamento a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Aggiornamento degli URL degli aggiornamenti."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Aggiornamento delle chiavi di fiducia."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Aggiornando URL aggiornamenti non firmati a {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Ogni"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Segnala solo"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Scarica e verifica soltanto"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Scarica, verifica e riavvia"
 
@@ -2638,7 +2651,7 @@ msgid "{0} for {1}"
 msgstr "{0} per {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Utilizzo di larghezza di banda"
 
@@ -2752,12 +2765,12 @@ msgid "Graph settings saved"
 msgstr "Impostazioni del grafico salvate"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Rubrica"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Gestisci qui i tuoi file host I2P (risoluzione del nome di dominio I2P)"
 
@@ -2788,17 +2801,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Configurazione Pagina Principale I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Client di posta elettronica anonimo"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-mail"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Aiuto per il router I2P"
 
@@ -2808,17 +2821,17 @@ msgid "Router Console"
 msgstr "Console del Router"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Client BitTorrent anonimo incorporato"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrent"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Server web locale"
 
@@ -2904,10 +2917,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Documentazione Tecnica"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "Sito web di microblogging semplice e veloce"
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2990,7 +3001,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Il tuo browser non è configurato correttamente per usare il proxy HTTP al {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nome"
 
@@ -3140,148 +3151,157 @@ msgid "Unpublished"
 msgstr "Non pubblicato"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destinazione"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Scade in {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Scaduto {0} fa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Non inizializzata"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Statistiche del Router nel Database della Rete"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Conto"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Paese"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Informazioni su di noi"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Informazioni del Peer per"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Voce completa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} fa"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Pubblicato"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Indirizzo/i"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "costo"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Nascosto o in avvio"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU con introduttori"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP e SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP e SSU con introduttori"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 solo SSU, presentatori"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, presentatori"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, presentatori"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 solo NTCP, SSU, presentatori"
 
@@ -3300,7 +3320,7 @@ msgid "Hide news"
 msgstr "Nascondi notizie"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Mostra notizie"
 
@@ -3381,7 +3401,7 @@ msgid "Failing"
 msgstr "In fallimento"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrato"
 
@@ -3594,7 +3614,7 @@ msgid "Lifetime average frequency"
 msgstr "Frequenza media dell'arco di vita"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3645,282 +3665,282 @@ msgstr "Dati del Grafico"
 msgid "Graph Event Count"
 msgstr "Grafo Conteggio Eventi "
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Esporta Dati come XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Valore medio nell'arco di vita"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "Aiuto &amp Router I2P; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Aiuto &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Configura l'avvio di client e webapps (servizi); avvia manualmente servizi dormienti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Servizi I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configura il Router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Interni I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Vedi i tunnel esistenti e lo stato della costruzione dei tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Mostra tutte le connessioni correnti dei peer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Mostra i profili di prestazioni recenti dei peer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Mostra la lista di tutti i router I2P conosciuti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Rapporto di salute"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Registri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Grafico delle prestazioni del router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Grafici"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Statistiche testuali delle prestazioni del router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Destinazioni Locali"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Tunnel I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Generale"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "La tua identità locale è rappresentata dall'identità del tuo i2P router, che è simile ad un indirizzo ip ma appartenente alla rete i2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "NON divulgare queste stringhe a nessuno, esse potrebbero rivelare il tuo vero ip."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Identità locale"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "La tua identità unica del router I2P è"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "non rivelarla mai a nessuno"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "mostra"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "La versione di I2P che stai eseguendo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Da quanto tempo stiamo funzionando in questa sessione"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Intervallo di attività"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Aiuto nella configurazione del tuo firewall e del tuo router per ottenere prestazioni ottimali da I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configura aggiornamenti I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Aggiornamento I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Peers con i quali abbiamo comunicato negli ultimi minuti/ultima ora"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Attivo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Numero di peers disponibili per costruire i client-tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Veloce"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Numero di peers disponibili per costruire tunnel di esplorazione"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Alta capacità"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Numero di peers disponibili per le ricerche"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Numero totale di peers nel nostro database di reti"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Conosciuto"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configura l'allocazione di banda del router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Largheza di banda entrata/uscita"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Totale"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Usato"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Usato per costruire/testare i tunnel e comunicare con i peers di accumulo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Esplorativo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunnel che stiamo usando per promuovere o accedere a servizi in rete"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunnel ai quali contribuiamo facendone parte con la nostra larghezza di banda"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Partecipando"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "Il rapporto tra hops di tunnel che proponiamo rispetto a quelli che usiamo, più il valore si avvicina a 1.00 più contribuiamo alla rete i2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Tasso di condivisione"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Cosa c'è nella coda di lavoro del router?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Congestione"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indica le performance del router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Ritardo nel compito"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indica quanto veloci sono i messaggi in uscita verso gli altri router I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Ritardo nel messaggio"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Test (tempo) di un ciclo tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Lag del tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "Richieste in coda da parte di altri routers per partecipare ai tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Arretrati"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "News &amp; Aggiornamenti"
 
@@ -3994,43 +4014,43 @@ msgstr "ERR- UDP Disabilitato e host/porta delle connessioni TCP in Ingresso non
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN - Bloccato dal Firewall con UDP Disabilitato"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Aggiungi/rimuovi/modifica &amp; controlla i tunnel dei tuoi client e server"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Mostra i tunnel"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Noleggi scaduti"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Ricostruendo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "fa"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Pronto"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Costruendo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Costruendo i tunnel"
 
@@ -4038,31 +4058,31 @@ msgstr "Costruendo i tunnel"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "client condivisi"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Cliccare Riavvia per installare"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Cliccare Spegni per riavviare e installare"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versione {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Scaricamento {0} Aggiornamento"
@@ -4071,40 +4091,40 @@ msgstr "Scaricamento {0} Aggiornamento"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Scaricamento Aggiornamento {0} Non Firmato<br>"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Aiuto con la configurazione del firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Controlla la connessione di rete e il NAT/firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Ordine"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Sopra"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Sotto"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Basso"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Seleziona una sezione da aggiungere"
 
@@ -4377,6 +4397,10 @@ msgstr "Cifratura"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Tunnel I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4694,7 +4718,7 @@ msgstr "Pagina di configurazione avanzata della rete"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4782,13 +4806,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Disabilitato - i Client al di fuori di questo processo Java potrebbero non connettersi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "Porta I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "Interfaccia I2CP"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Porta I2CP"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorizzazione"
@@ -4875,13 +4899,14 @@ msgid "Search Engines"
 msgstr "Motori di Ricerca"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Eepsite raccomandati"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Servizi Locali"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4940,48 +4965,53 @@ msgstr "Configura le Opzioni di registrazione I2P"
 msgid "Log file"
 msgstr "Registra file"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(il simbolo '@' sarà sostituito durante la rotazione dei log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Formato di registrazione dei log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(usa 'd' = data, 'c' = classe, 't' = thread, 'p' = priorità, 'm' = messaggio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Formato della data nei log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = mese, 'dd' = giorno, 'HH' = ora, 'mm' = minuto, 'ss' = secondo, 'SSS' = millisecondo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Massima dimensione del file di log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Livello di base dei log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG e INFO non sono valori di base consigliati dato che rallenterebbero drasticamente il tuo router)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Sovrascrittura del livello di log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nuova sovrascrittura"
 
@@ -6169,18 +6199,6 @@ msgstr "Clicca una bandiera per selezionare una lingua. Clicca 'configura lingua
 msgid "Search I2P"
 msgstr "Cerca I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Eepsite di Interesse"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "Gestione dei tunnel i2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Gestione Tunnel I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar File Dump"
diff --git a/apps/routerconsole/locale/messages_ja.po b/apps/routerconsole/locale/messages_ja.po
index e7bb185e9243bd9d0945725336a6da5157ccb7e6..db19736e56bc8c9d808ff5faa960cbe824fc7f6d 100644
--- a/apps/routerconsole/locale/messages_ja.po
+++ b/apps/routerconsole/locale/messages_ja.po
@@ -6,14 +6,16 @@
 # Translators:
 # タカハシ <gomidori@live.jp>, 2013-2014
 # luixxiul, 2013
+# rafe <rafe.kun@gmail.com>, 2015
+# Suguru Hirahara, 2013
 # Suguru Hirahara, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-07-27 01:51+0000\n"
-"Last-Translator: タカハシ <gomidori@live.jp>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +34,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -40,7 +42,7 @@ msgstr[0] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -48,7 +50,7 @@ msgstr[0] "{0} 秒"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -56,62 +58,62 @@ msgstr[0] "{0} 分"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 時間"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0} 日"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "ルーターハッシュで禁止: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "ルーターハッシュで禁止"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "blocklist.txt のエントリ {0} でIP禁止"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "再起動まで禁止された IP"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "永久に禁止された IP"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "送信元"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "送信先"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "なし"
 
@@ -121,89 +123,91 @@ msgstr "なし"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "トンネルを拒否: 起動中"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "トンネルを拒否中: 高いメッセージ遅延"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "大部分のトンネルを拒否中: 高いリクエスト数"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "トンネルを拒否中: 制限に到達"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "トンネルを拒否中: 帯域幅制限"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "ほとんどのトンネルを拒否中: 帯域幅制限"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "ほとんどのトンネルを承認中"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "トンネルを承認中"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "トンネルを拒否中: シャットダウン"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "トンネルを拒否中"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "リシード中"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "リシードは {0} ルーターのみ取得しました。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "リシード失敗。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "ヘルプについては  {0} をご覧ください。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "リシード設定ページ"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "リシード中: シード URL を取得中"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -237,7 +241,7 @@ msgstr "活発に対話しているピアの数"
 msgid "Known fast peers"
 msgstr "既知の高速なピア"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb エントリ"
 
@@ -247,298 +251,314 @@ msgstr "NetDb エントリ"
 msgid "No transports (hidden or starting up?)"
 msgstr "トランスポートなし (隠されているかスタートアップ中?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "すべてのトランスポートに到達不可"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "ルータートランスポートアドレス"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} は送信接続にのみ使用されます。"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP は有効ではありません"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "トランスポート接続制限数は、設定されている帯域幅に基づき自動的に設定されました。"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "これらの制限を上書きするには、高度な設定ページに設定 i2np.ntcp.maxConnections=nnn 及び i2np.udp.maxConnections=nnn を加えてください。"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "定義"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "ピア"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "リモートピア、ルーターハッシュにより識別"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "ディレクトリ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "着信接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "送信接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "They offered to introduce us (こちらのファイアーウォールを他のピアが越えるのに役立ちます)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "We offered to introduce them (彼らのファイアーウォールを他のピアが越えるのに役立ちます)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "パケットが受信/送信されてからの経過時間"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "アイドル"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "入出力"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "平滑化された受信/送信転送速度(キロバイト毎秒)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "この接続が確立以後の経過時間"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "アップ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "スキュー"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "ピアの時計の自分の間の違い"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "輻輳(ふくそう)ウィンドウ、どれだけ多くのバイトが確認なしに送信されうるか"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "確認待ちの送信メッセージ数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "同時送信メッセージの最大数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "輻輳ウィンドウを超える保留中の送信の数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "スロースタートしきい値"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "ミリ秒単位往復時間"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "ミリ秒単位再送タイムアウト"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "現在の最大送信パケットサイズ / 推定最大受信パケットサイズ (バイト)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "ピアに送信されたパケットの合計数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "ピアから受信したパケットの合計数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "ピアに再送されたパケットの合計数"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "ピアから受信した重複パケットの合計数"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "サービス"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN 共通インターフェース設定"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "ステータス"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "タイプ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "アップストリーム"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "ダウンストリーム"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP 接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "稼働時間"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "外部 IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "レイヤ3 フォワーディング"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "デフォルトの接続サービス"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP 接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN イーサネットリンク設定"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "デバイスを検出"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "サブデバイス"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP 状態"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "UPnP を無効化"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP は無効化されました。 LAN 上に2つ以上の UPnP インターネットゲートウェイデバイスがありますか?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UpNP は LAN 上に UPnP を認識し、互換性のあるデバイスを検出しませんでした。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "UPnP が報告した現在の外部 IP アドレスは {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "現在の外部 IP アドレスは利用できません。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP は、最大ダウンストリームビット速度が {0} ビット/秒だと報告しています"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP は最大アップストリームビット速度が {0} ビット/秒だと報告しています"
@@ -547,274 +567,275 @@ msgstr "UPnP は最大アップストリームビット速度が {0} ビット/
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} ポート {1,number,#####} は UPnP によって、正常に転送されました。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} ポート {1,number,#####} は UPnP によって転送されませんでした。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP は有効ではありません"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "過度のクロックスキュー: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP 接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "制限"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "キュー外"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "バッグログされていますか?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "着信"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "送信"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} ピア"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP 接続"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "ピアハッシュでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "説明/指示"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "アイドルの受信でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "アイドルの送信でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "受信速度でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "送信速度でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "接続稼働時間でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "クロックスキューでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "輻輳ウィンドウでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "スロースタートしきい値でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "往復時間でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "再送信タイムアウトでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "送信最大伝送単位でソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "送信パケットでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "受信パケットでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "再送パケットでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "二度以上受信したパケットでソート"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "We offered to introduce them"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "They offered to introduce us"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "絞られました"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 回失敗"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} 回失敗"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "禁止されました"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "バッグログされました"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "トンネル要求ドロップ: 遅すぎます"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "トンネル要求ドロップ: 過負荷"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "トンネルを拒否中: リクエスト過負荷"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "トンネルを拒否中: 接続制限"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "トンネル要求ドロップ: 高いロード"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "トンネル要求ドロップ: キュー時間"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "新しいプラグインのバージョン {0} が利用できます。"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "プラグイン {0} のアップデート確認に失敗"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "プラグイン {0} の新しいバージョンは利用できません。"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B 転送"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "{0} からの転送に失敗しました"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "更新がダウンロードされました"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "再起動中"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "更新が確認されました"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "{0} から"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "{0} からの署名されていない更新ファイルは破損しています"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "{0} へのコピーに失敗"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "ネットワーク内アップデートが無効になりました。パッケージマネージャーを確認してください。"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "I2P のインストールディレクトリに対する書き込み権限がありません。"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "まずバージョン {0} にアップデートしなければなりません"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Java のバージョン {0} が必要ですが、インストールされている Java のバージョンは {1} です"
@@ -825,167 +846,175 @@ msgid "Checking for update of plugin {0}"
 msgstr "プラグイン {0} の更新を確認中"
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "更新中"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr "ファイル {0} からインストールを試みています"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr "指定された {0} ファイルなし"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
 msgstr "ファイル {0} からインストール出来ませんでした。コピー失敗。 "
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "{0} からプラグインをダウンロード中"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Plugin がダウンロードされました"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr "プラグインディレクトリ {0} を作成できませんでした"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "{0} のプラグインが破損しています"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "{0} のプラグインは必要な設定ファイルを含んでいません"
-
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "{0} のプラグインは無効なキーを含んでいます"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr "{0} のプラグイン署名認証に失敗"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "{0} のプラグインが破損しています"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "{0} のプラグインは必要な設定ファイルを含んでいません"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr " {0} からのプラグインは、名前またはバージョンを無効化しました。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr "プラグイン {0} はバージョンが一致しませんでした。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "このプラグインには I2P のバージョン {0} 以降が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "このプラグインは Java のバージョン {0} 以降が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr "ダウンロードされたプラグインは新規インストール専用ですが、プラグインはすでにインストールされています"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr "インストールされたプラグインは必要な設定ファイルを含んでいません"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr "ダウンロードされたプラグインの署名がインストールされたプラグインと一致しません"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr "ダウンロードされたプラグインのバージョン {0} はインストールされているプラグインより新しくありません。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr "プラグインのアップデートにはインストールされているプラグインのバージョン {0} 以降が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr "プラグインのアップデートにはインストールされたプラグインのバージョン {0} 以前が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr "プラグインには Jetty のバージョン {0} 以降が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr "プラグインには Jetty のバージョン {0} 以前が必要です。"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr "ディレクトリ {0} にプラグインをコピーできません"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr "次の再起動時にプラグインはインストールされます"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr "プラグインはアップグレード専用ですが、プラグインはインストールされていません"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr "{0} にプラグインのインストールに失敗"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "プラグイン {0} がインストールされました"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "プラグイン {0} がインストールされ起動されました"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr "プラグイン {0} がインストールされましたが起動に失敗、ログを確認してください"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr "プラグイン {0} はインストールされましたが起動に失敗"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "{0} からのプラグインのダウンロードに失敗"
@@ -1000,127 +1029,129 @@ msgstr "{0} からアップデート中"
 msgid "No new version found at {0}"
 msgstr "{0} に新しいバージョンが見つかりませんでした"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr "{0} に期限切れとなる一時禁止"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr "再起動か {0} まで禁止"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr "今すぐ禁止解除"
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "I2P ルーターコンソール"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr "設定を更新する際にエラー - エラーログを確認してください"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "設定は正常に保存されました"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1128,313 +1159,314 @@ msgid ""
 msgstr "設定を保存する際にエラー (適用されましたが保存されませんでした) - エラーログを確認してください"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr "クライアント設定を保存"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "インターフェース設定を保存"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr "WebApp 設定を保存"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "プラグイン設定を保存"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "プラグインをインストール"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr "全てのインストール済みプラグインをアップデート"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "プラグイン {0} を停止中にエラー"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "プラグイン {0} を削除しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "プラグイン {0} を削除する際にエラー"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "プラグイン {0} を停止しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr "ウェブアプリ  {0} が停止しました"
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "起動"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "新規クライアントが追加されました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr "正常にクライアントの構成を保存しました。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr "不良なクライアントインデックス"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr "クライアント {0} が停止しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr "クライアント {0} 起動しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr "クライアント {0} が削除されました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr "WebApp 設定が保存されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "プラグイン設定が保存されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr "WebApp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "起動しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "起動に失敗"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "サーバーの検索に失敗"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "プラグインURLが指定されていません。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "更新URLは {0} に指定されていません。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr "プラグインまたはアップデートのダウンロードはすでに進行中です。"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr "全てのプラグインをアップデート中"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr "不正な URL {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr "プラグイン {0} のアップデートを確認中"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "プラグイン {0} を起動しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "プラグイン {0} を起動する際にエラー"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr "ユーザー {0} を追加"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr "インターフェースの構成を保存しました"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr "再起動するまで有効になりません"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "編集"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "クライアントを追加"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "クラスと引数"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "クライアント"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "スタートアップ時に起動?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr "操作"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "スタートアップ時に起動?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "クラスと引数"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "説明"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "バージョン"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "署名者"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "日付"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "作者"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "ライセンス"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "ウェブサイト"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "アップデートリンク"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "停止"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "アップデートを確認"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "アップデート"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "{0} を削除してよろしいですか?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr "アイテムを追加"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr "デフォルトに戻す"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "保存"
 
@@ -1465,12 +1497,12 @@ msgid "Removed"
 msgstr "削除されました"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "キーを追加"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Delete キー"
 
@@ -1512,7 +1544,7 @@ msgstr "無効な宛先"
 msgid "Log overrides updated"
 msgstr "ログオーバーライドが更新されました"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "ログ設定が保存されました"
 
@@ -1535,7 +1567,7 @@ msgstr "有効なレベルは DEBUG, INFO, WARN, ERROR, CRIT です"
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1544,24 +1576,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "削除"
 
@@ -1580,53 +1612,54 @@ msgid "Home Page"
 msgstr "ホームページ"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "ネットワーク"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr "略式バー"
 
@@ -1635,8 +1668,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "トンネル"
@@ -1646,7 +1679,7 @@ msgid "Clients"
 msgstr "クライアント"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr "キーホルダー"
 
@@ -1655,15 +1688,15 @@ msgid "Logging"
 msgstr "ロギング"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "ピア"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "統計"
 
@@ -1673,139 +1706,135 @@ msgstr "詳細"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "変更を保存"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr "ルーター到達性を再確認中"
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "IP アドレスを更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr "IPv6 の設定を更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr "完全に TCP を無効化中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr "TCP アドレスを {0} に更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr "着信 TCP を無効化中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr "着信 TCP アドレスをオートに更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr "TCP ポートを {0} に更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "警告 - 1024番未満のポートは推奨されません"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr "無効なポート"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr "着信 TCP ポートをオートに更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr "UDP ポートを {0} に更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr "隠されたルーターモードにグレースフルに再起動"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr "グレースフルに再起動し、隠されたルーターモードを終了"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr "UPnP を有効にしています"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr "UPnP を無効にしています"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr "ラップトップモードを有効化中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr "ラップトップモードを無効化中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr "UDP を無効にしています"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr "UDP を有効にしています"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr "SSU イントロデューサーを要求中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr "無効なアドレス"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr "ホスト名またはIP {0} は公開でルート可能でありません。"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr "共有帯域幅割合を更新中"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr "帯域幅制限を更新しました"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "不明"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "毎秒ビット"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
-msgstr ""
+msgstr "{0} または、最大毎月バイト"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr "再起動までピアを禁止"
 
@@ -1825,7 +1854,7 @@ msgid "Invalid peer"
 msgstr "無効なピア"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr "ピアの禁止を解除"
 
@@ -1838,7 +1867,7 @@ msgid "is not currently banned"
 msgstr "現在禁止されていません"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr "ピアのボーナスを調整"
 
@@ -1855,7 +1884,7 @@ msgid "Unsupported"
 msgstr "非サポート"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr "変更を保存し、今すぐリシード"
 
@@ -1874,9 +1903,9 @@ 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "すぐにシャットダウン"
 
@@ -1930,118 +1959,118 @@ msgstr[0] "ルーティングコミットメントが {0} 個のトンネル に
 msgid "Restart in {0}"
 msgstr "{0} で再起動"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "正常にシャットダウン"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "正常なシャットダウンが開始されました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "正常なシャットダウンをキャンセル"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "正常なシャットダウンがキャンセルされました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "正常な再起動"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "正常な再起動が要求されました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "ハード再起動"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "ハード再起動が要求されました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr "キー交換して再起動"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr "グレースフル・リスタート後にキー交換"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr "キー交換し、シャットダウン"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr "グレースフル・シャットダウン後にキー交換"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "スタートアップ時に I2P を起動"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "スタートアップ時に I2P を起動しない"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr "スレッドをダンプ"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr "スレッドが {0} にダンプされました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "スタートアップ時にコンソールを表示"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "コンソールがスタートアップ時に表示されます"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "スタートアップ時にコンソールを表示しない"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr "コンソールはスタートアップ時に表示されません"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr "GC を強制"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr "完全なガベージコレクションが要求されました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "サービスがインストールされました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr "警告: サービスをインストール出来ません"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "サービスが削除されました"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr "警告 サービスを削除できません"
 
@@ -2082,7 +2111,7 @@ msgid "Refresh interval must be a number"
 msgstr "更新間隔は数字でなければなりません"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr "完全なデフォルトに戻す"
 
@@ -2097,7 +2126,7 @@ msgid "Summary bar will refresh shortly."
 msgstr "略式バーはすぐに更新します。"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr "最小のデフォルトに戻す"
 
@@ -2130,115 +2159,115 @@ 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr "全プールで設定が更新されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr "予備トンネルの設定が正常に保存されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 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/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0} ホップ"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0} トンネル"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr "予備トンネル"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr "{0} に対するクライアントトンネル"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr "匿名性警告 - 設定に0ホップのトンネルが含まれています。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr "匿名性警告 - 設定に1ホップのトンネルが含まれています。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr "パフォーマンス警告 - 設定に非常に長いトンネルが含まれています。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr "パフォーマンス警告 - 設定に高いトンネルの数量が含まれています。"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "長さ"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "ランダム化"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "数量"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr "バックアップ量"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "受信オプション"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "送信オプション"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr "ユーザーを追加"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr "テーマの変更が保存されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr "ページを更新表示"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr "モバイルコンソールオプションが保存されました。"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr "ユーザー名が入力されていません"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr "パスワードが入力されていません"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr "ユーザー {0} を削除しました"
@@ -2251,50 +2280,46 @@ msgstr ""
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "ドイツ語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr "エストニア語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "英語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "フランス語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "ハンガリー語"
@@ -2333,596 +2358,734 @@ msgid "Russian"
 msgstr "ロシア語"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "中国語"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "アップデートが利用でき、現在ダウンロード試行中です"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "アップデートが利用でき、左のボタンをクリックするとダウンロードします"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "利用可能なアップデートなし"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "アップデート URL を更新中。"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "信頼されているキーを更新中。"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "ダウンロードと検証のみ"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "ダウンロードと検証、再起動"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-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/EventLogHelper.java:34
+msgid "Aborted startup"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
-msgstr "複合帯域幅グラフ"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
+msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
-msgstr "帯域幅使用率"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
-msgid "Smaller"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
-msgid "Taller"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
-msgid "Shorter"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
-msgid "Wider"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
-msgid "Narrower"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
-msgid "Larger interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
-msgid "Smaller interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
-msgid "Previous interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
-msgid "Next interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
-msgid "Plot averages"
-msgstr "平均を図示"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "時間"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+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:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr "複合帯域幅グラフ"
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr "帯域幅使用率"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
+msgid "Smaller"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
+msgid "Taller"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
+msgid "Shorter"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
+msgid "Wider"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
+msgid "Narrower"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
+msgid "Larger interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
+msgid "Smaller interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
+msgid "Previous interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
+msgid "Next interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+msgid "Plot averages"
+msgstr "平均を図示"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr "イベントを図示"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr "グラフ表示を設定"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr "統計を選択"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "期間"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "または"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "画像サイズ"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "幅"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "高さ"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "ピクセル"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr "更新遅延"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr "グラフ設定が保存されました"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "アドレスブック"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "ここで I2P の hosts ファイルを管理 (I2P のドメイン名解決)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr "帯域幅を設定"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr "I2P 帯域幅設定"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "匿名ウェブメールクライアント"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P ルーターヘルプ"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "内蔵匿名 BitTorrent クライアント"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrent"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 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:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
-msgstr ""
+msgstr "プラグイン"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr "I2P ネットワーク統計"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, 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:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 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:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr "合計ジョブ統計"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
-msgstr ""
+msgstr "キュー"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr "平均"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr "時間"
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr "最大"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr "最小"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr "保留中"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "ファイル位置"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "ファイル未検出"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "ログメッセージなし"
 
@@ -2952,170 +3115,179 @@ msgstr ""
 msgid "LeaseSets"
 msgstr "リースセット"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr "ルーター"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "ネットワークデータベース内に見つかりませんでした"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr "リースセット"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "ローカル"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "未公開"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "宛先"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "{0} に期限切れ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "{0} 前に期限切れ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "リース"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "トンネル"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "未初期化"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "ネットワークデータベースルーター統計"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "カウント"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "トランスポート"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "国"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "情報"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "次のピアの情報: "
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "非表示"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "更新"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} 前"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "公開済み"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "アドレス"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "コスト"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "隠すか起動中"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "イントロデューサー付き SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP 及び SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP 及びイントロデューサー付き SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3134,225 +3306,225 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr ""
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
 msgstr[0] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
 msgstr[0] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
 msgstr[0] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr "グループ (大文字)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "速度"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "許容数"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "統合"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr "高速、高許容数"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr "高許容数"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "標準"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr "失敗"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "統合済み"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr "到達不可"
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr "テスト失敗数"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "プロファイル"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr "大文字"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr "整数値"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr "次について最後に耳にした:"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr "次から最後に耳にした:"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr "最終良好送信"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr "最終不良送信"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr "10分応答時間"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr "1時間応答時間"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr "1日応答時間"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr "最終良好検索"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr "最終不良検索"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr "最終良好保存"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr "最終不良保存"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr "1時間失敗率"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr "1日失敗率"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr "しきい値"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr "高速なピア"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr "許容数の大きいピア"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr "上手く統合されているピア"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr "プロファイル管理ソフトで判断するように"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr "グループ"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr "netDb の許容数、プロファイルの判断には使用されません"
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr "大文字"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid ""
 "peak throughput (bytes per second) over a 1 minute period that the peer has "
 "sustained in a single tunnel"
 msgstr "ピアが1つのトンネルで維持した1分間での最大スループット (バイト毎秒)"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "速度"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr "許容数"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr "一時間でどれだけ多くのトンネルの参加を求められるか?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr "最近どれだけ多くの新規ピアを伝えたか?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr "統合"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr "ピアが禁止されていたり、到達不可であったり、トンネルテストに失敗しているか?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr "ステータス"
 
@@ -3424,7 +3596,7 @@ msgid "Lifetime average frequency"
 msgstr "生涯平均頻度"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3473,282 +3645,282 @@ msgstr "グラフデータ"
 msgid "Graph Event Count"
 msgstr "グラフイベントカウント"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "XML としてデータをエクスポート"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "生涯平均値"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P ルーターヘルプ &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "ヘルプと FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "クライアントとウェブアプリ (サービス) のスタートアップを構成。手動で休止サービスを開始"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P サービス"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P ルーターを構成"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P 内部"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "既存のトンネルとトンネル作成ステータスを表示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "現在のピア接続をすべて表示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "最近のピアパフォーマンスプロファイルを表示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "既存の全 I2P ルーターの一覧を表示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "健全度報告"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "ログ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "ルーターパフォーマンスをグラフ化"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "グラフ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "テキストのルーターパフォーマンス統計"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
-msgstr "ローカルの宛先"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "一般"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "ローカル識別子は一意な I2P ルーターの識別子であり、 IP アドレスに近いですが、 I2P に合わせています。"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "ローカル識別子"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "あなたの一意な I2P ルーター識別子は"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "誰にも決して明かさない"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "表示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "起動中の I2P ソフトウェアのバージョン"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "このセッションでどれだけの間起動しているか"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "稼働時間"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "最適な I2P パフォーマンスを得るためにファイアーウォールとルーターを構成するのに役立ちます"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "アクティブ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "高速"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "予備トンネルの形成に利用できるピアの数"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "高許容数"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "ネットワークデータベースに利用できるピアの数の照会"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "ネットワークデータベース内の合計ピア数"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "既知"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "ルーターの帯域幅割り当てを設定"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "帯域幅 入力/出力"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "合計"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "使用済み"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "トンネルの作成・テストと、floodfillピアとコミュニケーションを取るのに使用された"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "予備"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "参加中"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "共有比率"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "ルーターのジョブキューに何があるか?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "混雑状態"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "ジョブラグ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "メッセージ遅延"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "トンネルラグ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "バックラグ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3762,98 +3934,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr "ERR-{0} のクロックスキュー"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "テスト中"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr "ERR-プライベートな TCP アドレス"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr "ERR-SymmetricNAT"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr "警告-受信 TCP が有効となり、ファイアーウォールされています"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr "警告-ファイアー・ウォールされ、 Floodfill"
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr "警告-ファイアーウォールされ、高速"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr "切断されました - ネットワークケーブルを確認してください"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
 msgstr "エラー-UDP ポートが使用中 - 高度な設定で i2np.udp.internalPort=xxxx を設定し、再起動してください"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr "ERR-アクティブのピアなし、ネットワークの接続およびファイアーウォールを確認してください。"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr "エラー-UDP が無効化され、受信 TCP のホスト/ポートが設定されていません"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "警告-UDP が無効化され、ファイアウォールされています"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "クライアント及びサーバートンネルを追加・削除・編集・操作"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "サーバー"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "トンネルを表示"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "リースが期限切れ"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "再構成中"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "前"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "準備完了"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "構成中"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "トンネルを構成中"
 
@@ -3861,31 +4038,31 @@ 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "共有されたクライアント"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "インストールするには再起動をクリック"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "インストールするにはシャットダウンをクリックして再起動"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "バージョン {0} "
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -3894,40 +4071,40 @@ msgstr ""
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "ファイアーウォールの構成に役立ちます"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "リシード"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -3960,120 +4137,120 @@ msgstr "最大"
 msgid "now"
 msgstr "現在"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr "設定"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr "死亡"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "参加しているトンネル"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr "受信時間: "
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr "期限切れ"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr "送信時間"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr "割合"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr "役割"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr "使用量"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr "猶予期間"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr "送信エンドポイント"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr "受信ゲートウェイ"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr "参加"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr "使用度が高い {0} トンネルに表示を制限"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr "アクティブでない参加しているトンネル"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr "生涯帯域幅使用量"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr "終了"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr "参加"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr "エンドポイント"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr "構成進行中"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr "受信"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr "送信"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr "トンネルなし。猶予期間が終了するまで待機中"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr "入力"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr "出力"
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr "アドレスブック"
 
@@ -4200,6 +4377,10 @@ msgstr "暗号化"
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4298,343 +4479,351 @@ msgstr ""
 msgid "itag2"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr "帯域幅を設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr ""
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr ""
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr "帯域幅リミッター"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, 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:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 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:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 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:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr "その他のクライアントオプションを変更するために、ファイルを編集"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4644,7 +4833,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr "いかにリストされている Java のウェブアプリケーション はウェブコンソールにより起動され、ルーターと同じ JVM で起動されています。これらは、通常ルーターコンソールを通じてアクセス可能なウェブアプリケーションです。これらは、完全なアプリケーション (例: i2psnark)や、別に有効化しなければならない別のクライアントまたはアプリケーションへのフロントエンド (例: susidns, i2ptunnel)、まったくウェブインターフェースのないもの(例:アドレスブック)である場合があります。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4652,711 +4841,719 @@ msgid ""
 "preferred method."
 msgstr "webapps ディレクトリから .war ファイルを削除すると、ウェブアプリも無効化される場合があります。しかし、 .war ファイルとウェブアプリはルーターを新しいバージョンに更新したときにまた現れるので、ここでウェブアプリを無効にすることは、推奨の方法です。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr "ネットワークを設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr "I2P ネットワーク設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr "IP とトランスポート設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr "ホスト名またはIPを明示"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr "他のプログラムが設定したポートを使用しているか確認してください。そうであれば、そのプログラムを停止するか、 I2P が違うポートを使用するように設定してください。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr "別の I2P のインスタンスを実行していませんか?競合しているプログラムを停止し、 I2P を再起動してください。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr "ピアを設定"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5364,749 +5561,753 @@ msgid ""
 "displayed on the"
 msgstr "ボーナスがポジティブかネガティブであると、ピアの高速及び高許容度層への算入に影響をおよぼす場合があります。高速なピアはクライアントトンネルに使われ、高許容度のピアはいくつかの予備トンネルに使われます。現在のボーナスは次の通り:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr "禁止されているピア"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "よくある質問"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr "HTTP プロキシを有効にしますか?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr "システムトレイのアイコンを表示"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr "システムトレイのアイコンを隠す"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr ""
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr "高いCPU かつ/または 高い送信帯域幅使用率に繋がる恐れがあります。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr "予備トンネル設定の変更はルーターの .config ファイルに保存されています。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr "ルーターコンソールの翻訳プロジェクトにご協力ください!協力するには、 IRC の #i2p-dev で開発者にご連絡ください。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr "ニュースの更新をチェック"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr "ニュースの更新"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr "更新はパッケージマネージャ経由で配布されます。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr "I2P アドレスブック"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr ""
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr "I2P のバージョンと起動環境"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr "I2P ルーターログ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr "ネットワークデータベース"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr "I2P ネットワークデータベース"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
 msgstr "I2P ネットワーク ピア"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr "I2P ルーター統計"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_nb.po b/apps/routerconsole/locale/messages_nb.po
index 54466b27f832d577ddb3331f7a1310b16b8bf7f6..06dfa2e5a71c5fcb63736a490530e3b57c373347 100644
--- a/apps/routerconsole/locale/messages_nb.po
+++ b/apps/routerconsole/locale/messages_nb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-12 19:27+0000\n"
-"Last-Translator: Shpetim <shpetim@privacysolutions.no>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -50,7 +50,7 @@ msgstr[1] "{0} sek"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -59,64 +59,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 time"
 msgstr[1] "{0} timer"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 dag"
 msgstr[1] "{0} dager"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Utestengt av ruter hash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Utestengt av router hash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP utestengt av blocklist.txt oppføring {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr ""
 
@@ -126,90 +126,92 @@ msgstr ""
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Nekter adgang til tunnelene. Starter opp"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Avviser tunneler: Høy melding forsinkelse"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Avviser de fleste tunneler: Høyt nummer av forespørsler"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Avviser tunneler: Grensen nådd"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Avviser tunneler: båndbreddegrensen"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Avviser fleste tunneler: båndbreddegrensen"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Godtar fleste tunneler"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Godtar tunneler"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Avviser tunneler: Avslutter"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Avviser tunneler"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeding"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Reseed mottok bare 1 ruter."
 msgstr[1] "Reseed mottok bare {0} rutere."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed feilet."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Se {0} for hjelp."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "reseed instillings side"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseeding: mottar seed URL."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -243,7 +245,7 @@ msgstr ""
 msgid "Known fast peers"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb innføring"
 
@@ -253,298 +255,314 @@ msgstr "NetDb innføring"
 msgid "No transports (hidden or starting up?)"
 msgstr "Ingen transport (gjemt eller starter opp?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Utilgjengelig på alle transporter"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Ruter Transport Adresser"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} er brukt for bare utgående tilkoblinger"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Dine begrensinger på transportforbindelse er automatisk satt basert på din konfigurerte båndbredde."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "For å overstyre de begrensningene, legg til instillingene  i2np.ntcp.maxConnections=nnn og i2np.udp.maxConnections=nnn på den avanserte konfigurasjon siden."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definisjoner"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Den eksterne peer, identifisert av ruter hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Mappe"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Inngående tilkobling"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Utgående tilkobling"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "De tilbød seg å introdusere oss (hjelpe andre peers å krysse vår brannmur)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "We tilbød å introdusere de (hjelpe andre peers å krysse deres brannmur)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Hvor lenge siden en pakke har blitt mottat / sendt"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Tomgang"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Inn/Ut"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Det jevne inngående / utgående overføringshastighet (KBytes per sekund)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Hvor lenge siden denne tilkoblingen var etablert"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Opp"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "klokkeforskyvning"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Forskjellen mellom peer's klokke og din egen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Antallet sendt meldinger som venter anerkjennelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Det maksimale antallet samtidige meldinger til å sende"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Rundtur i millisekunder"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Totalt antall pakker sendt til peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Det totale antall pakker mottatt fra peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Det totale antallet pakker videresendes til peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Det totale antall dupliserte pakker mottatt fra peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Tjeneste"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Type"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Deaktiverte UPnP-enheter"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -553,275 +571,276 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Overdreven klokkeforskyvning: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP tilkoblinger"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Begrensing"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Ut kø"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Backlogged?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Inngående"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Utgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP tilkoblinger"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sorter ut ifra peer hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Rettning/Innledning"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sorter etter tomgang ingående"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sorter etter tomgang utgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sorter etter inngående hastighet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sorter etter utgående hastighet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sorter etter tilkobling oppetid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sorter etter klokkeforskyvning"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sorter etter pakker sendt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sorter etter pakker mottatt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sorter etter videresendte pakker "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sorter etter pakker som er mottatt mer enn én gang"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Vi tilbød å introdusere dem"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "De tilbød seg å introdusere oss"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Kvalt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 feil"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} feiler"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Bannet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Dropper tunnel forespørsler: For treig"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Dropper tunnel forespørsler: Overlastet"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Avviser tunneler: Forespørsler overbelastning"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Avviser tunneler: tilkobling grensen er nådd"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Dropper tunnel forespørsler: Høy last"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Dropper tunneler forespørsler: Kø tid"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B overført"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Overføring fra {0} feilet"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Oppdatering nedlastet"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Starter om igjen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Oppdatering kontrollert"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "fra {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Usignert oppdateringsfil fra {0} er korrupt"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Klarte ikke å kopiere til {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Krever Java-versjon {0}, installert versjon av java er {1}"
@@ -832,167 +851,175 @@ msgid "Checking for update of plugin {0}"
 msgstr ""
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Oppdaterer"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../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:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "Laster ned plugin fra {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Programtillegg lastet ned"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr "Kan ikke opprette programtillegg-mappe {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "Programtillegg fra {0} er korrupt"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "Programtillegg fra {0} inneholder ikke den påkrevde konfigurasjonsfilen"
-
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "Programtillegg fra {0} inneholder en ugyldig nøkkel"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "Programtillegg fra {0} er korrupt"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "Programtillegg fra {0} inneholder ikke den påkrevde konfigurasjonsfilen"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Dette programtillegget krever at I2P er versjon {0} eller høyere"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "Dette programtillegget krever at Java er versjon {0} eller høyere"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr "Nedlastet programtillegg er bare for nye installasjoner, men programtillegget er allerede installert"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr "Installert programtillegg mangler den påkrevde konfigurasjonsfilen"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr "Signaturen til nedlastet programtillegg samsvarer ikke med installert versjon"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr "Nedlastet programtillegg versjon {0} er ikke nyere enn installert versjon"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "Programtillegg {0} installert"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "Programtillegg {0} installert og startet opp"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr "Programtillegg {0} ble installert, men klarte ikke å starte opp, sjekk logg"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr "Programtillegg {0} installert men klarte ikke å starte opp"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "Klarte ikke å laste ned programtillegg fra {0}"
@@ -1007,127 +1034,129 @@ msgstr "Oppdaterer fra {0}"
 msgid "No new version found at {0}"
 msgstr "Ingen ny versjon funnet på {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "I2P Ruter Konsoll"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "Innstillingene er lagret"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1135,313 +1164,314 @@ msgid ""
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr "Lagre klient konfigurasjon"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "Lagre grensesnitt instillinger"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr "Lagre WebApp konfigurasjon"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "Lagre Plugin instillinger"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Installer Plugin"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Feil ved stopping av plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Slettet plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Feil ved sletting av plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Stoppet plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr ""
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Start"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "Ny klient lagt til"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr "Dårlig klient indeks."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr "WebApp konfigurasjon lagret."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "Plugin konfigurasjon lagret."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr "WebApp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "startet"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Feilet med å starte"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Feilet med å finne server"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "Ingen plugin URL er satt."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "Ingen oppdaterings URL spesifisert for {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr "Sjekker plugin {0} for oppdateringer"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "Startet plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "Feil ved starting av plugin {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Legg til klient"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "Klasse og argumenter"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Kjør ved oppstart?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr "Kontroll"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Kjør ved oppstart?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "Klasse og argumenter"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versjon"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Signert av"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Dato"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Forfatter"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Lisens"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Webside"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Oppdaterings link"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Se etter oppdateringer"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Er du sikker på at du vil slette {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Slett"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Lagre"
 
@@ -1472,12 +1502,12 @@ msgid "Removed"
 msgstr "Fjernet"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Legg til nøkkel"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Slett nøkkel"
 
@@ -1519,7 +1549,7 @@ msgstr "Ugyldig destinasjon"
 msgid "Log overrides updated"
 msgstr "Logg overstyring oppdatert"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Logg konfigurasjon lagret"
 
@@ -1542,7 +1572,7 @@ msgstr ""
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "KRITISK"
 
@@ -1551,24 +1581,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "FEIL"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "ADVARSEL"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1587,53 +1617,54 @@ msgid "Home Page"
 msgstr "Startside"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Nettverk"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr ""
 
@@ -1642,8 +1673,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunneller"
@@ -1653,7 +1684,7 @@ msgid "Clients"
 msgstr "Klienter"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr "Nøkkelring"
 
@@ -1662,15 +1693,15 @@ msgid "Logging"
 msgstr "Logging"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peers"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statestikk"
 
@@ -1680,139 +1711,135 @@ msgstr "Avansert"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Oppdaterer IP adressen"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr "Srku av TCP helt"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr "Skru av inngående TCP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr "Oppdaterer inngående TCP adresse til automatisk"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr "Oppdaterer inngående TCP port til automatisk"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr "Aktiverer UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr "Skrur av UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr "Sett laptop modus"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr "Skru av laptop modus"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr "Krever SSU introduserere"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr "Oppdaterer båndbredde delings prosent"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr "Oppdatert båndbreddegrense"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits per sekund"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "eller {0} bytes per måned maksimum"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr "Blokker peer frem til restart"
 
@@ -1832,7 +1859,7 @@ msgid "Invalid peer"
 msgstr "Invalid peer"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr "Ublokker peer"
 
@@ -1845,7 +1872,7 @@ msgid "is not currently banned"
 msgstr "er ikke for øyeblikket blokkert"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr ""
 
@@ -1862,7 +1889,7 @@ msgid "Unsupported"
 msgstr "Uegnet"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr "Lagre endringene og reseed nå"
 
@@ -1881,9 +1908,9 @@ msgstr "Konfigurasjonen ble lagret"
 
 #. 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "Skru av umiddelbart"
 
@@ -1938,118 +1965,118 @@ msgstr[1] ""
 msgid "Restart in {0}"
 msgstr "Restart om {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "Avslutt grasiøst"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "En grasiøst avsluttning er startet"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "Avbryt grasiøst avsluttning"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "Grasiøst avsluttning avbrytt"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "Grasiøst omstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "Grasiøst omstart bedt"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "Hard omstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "Hard omstart bedt"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Start I2P ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "Ikke kjøre I2P ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "Vis konsoll ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "Konsoll skal vises ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "Vis ikke konsoll ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr "Konsoll skal ikke vises ved oppstart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Tjeneste installert"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr "Advarsel: kunne ikke installere tjeneste"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Tjeneste fjernet"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr "Advarsel: kunne ikke fjerne tjenesten"
 
@@ -2090,7 +2117,7 @@ msgid "Refresh interval must be a number"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr ""
 
@@ -2105,7 +2132,7 @@ msgid "Summary bar will refresh shortly."
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr ""
 
@@ -2138,117 +2165,117 @@ 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 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/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/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:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr "Klient-tunneler for {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "Lengde"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "Mengde"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr "Sikkerhetskopi-mengde"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr "Inget brukernavn angitt"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr "Inget passord innskrevet"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr "Fjernet bruker {0}"
@@ -2261,50 +2288,46 @@ msgstr ""
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Tysk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Engelsk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Fransk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr ""
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "Ungarsk"
@@ -2343,596 +2366,734 @@ msgid "Russian"
 msgstr "Russisk"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr "Legg til et brukernavn og passord for å aktivere."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr "Brukernavn"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Legg til"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Passord"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Oppdatering tilgjengelig, prøver å laste ned nå"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Oppdatering tilgjengelig, klikk knappen til venstre for å laste ned"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Ingen oppdatering tilgjengelig"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Aldri"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Hver"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Bare meld fra"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Bare last ned og verifiser"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Last ned, kontrollere og ta omstart"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
 msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
-msgstr "Større"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
-msgid "Smaller"
-msgstr "Mindre"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
-msgid "Taller"
-msgstr "Høyere"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
-msgid "Shorter"
-msgstr "Kortere"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
-msgid "Wider"
-msgstr "Bredere"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
-msgid "Narrower"
-msgstr "Smalere"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "Tid"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+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:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr ""
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr "Større"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
+msgid "Smaller"
+msgstr "Mindre"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
+msgid "Taller"
+msgstr "Høyere"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
+msgid "Shorter"
+msgstr "Kortere"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
+msgid "Wider"
+msgstr "Bredere"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
+msgid "Narrower"
+msgstr "Smalere"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
 msgid "Larger interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
 msgid "Smaller interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr "Velg statistikk"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "Perioder"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "eller"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "Billedstørrelser"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "bredde"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "høyde"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "billedpunkter"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr "Oppfriskningsforsinkelse"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr "Språkvalg"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr "Valg av språk for konsoll"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-post"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Lokal vev-tjener"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr "OSS"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr "Ofte-Stilte-Spørsmål"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 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:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr "Mikroblogg"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr "Teknisk dokumentasjon"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-msgstr "Enkel og rask mikrobloggingsnettside"
-
+#. "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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, 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:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Navn"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 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:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr "Snitt"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr "Tid"
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr "Maks"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr "Min"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr "Utestående"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr ""
 
@@ -2962,170 +3123,179 @@ msgstr ""
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Lokal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "Upublisert"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destinasjon"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Utløper om {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Utløp for {0} siden"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Antall"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Land"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Vår informasjon"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} siden"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publisert"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adresse(r)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "kostnad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Skjult eller starter opp"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3144,229 +3314,229 @@ msgid "Hide news"
 msgstr "Gjem nyheter"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Vis nyheter"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr ""
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, 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:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, 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:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, 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:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "Kapasitet"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "Integrasjon"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr "Rask, høy kapasitet"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr "Høy kapasitet"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "Standard"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr "Mislyktes"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrert"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr ""
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "profil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr "10m svartid"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr "1t svartid"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr "1d svartid"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 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:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr "status"
 
@@ -3438,7 +3608,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3489,282 +3659,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Eksporter data som XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P-oppdatering"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3778,98 +3948,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr ""
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 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:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -3877,31 +4052,31 @@ 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Trykk omstart for å installere"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Klikk Slå av og omstart for å installere"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versjon {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Oppdateringer tilgjengelig"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -3910,40 +4085,40 @@ msgstr ""
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -3976,120 +4151,120 @@ msgstr "maks"
 msgid "now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr "Klient-tunneler for"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr ""
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr "adressebok"
 
@@ -4216,6 +4391,10 @@ msgstr "Kryptering"
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr ""
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4314,343 +4493,351 @@ msgstr ""
 msgid "itag2"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr ""
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr ""
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, 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:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 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:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 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:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr "Aktivert uten SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr "Aktivert med SSL påkrevd"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr "Alle endringer som gjøres her må også settes opp i den eksterne klienten."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr "Mange klienter støtter ikke SSL eller identitetsbekreftelse."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4660,7 +4847,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4668,711 +4855,719 @@ msgid ""
 "preferred method."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr "Søkemotorer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr "Skru av IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr "Slå på IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr "Foretrekk IPv4 over IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr "Foretrekk IPv6 over IPv4"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5380,749 +5575,753 @@ msgid ""
 "displayed on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "Ofte-Stilte-Spørsmål"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr "Kjør ved oppstart"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr "Feilrettingsinformasjon"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr "Vis jobb-kø"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr ""
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr "Se etter nyhetsoppdateringer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr "Nyhetsoppdateringer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr "Velkommen til I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr "Beklager! Det har skjedd en intern feil."
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr "Rapporter feil til {0} eller {1}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr "Du kan skrive inn brukernavn \"guest\" og passord \"gust\" hvis du ikke vil registrere deg."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr "Inkluder denne informasjonen i feilrapporter"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr "Feildetaljer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Feil {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr "Finner ikke siden"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr "Bevis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_nl.po b/apps/routerconsole/locale/messages_nl.po
index 570f881575f2c9a0c03a0d86c2d13979ef70c4c6..d0c41f8aefe347e39568ef039153295235e6e9a9 100644
--- a/apps/routerconsole/locale/messages_nl.po
+++ b/apps/routerconsole/locale/messages_nl.po
@@ -10,14 +10,15 @@
 # Jrnr601 <jerobben@gmail.com>, 2012
 # Desirius <martinjefmeyers@gmail.com>, 2014
 # attesor <random901@zoho.com>, 2012
+# skoning <skoning@onenetbeyond.org>, 2014
 # susbarbatus <susbarbatus@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-26 17:24+0000\n"
-"Last-Translator: susbarbatus <susbarbatus@i2pmail.org>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -45,7 +46,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -54,7 +55,7 @@ msgstr[1] "{0} s"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -63,64 +64,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 uur"
 msgstr[1] "{0} uren"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "nvt"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 dag"
 msgstr[1] "{0} dagen"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Verbannen wegens router hash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Verbannen wegens router hash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP verbannen wegens blocklist.txt item {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IPs verbannen tot herstart"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Permanent verbannen IPs"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Van"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Naar"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "geen"
 
@@ -130,92 +131,92 @@ msgstr "geen"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Tunnels worden afgewezen: Bezig met opstarten"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Tunnels geweigerd: Hoge bericht vertraging"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Meeste tunnels geweigerd: Hoog aantal aanvragen"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Tunnels geweigerd: Limiet bereikt"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Tunnels geweigerd: Bandbreedte limiet"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Meeste tunnels geweigerd: Bandbreedte limiet"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Meeste tunnels geaccepteerd"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Tunnels geaccepteerd"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Tunnels geweigerd: Aan het afsluiten"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Tunnels geweigerd"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeden"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Reseed heeft slechts 1 router opgehaald."
 msgstr[1] "Reseed heeft slechts {0} routers opgehaald."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed gefaald"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Zie {0} voor hulp."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "reseed configuratie pagina"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseed: opvragen seed URL."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -249,7 +250,7 @@ msgstr "Met hoeveel peers communiceren we actief"
 msgid "Known fast peers"
 msgstr "Bekende snelle peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDd item"
 
@@ -259,45 +260,54 @@ msgstr "NetDd item"
 msgid "No transports (hidden or starting up?)"
 msgstr "Geen transport (verborgen of aan het opstarten?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Handtekening type niet ondersteund"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Onbereikbaar op alle transports"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Router Transport Adressen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} is alleen gebruikt voor uitgaande connecties"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP is niet ingeschakeld."
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Help"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "De limieten van je transport verbinding zijn automatisch ingesteld gebaseerd op de geconfigureerde bandbreedte."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Om deze limieten te overschrijven, voeg dan de instelling i2np.ntcp.maxConnections=nnn en i2np.udp.maxConnections=nnn toe aan de geavanceerde configuratie pagina."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definities"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -306,251 +316,258 @@ msgstr "Definities"
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "De remote peer, geïdentificeerd door de router hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Richting"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Inkomende connectie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Uitgaande connectie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Ze hebben aangeboden ons te introduceren (helpt andere peers om door onze firewall te komen)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "We hebben aangeboden ze te introduceren (helpt andere peers om door hun firewall te komen)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Hoe lang sinds een pakket ontvangen / verstuurd is"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Idle"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "In/Uit"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "De afgevlakte inkomende / uitgaande overdrachtsnelheid (KBytes per seconde)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Hoe lang sinds deze connectie is gemaakt"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Up"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Afwijking"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Het verschil tussen de klok van de peer en je eigen"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Het congestion window, hoeveel bytes verzonden kunnen worden zonder een bevestiging"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Het aantal verzonden berichten, wachtend op bevestiging"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Het maximum aantal berichten om gelijktijdig te verzenden"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Het aantal wachtende uitgaande berichten dat het congestion window overschrijdt"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "De vertraagde-start drempel"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "De rondgangstijd in milliseconden"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "De herzend time-out in milliseconden"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Huidige maximum verzonden pakket grootte / verwachte maximimum ontvangen pakket grootte (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Het totaal aantal pakketten verzonden aan de peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Het totaal aantal ontvangen pakketten van de peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Het totaal aantal pakketten dat opnieuw is verzonden aan de peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Het totaal aantal pakketten dat dubbel is ontvangen van de peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN Common Interface Configuratie"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Type"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Upstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Downstream"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP Verbinding"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Uptime"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Extern IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Layer 3 Forwarding"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Standaard Verbindingsdienst"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP Verbinding"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet Link Configuratie"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Apparaat gevonden"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Subapparaat"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "UPnP apparaten uitgeschakeld"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP is uitgeschakeld; Heb je meer dan 1 UPnP Internet Gateway Apparaat op je LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP heeft geen UPnP-geschikte, compatibele apparaten op uw LAN gevonden."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Volgens UPnP is het huidige externe IP-adres {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Het huidige externe IP-adres is niet beschikbaar."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "Volgens UPnP is de maximale downstream bit rate {0}bits/sec"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "Volgens UPnP is de maximale upstream bit rate {0}bits/sec"
@@ -559,280 +576,276 @@ msgstr "Volgens UPnP is de maximale upstream bit rate {0}bits/sec"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} poort {1,number,,#####} is succesvol geforward door UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} poort {1,number,,#####} is niet geforward door UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP is niet ingeschakeld."
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Te grote klok afwijking: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP connecties"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limiet"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Time-out"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Uitgaande wachtrij"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "In achterstand?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Inkomend"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Uitgaand"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} peer"
+msgstr[1] "{0} peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP connecties"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Gesorteerd op peer hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Richting/Introductie"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Gesorteerd op idle inkomend"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Gesorteerd op idle uitgaand"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Gesorteerd op inkomende snelheid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Gesorteerd op uitgaande snelheid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Gesorteerd op uptime van de connectie"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Gesorteerd op klok afwijking"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Gesorteerd op congestion window"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Gesorteerd op vertraagde-start drempel"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Gesorteerd op rondgangstijd"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Gesorteerd op herzendings time-out"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Gesorteerd op uitgaande maximum verzend unit"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Gesorteerd op verzonden pakketten"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Gesorteerd op ontvangen pakketten"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Gesorteerd op herzonden pakketten"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Gesorteerd op meerdere keren ontvangen pakketten"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "We hebben aangeboden ze te introduceren"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Zij hebben aangeboden ons te introduceren"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Verstikt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 gefaald"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} gefaald"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Verbannen"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "achterstand"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Negeer tunnel aanvragen: Te traag"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Negeer tunnel aanvragen: Overladen"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
-msgstr ""
+msgstr "Tunnels worden afgewezen: Verborgen modus"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Weiger tunnels: Overladen met aanvragen"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Weiger tunnels: Connectie limiet"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Negeer tunnel aanvragen: Hoge load"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Negeer tunnel aanvragen: Wachttijd"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Nieuwe plugin versie {0} is beschikbaar"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Update check voor plugin {0} gefaald"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Geen nieuwe versie beschikbaar voor plugin {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B ontvangen"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Overdracht gefaald van {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Update gedownload"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Herstarten"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Update geverifieerd"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "van {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Niet-ondertekende update bestand van {0} is corrupt"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Kopie naar {0} gefaald"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "In-netwerk updates uitgeschakeld. Controleer de pakket manager."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Geen schrijf toestemming voor de I2P installatie map."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Je moet eerst updaten naar versie {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Je hebt Java versie {0} nodig, maar hebt Java versie {1} geïnstalleerd"
@@ -1340,8 +1353,8 @@ msgid "Add Client"
 msgstr "Client Toevoegen"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Client"
 
@@ -1372,9 +1385,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versie"
 
@@ -1396,7 +1409,7 @@ msgstr "Licentie"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Website"
 
@@ -1409,7 +1422,7 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Controlleer op updates"
@@ -1431,7 +1444,7 @@ msgstr "Verwijder"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1441,7 +1454,7 @@ msgstr "Verwijderd selectie"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1460,6 +1473,7 @@ msgstr "Herstel standaard instellingen"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1540,7 +1554,7 @@ msgstr "Ongeldige bestemming"
 msgid "Log overrides updated"
 msgstr "Log overschrijving bijgewerkt"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Log configuratie opgeslagen"
 
@@ -1589,7 +1603,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1608,7 +1622,7 @@ msgid "Home Page"
 msgstr "Home Page"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Netwerk"
 
@@ -1664,8 +1678,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnels"
@@ -1684,15 +1698,15 @@ msgid "Logging"
 msgstr "Logging"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peers"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistieken"
 
@@ -1705,7 +1719,7 @@ msgstr "Geavanceerd"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1815,16 +1829,16 @@ msgstr "Updaten van bandbreedte share percentage"
 msgid "Updated bandwidth limits"
 msgstr "Updaten van bandbreedte limieten"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "ombekend"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits per seconde"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "of {0} bytes per maand maximaal"
@@ -1948,8 +1962,8 @@ msgstr "Afsluiten in {0}"
 #, 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] ""
+msgstr[0] "Wacht op het verlopen van de toezegging voor {0} tunnel"
+msgstr[1] "Wacht op het verlopen van de toezeggingen voor {0} tunnel"
 
 #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82
 #, java-format
@@ -2135,7 +2149,7 @@ msgstr "Minimale opsomming balk vernieuwd."
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:83
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:131
 msgid "Order must be an integer"
-msgstr ""
+msgstr "Volgorde moet een heel getal zijn"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:68
 msgid "No section selected"
@@ -2143,7 +2157,7 @@ msgstr "Geen selectie geselecteerd"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:73
 msgid "No order entered"
-msgstr ""
+msgstr "Geen volgorde opgegeven"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129
 msgid "Moved"
@@ -2151,7 +2165,7 @@ msgstr "Verplaatst"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136
 msgid "Saved order of sections."
-msgstr ""
+msgstr "Volgorde van onderdelen opgeslagen."
 
 #. the count isn't really correct anyway, since we don't check for actual
 #. changes
@@ -2256,7 +2270,7 @@ msgstr "Ververs de te bekijken pagina."
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
-msgstr ""
+msgstr "Mobiele console optie opgeslagen."
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
@@ -2277,7 +2291,7 @@ msgstr "Thema instellen in alle applicaties"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:37
 msgid "Force the mobile console to be used"
-msgstr ""
+msgstr "Gebruik van de mobiele console afdwingen"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
@@ -2390,7 +2404,7 @@ msgstr "Gebruikersnaam"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Voeg toe"
 
@@ -2399,86 +2413,86 @@ msgstr "Voeg toe"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Bijwerken of controle reeds gestart"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Update beschikbaar, probeer nu te downloaden"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Update beschikbaar, klik op de linker knop om te downloaden"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Geen update beschikbaar"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Nieuws URL vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Proxy host vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Proxy poort vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Ververs snelheid vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nooit"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Update beleid vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Updaten update URLs."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Updaten vertrouwde sleutels."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Niet-ondertekende update URL vernieuwen naar {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Elke"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Alleen melden"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Download en alleen controlleren"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Download, controlleer en herstart"
 
@@ -2636,7 +2650,7 @@ msgid "{0} for {1}"
 msgstr "{0} voor {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Bandbreedte gebruik"
 
@@ -2750,12 +2764,12 @@ msgid "Graph settings saved"
 msgstr "Grafiek instellingen opgeslagen"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Adresboek"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Beheer je I2P hosts bestand hier (I2P domeinnaam bepaling)"
 
@@ -2786,17 +2800,17 @@ msgid "I2P Home Page Configuration"
 msgstr "I2P Home Page Configuratie"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonieme webmail client"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Router Hulp"
 
@@ -2806,17 +2820,17 @@ msgid "Router Console"
 msgstr "Router Console"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Ingebouwde anonieme BitTorrent Client"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Lokale webserver"
 
@@ -2902,10 +2916,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Technische documentatie"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "Simpele en snelle microblogging website"
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2988,7 +3000,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Je browser is niet juist geconfigureerd om de HTTP proxy op {0} te gebruiken"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Naam"
 
@@ -3138,150 +3150,159 @@ msgid "Unpublished"
 msgstr "Niet-gepubliceerd"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Bestemming"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Toevoegen aan lokaal adresboek"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Verloopt in {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Verliep {0} geleden"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Niet geïnitialiseerd"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Netwerk Database Router Statistieken"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Aantal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transports"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Land"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Onze info"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Peer info voor"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Volledige item"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Geupdate"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} geleden"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Handtekening sleutel"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adres(sen)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "kosten"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Verborgen of aan het opstarten"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU met introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP en SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP en SSU met introducers"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
-msgstr ""
+msgstr "IPv6 Only SSU, aanbieders"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
-msgstr ""
+msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
-msgstr ""
+msgstr "IPv6 SSU, aanbieders"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
-msgstr ""
+msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
-msgstr ""
+msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
-msgstr ""
+msgstr "IPv6 NTCP, SSU, aanbieders"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
-msgstr ""
+msgstr "IPv6 Only NTCP, SSU, aanbieders"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:252
 #, java-format
@@ -3298,7 +3319,7 @@ msgid "Hide news"
 msgstr "Verberg nieuws"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Toon nieuws"
 
@@ -3379,7 +3400,7 @@ msgid "Failing"
 msgstr "Gefaald"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Geïntegreerd"
 
@@ -3592,7 +3613,7 @@ msgid "Lifetime average frequency"
 msgstr "Levenslange gemiddelde frequentie"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3643,282 +3664,282 @@ msgstr "Grafiek Data"
 msgid "Graph Event Count"
 msgstr "Grafiek Aantal Gebeurtenissen"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exporteer Data als XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Levenslange gemiddelde waarde"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Router Hulp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Hulp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Configureer de opstart van clients en webapps (services); start sluimerende services handmatig"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P Services"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configureer I2P Router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P Intern"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Bekijk bestaande tunnels en tunnel opbouw status"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Toon alle huidige peer connecties"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Toon recente peer prestatie profielen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Toon lijst met alle bekende I2P routers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Gezondheids Rapport"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Logs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Grafieken router prestatie"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Grafieken"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Tekstuele router prestatie statistieken"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Lokale Bestemmingen"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Algemeen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Jouw Local Identity is jouw unieke I2P router identiteit, vergelijkbaar met een IP-adres, maar dan voor I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Laat anderen dit nooit weten, aangezien het je echte IP kan openbaren."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Lokale Identiteit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Je unique I2P router identiteit is"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "vertel dit aan niemand"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "toon"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "De in gebruik zijnde versie van de I2P software"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Hoe lang draaien we al voor deze sessie"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Uptime"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Hulp bij het configureren van je firewall en router voor optimale I2P prestatie"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Waarschuwing: ECDSA is niet beschikbaar. Werk Java of je besturingssysteem bij"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configureer I2P Updates"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P Update"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Peers waarmee wij in de laatste minuten/het laatste uur gecommuniceerd hebben."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Actief"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Het aantal peers beschikbaar voor het bouwen van client tunnels."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Snel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Het aantal peers beschikbaar voor het bouwen van exploratory tunnels."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Grote capaciteit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
-msgstr ""
+msgstr "Het aantal peers beschikbaar voor netwerk database aanvragen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Het totaal aantal peers in onze netwerkdatabase"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Bekend"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configureer router bandbreedte toewijzing"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Bandbreedte in/uit"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Totaal"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Gebruikt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Gebruikt voor het bouwen en testen van tunnels, en om te communiceren met floodfill peers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Onderzoekend"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunnels die we gebruiken om diensten in het netwerk te voorzien of om toegang toe te hebben"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunnels waarvan we deel uitmaken door rechtstreeks brandbreedte tot het netwerk te voorzien"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Deelnemend"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "De verhouding van tunnel hops die we leveren en tunnel hops die we gebruiken - een waarde groter dan 1.00 geeft aan dat je positief bijdraagt aan het netwerk"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Share rato"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Wat is er in de taken wachtrij van de router?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Verstopping"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Geeft aan hoe de router presteert"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Taak vertraging"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Geeft aan hoe snel uitgaande berichten naar andere I2P routers verstuurd worden"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Bericht vertraging"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Heen en weer tijd voor een tunnel test"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tunnel vertraging"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
-msgstr ""
+msgstr "Wachtrij van verzoeken van andere routers om deel te nemen in tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Achterstand"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Nieuws &amp; Updates"
 
@@ -3945,7 +3966,7 @@ msgstr "OK"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:165
 msgid "ERR-Unresolved TCP Address"
-msgstr ""
+msgstr "ERR-Onopgelost TCP Adres"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
@@ -3992,43 +4013,43 @@ msgstr "ERR-UDP Uitgeschakeld en Inkomende TCP host/poort niet gezet"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN-Firewall met UDP Uitgeschakeld"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Toevoegen/verwijderen/wijzigen &amp; beheer je client en server tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Toon tunnels"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Leases verlopen"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Herbouwen"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "geleden"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Gereed"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Bouwen"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Tunnels aan het bouwen"
 
@@ -4036,31 +4057,31 @@ msgstr "Tunnels aan het bouwen"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "gedeelde clients"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Klik Herstart om te installeren"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Klik Afsluiten and herstart om te installeren"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versie {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Update beschikbaar"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Download {0} Update"
@@ -4069,40 +4090,40 @@ msgstr "Download {0} Update"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Download Niet-ondertekende <br> Update {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Hulp met firewall configuratie"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Controleer netwerk connectie en NAT/firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Volgorde"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Bovenaan"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Onder"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Onderaan"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Selecteer een sectie om toe te voegen"
 
@@ -4198,7 +4219,7 @@ msgstr "Deelnemer"
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
-msgstr ""
+msgstr "Gelimiteerde weergave voor de {0} tunnels met het hoogste gebruik"
 
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
@@ -4375,6 +4396,10 @@ msgstr "Encryption"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4692,7 +4717,7 @@ msgstr " network configuratie pagina"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4722,7 +4747,7 @@ msgstr "Voor de toepassing van sommige wijzigingen is een herstart nodig."
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
 #, java-format
 msgid "To make changes, edit the file {0}."
-msgstr ""
+msgstr "Om te veranderen, wijzig het bestand {0}."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
@@ -4780,13 +4805,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Uitgeschakeld - Clients buiten dit Java process mogen geen verbinding maken"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP Poort"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP Interface"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP Poort"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Authorisatie"
@@ -4873,13 +4898,14 @@ msgid "Search Engines"
 msgstr "Zoekmachines"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Aanbevolen Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Lokale Diensten"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4938,48 +4964,53 @@ msgstr "Configureer I2P Logging Opties"
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(het symbool '@' zal worden vervangen bij het doordraaien van de log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Log regel formaat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(gebruik 'd' = datum, 'c' = class, 't' = thread, 'p' = prioriteit, 'm' = bericht)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Log datum formaat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = maand, 'dd' = dag, 'HH' = uur, 'mm' = minuut, 'ss' = seconde, 'SSS' = milliseconde)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Max log bestand grootte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Standaard log niveau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG en INFO zijn geen aanbevolen standaardwaarden, ze zullen je router drastisch vertragen)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Log niveau overschrijving"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nieuwe overschrijving"
 
@@ -5462,7 +5493,7 @@ msgstr "ERR - UDP Poort In Gebruik - Zet i2np.udp.internalPort=xxxx in geavancee
 msgid ""
 "I2P was unable to bind to the configured port noted on the advanced network "
 "configuration page ."
-msgstr ""
+msgstr "I2P kon niet binden aan de opgegeven poort op de geavanceerde configuratie pagina."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
@@ -5955,7 +5986,7 @@ msgstr "Toepassen"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
-msgstr ""
+msgstr "Router Console Wachtwoord"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
@@ -5999,7 +6030,7 @@ msgstr "Update regels"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
-msgstr ""
+msgstr "Nieuws laden via de eepProxy?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
@@ -6141,11 +6172,11 @@ msgstr "niet gevonden"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
 msgid "events"
-msgstr ""
+msgstr "gebeurtenissen"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
 msgid "I2P Event Log"
-msgstr ""
+msgstr "I2P Gebeurtenissenlogboek"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
@@ -6167,18 +6198,6 @@ msgstr "Klik op een vlag om een taal te kiezen. Klik op 'configureer taal' om de
 msgid "Search I2P"
 msgstr "Zoek I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Interessante Eepsites"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "i2p tunnel manager"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "I2P Tunnel Manager"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar Bestand Dump"
@@ -6209,11 +6228,11 @@ msgstr "Router Logs"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
 msgid "Event Logs"
-msgstr ""
+msgstr "Gebeurtenissenlogboeken"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
 msgid "View event logs"
-msgstr ""
+msgstr "Gebeurtenissenlogboeken bekijken"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
diff --git a/apps/routerconsole/locale/messages_pl.po b/apps/routerconsole/locale/messages_pl.po
index a28d07e907127316bd8af380f655967516f88fc2..23e80a53830e9e5aa33d7e938399d46bdf301650 100644
--- a/apps/routerconsole/locale/messages_pl.po
+++ b/apps/routerconsole/locale/messages_pl.po
@@ -7,17 +7,22 @@
 # PolishAnon <b790979@klzlk.com>, 2011, 2012
 # Warton <businesshehe@yahoo.com>, 2011, 2012
 # Karolina <karolina@bitwylesne.pl>, 2014
+# polacco <polacco@i2pmail.org>, 2015
 # polacco <polacco@i2pmail.org>, 2012
-# PolishAnon <b790979@klzlk.com>, 2011
+# polacco <polacco@i2pmail.org>, 2012
+# PolishAnon <b790979@klzlk.com>, 2011-2012
+# seb, 2014
 # seb, 2014
 # Tracerneo <ziolkoneo@gmail.com>, 2013
+# Warton <businesshehe@yahoo.com>, 2011-2012
+# Tracerneo <ziolkoneo@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-31 00:16+0000\n"
-"Last-Translator: seb\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-17 20:51+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +41,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -46,7 +51,7 @@ msgstr[2] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -56,7 +61,7 @@ msgstr[2] "{0} sek"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -66,7 +71,7 @@ msgstr[2] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -74,13 +79,13 @@ msgstr[0] "1 godz"
 msgstr[1] "{0} godz"
 msgstr[2] "{0} godz"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
-msgstr "nie dotyczy"
+msgstr "n/d"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -88,44 +93,44 @@ msgstr[0] "1 dzień"
 msgstr[1] "{0} dni"
 msgstr[2] "{0} dni"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
-msgstr "Zbanowany przez hash rutera: {0}"
+msgstr "Zbanowany przez hash węzła: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
-msgstr "Zbanowany przez hash rutera"
+msgstr "Zbanowany przez hash węzła"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP zbanowany przez wpis {0} w blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "Adres IP zbanowany do restartu"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Adresy IP zablokowane permanentnie"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Od"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Do"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "brak"
 
@@ -135,95 +140,97 @@ msgstr "brak"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Odrzucanie tuneli: Uruchamianie"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Odrzucanie tuneli:  Wysokie opóźnienie wiadomości"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Odrzucanie tuneli: Duża liczba żądań"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Odrzucanie tuneli: Osiągnięto limit"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Odrzucanie tuneli: Limit przepustowości"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Odrzucanie większości tuneli: Limit przepustowości"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Akceptowanie większości tuneli"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Akceptowanie tuneli"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Odrzucanie tuneli: Zamykanie"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Odrzucanie tuneli"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Ponowne seedowanie"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
-msgstr[0] "Ponowny seed pobrał tylko 1 ruter"
-msgstr[1] "Ponowny seed pobrał tylko {0} ruterów"
-msgstr[2] "Ponowny seed pobrał tylko {0} ruterów"
+msgstr[0] "Ponowny seed pobrał tylko 1 węzeł."
+msgstr[1] "Ponowny seed pobrał tylko {0} węzły."
+msgstr[2] "Ponowny seed pobrał tylko {0} węzłów."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Ponowne seedowanie nie udane"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
-msgstr "Zobacz {0} w celu uzyskania pomocy"
+msgstr "Zobacz {0} w celu uzyskania pomocy."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
-msgstr "strona konfiguracyjna ponownego seedowania"
+msgstr "strona ustawień ponownego seedowania"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Ponowne seedowanie: pobieranie URL seeda"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
-msgstr "Ponowne seedowanie: pobieranie informacji o ruterze z URL seeda ({0} udane, {1} błędów)"
+msgstr "Ponowne seedowanie: pobieranie informacji o węźle z URL seeda ({0} udane, {1} błędów)"
 
 #. NOTE TO TRANSLATORS - each of these phrases is a description for a
 #. statistic
@@ -247,13 +254,13 @@ msgstr "Niskopoziomowa prędkość odbierania (bajtów/sek)"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:37
 msgid "How many peers we are actively talking with"
-msgstr "Z iloma peer'ami aktywnie się komunikujemy"
+msgstr "Z iloma uczestnikami aktywnie się komunikujemy"
 
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:40
 msgid "Known fast peers"
-msgstr "Znane szybkie peery"
+msgstr "Znani szybcy uczestnicy"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Wpis NetDb"
 
@@ -263,298 +270,314 @@ msgstr "Wpis NetDb"
 msgid "No transports (hidden or starting up?)"
 msgstr "Brak transportów (ukryte lub uruchamiające się?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Nieobsługiwany typ podpisu"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Nieosiągalne na każdym transporcie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
-msgstr "Adresy Transportowe Rutera"
+msgstr "Adresy transportowe węzła"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} jest używane tylko do połączeń wychodzących"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP nie jest włączone"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
-msgstr "Twoje limity połączenia transportowego są ustawiane automatycznie na podstawie twojej skonfigurowanej przepustowości."
+msgstr "Twoje limity połączenia transportowego są ustawiane automatycznie na podstawie ustawionej przepustowości."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
-msgstr "Aby zmienić te limity, dodaj ustawienia i2np.ntcp.maxConnections=nnn i i2np.udp.maxConnections=nnn na stronie zaawansowanej konfiguracji."
+msgstr "Aby zmienić te limity, dodaj ustawienia i2np.ntcp.maxConnections=nnn i i2np.udp.maxConnections=nnn na stronie zaawansowanych ustawień."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definicje"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
-msgstr "Peer"
+msgstr "Uczestnik"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
-msgstr "Zdalny peer, zidentifikowany przez hash rutera"
+msgstr "Zdalny uczestnik, zidentifikowany przez hash węzła"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Kier."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Połączenie przychodzące"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Połączenie wychodzące"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
-msgstr "Zaoferowali, że nas wprowadza (pomogą innym użytkownikom przeprawić się przez nasz firewall)"
+msgstr "Zaoferowali, że nas wprowadzą (pomogą innym uczestnikom przeprawić się przez naszą zaporę)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
-msgstr "Zaoferowaliśmy, że ich wprowadzimy (pomożemy innym użytkownikom przeprawić się przez ich firewall)"
+msgstr "Zaoferowaliśmy, że ich wprowadzimy (pomożemy innym uczestnikom przeprawić się przez ich zaporę)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Jak długo od czasu, gdy pakiet został odebrany / wysłany"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Bezczynny"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Wejście / Wyjście"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Wygładzona szybkość transferu przychodzącego / wychodzącego  (KB/s)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Jak długo od czasu, gdy połączenie zostało ustanowione"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "W górę"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Odchylenie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
-msgstr "Różnica między zegarem peera a Twoim własnym"
+msgstr "Różnica między zegarem uczestnika a Twoim własnym"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Okno zatłoczenia, które pokazuje, ile bajtów może zostać wysłanych bez potwierdzenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Ilość wysłanych wiadomości oczekujących potwierdzenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Maksymalna ilość jednoczesnych wiadomości do wysyłania"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Ilość oczekujących wysyłań, które przekraczają okno zatłoczenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Próg powolnego startu"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Czas podróży w obie strony w milisekundach"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Limitu czasu retransmisji w milisekundach"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Obecny maksymalny rozmiar pakietu wysyłania / szacowany maksymalny rozmiar pakietu otrzymywania (w bajtach)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
-msgstr "Całkowita liczba pakietów wysłanych do peera"
+msgstr "Całkowita liczba pakietów wysłanych do uczestnika"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
-msgstr "Całkowita liczba pakietów otrzymanych od peera"
+msgstr "Całkowita liczba pakietów otrzymanych od uczestnika"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
-msgstr "Całkowita liczba pakietów retransmitowanych do peera"
+msgstr "Całkowita liczba pakietów retransmitowanych do uczestnika"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
-msgstr "Całkowita liczba zduplikowanych pakietów otrzymanych od peera"
+msgstr "Całkowita liczba zduplikowanych pakietów otrzymanych od uczestnika"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Usługa"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Konfiguracja Wspólnego Interfejsu WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Stan"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Rodzaj"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Wysyłanie danych"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Pobieranie danych"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Połączenie WAN PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Czas działania"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Zewnętrzny adres IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Kierowanie przepływem danych w warstwie 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Usługa Domyślnego Połączenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Połączenie WAN IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Konfiguracja łącza Ethernet'owego WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Znaleziono urządzenie"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Urządzenie podrzędne"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Stan UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Nieaktywne Urządzenia UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "Usługa UPnP została wyłączona. Czy posiadasz więcej, niż jedno urządzenie bram internetowych UPnP w Twojej sieci LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "Nie odnalaziono żadnych urządzeń zgodnych z UPnP w Twojej sieci LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Aktualny zewnętrzny adres IP zgłaszany przez UPnP to {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Aktualny zewnętrzny adres IP nie jest dostępny."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP zgłasza, że maksymalna prędkość pobierania  wynosi {0}bitów/sek"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP zgłasza, że maksymalna prędkość wysyłania wynosi {0}bitów/sek"
@@ -563,276 +586,277 @@ msgstr "UPnP zgłasza, że maksymalna prędkość wysyłania wynosi {0}bitów/se
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} port {1,number,#####} został pomyślnie przekierowany przez UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} port {1,number,#####} nie został przekierowany przez UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP nie jest włączone"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Nadmierne odchylenie zegara: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Połączenia NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limit"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Limit czasu"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Kolejka Wyjścia"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Zaległości?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Przychodzące"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Wychodzące"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
-msgstr[0] "{0} peer"
-msgstr[1] "{0} peerów"
-msgstr[2] "{0} peerów"
+msgstr[0] "{0} uczestnik"
+msgstr[1] "{0} uczestnicy"
+msgstr[2] "{0} uczestników"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Połączenia UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
-msgstr "Sortuj według hashów peera"
+msgstr "Sortuj według hashu uczestnika"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Kierunek/Wprowadzenie"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sortuj według bezczynnych przychodzących"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sortuj według bezczynnych wychodzących"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sortuj według prędkości przychodzących"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sortuj według prędkości wychodzących"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
-msgstr "Sortuj według czas działania połączenia"
+msgstr "Sortuj według czasu działania połączenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sortuj według odchylenia zegara"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sortuj według okna zatłoczenia"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sortuj według  progu powolnego startu"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sortuj według czasu podróży w obie strony"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sortuj według limitu czasu retransmisji"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
-msgstr "Sortuj według waksymalnej wychodzących jednostki transmisji"
+msgstr "Sortuj według maksymalnej wychodzących jednostki transmisji"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sortuj według pakietów wysłanych"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sortuj według pakietów otrzymanych"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sortuj według pakietów retransmitowanych"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sortuj według pakietów otrzymanych więcej niż jeden raz"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Zaproponowaliśmy, że ich wprowadzimy"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Zaproponowali, że nas wprowadzą"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Zdławiony"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 porażka"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} nieudanych"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Zbanowany"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "zalogowano"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Odrzucanie żądań o tunele: Za wolno"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Odrzucanie żądań o tunele: Przeładowanie"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr "Odrzucanie tuneli: Tryb Ukryty"
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Odrzucanie tuneli: Przeładowanie żądań"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Odrzucanie tuneli: Limit połączenia"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Odrzucanie żądań o tunele: Wysokie obciążenie"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Odrzucanie żądań o tunele: Czas kolejki"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Nowa wersja {0} wtyczki jest dostępna"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Nieudane sprawdzanie aktualizacji dla wtyczki {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Brak nowych wersji dla wtyczki {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} bajtów przesłano"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Nieudany transfer z {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Uaktualnienie ściągnięte"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Restartuję"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Zweryfikowano aktualizację"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "z {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Niepodpisana aktualizacja z pliku {0} jest uszkodzona"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Nie udało się skopiować do {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Aktualizacje wewnątrz sieciowe wyłączone. Sprawdź managera pakietów."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Brak praw do zapisu w katalogu instalacyjnym I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Najpierw musisz aktualizować do wersji {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Wymagana jest Java w wersji {0}. Obecna zainstalowana wersja to {1}"
@@ -843,167 +867,175 @@ msgid "Checking for update of plugin {0}"
 msgstr "Sprawdzanie uaktualnień dla wtyczki {0}"
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Uaktualniam"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr "Próba zaistalowania pliku z {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr "Nie wskazano pliku {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
 msgstr "Porażka przy instalacji z pliku {0}, kopiowanie nie powiodło się."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "Pobieranie wtyczki z {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Wtyczka pobrana"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr "Nie można utworzyć katalogu {0} wtyczki"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "Wtyczka z {0} jest uszkodzona"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "Wtyczka z {0} nie zawiera wymaganego pliku konfiguracyjnego"
-
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "Wtyczka z {0} zawiera nieprawidłowy klucz"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr "Podpis weryfikacyjny wtyczki {0} nie udany"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr "Wtyczka nie jest zainstalowana - podpisujący nie jest zaufany"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "Wtyczka z {0} jest uszkodzona"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "Wtyczka z {0} nie zawiera wymaganego pliku konfiguracyjnego"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr "Wtyczka z {0} ma nieprawidłową nazwę lub wersję"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr "Wtyczka {0} ma niezgadzające się wersje"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Ta wtyczka wymaga I2P w wersji {0} lub wyższej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr "Ta wtyczka wymaga Java w wersji {0} lub wyższej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr "Pobrana wtyczka/plugin jest tylko dla nowych instalacji, ale ta wtyczka jest już zainstalowana"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr "Zainstalowana wtyczka nie zawiera wymaganego pliku konfiguracji"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr "Sygnatura pobranej wtyczki nie pasuje do zainstalowanej wtyczki"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr "Pobrana wtyczka w wersji {0} nie jest nowsza od zainstalowanej wtyczki"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr "Uaktualnienie wtyczki wymaga wersji {0} lub wyższej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr "Uaktualnienie wtyczki wymaga wersji {0} lub niższej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr "Wtyczka wymaga Jetty w wersji {0} lub większej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr "Wtyczka wymaga Jetty w wersji {0} lub niższej"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr "Nie można skopiować wtyczki do katalogu {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr "Wtyczka będzie zainstalowana przy następnym restarcie."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr "Wtyczka podlega jedynie aktualizacji, wtyczka nie została zainstalowana"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr "Nieudana instalacja wtyczki w {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "Wtyczka {0} zainstalowana"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "Wtyczka {0} zainstalowana i uruchomiona"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr "Wtyczka {0} zainstalowana, ale uruchomienie nie powiodło się, sprawdź logi"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr "Wtyczka {0} zainstalowana, ale uruchomienie nie powiodło się"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr "Nie udało się pobrać  wtyczki z {0}"
@@ -1018,441 +1050,444 @@ msgstr "Uaktualnianie z {0}"
 msgid "No new version found at {0}"
 msgstr "Nie znaleziono nowej wersji w {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr "Tymczasowy ban wygasa w {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr "Zbanowany aż do restartu lub przez {0}"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr "odbanuj teraz"
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
-msgstr "Konsola Rutera I2P"
+msgstr "Konsola Węzła I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
-msgstr "Błąd podczas aktualizowania konfiguracji – zobacz logi błędów"
+msgstr "Błąd podczas aktualizowania ustawień – zobacz logi błędów"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "Konfiguracja zapisana pomyślnie"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs"
-msgstr "Błąd podczas zapisywania konfiguracji (zastosowana, ale nie zapisana) – zobacz logi błędów"
+msgstr "Błąd podczas zapisywania ustawień (zastosowane, ale nie zapisane) – przejrzyj logi błędów"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
-msgstr "Zapisz konfigurację klienta"
+msgstr "Zapisz ustawienia klienta"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
-msgstr "Zapisz konfigurację interfejsu"
+msgstr "Zapisz ustawienia interfejsu"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
-msgstr "Zapisz konfigurację WebApp"
+msgstr "Zapisz ustawienia WebApp"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
-msgstr "Zapisz konfigurację wtyczek"
+msgstr "Zapisz ustawienia wtyczek"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Zainstaluj wtyczkę"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr "Zaktualizuj wszystkie zainstalowane wtyczki"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Błąd podczas zatrzymywania wtyczki {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Usunięta wtyczka {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Błąd podczas usuwania wtyczki {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Zatrzymano wtyczkę {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr "Zatrzymano webapp {0}"
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Start"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "Dodano nowego klienta"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
-msgstr "Zapis konfiguracji klienta zakończył się sukcesem"
+msgstr "Zapisano pomyślnie ustawienia klienta"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr "Zły indeks klienta."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr "Klient {0} zatrzymany"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr "Klient {0} uruchomiony"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr "Klient {0} usunięty"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
-msgstr "Konfiguracja WebApp zapisana."
+msgstr "Zapisano ustawienia WebApp."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
-msgstr "Konfiguracji wtyczki zapisana."
+msgstr "Zapisano ustawienia wtyczki."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr "WebApp (aplikacja internetowa)"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "rozpoczęte"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Nie udało się uruchomić"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Nie można znaleźć serwera."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "Brak wskazanego URL wtyczki."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "Brak wskazanego URL aktualizacji dla {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr "Pobieranie wtyczki lub aktualizacji w toku."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr "Aktualizowanie wszystkich wtyczek"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr "Zły URL {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr "Sprawdanie aktualizacji dla wtyczki {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr "Uruchomiono wtyczkę {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "Błąd podczas uruchamiania wtyczki {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr "Dodano użytkownika {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
-msgstr "Konfiguracja interfejsu zapisana"
+msgstr "Zapisano ustawienia interfejsu"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr "Dla uzyskania efektu konieczny restart"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Dodaj klienta"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "Klasa i argumenty"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Uruchomić podczas startu?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr "Kontroluj"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Uruchomić podczas startu?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "Klasa i argumenty"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Opis"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Wtyczka"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Wersja"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Podpisano przez"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Data"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Autor"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Licencja"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Strona internetowa"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Link do aktualizacji"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Sprawdź aktualizacje"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
-msgstr "Aktualizuj"
+msgstr "Aktualizacja"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Czy na pewno chcesz usunąć {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Usuń"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 msgid "Delete selected"
 msgstr "Usuń zaznaczone"
 
 #: ../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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr "Dodaj pozycję"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr "Przywróć domyślne"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Zapisz"
 
@@ -1483,12 +1518,12 @@ msgid "Removed"
 msgstr "Usunięto"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Dodaj klucz"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Usuń klucz"
 
@@ -1530,9 +1565,9 @@ msgstr "Nieprawidłowe miejsce przeznaczenia"
 msgid "Log overrides updated"
 msgstr "Nadpisanie logów zaktualizowane"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
-msgstr "Konfiguracja loga zapisana"
+msgstr "Zapisano ustawienia logów"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
 msgid ""
@@ -1553,7 +1588,7 @@ msgstr "Prawidłowe poziomy to DEBUG, INFO, WARN, ERROR, CRIT"
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1562,24 +1597,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1598,53 +1633,54 @@ msgid "Home Page"
 msgstr "Strona Główna"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Sieć"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr "Mapa Przeglądowa"
 
@@ -1653,8 +1689,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunele"
@@ -1664,7 +1700,7 @@ msgid "Clients"
 msgstr "Klienty"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr "Baza kluczy"
 
@@ -1673,15 +1709,15 @@ msgid "Logging"
 msgstr "Zapisywanie do loga"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
-msgstr "Peers"
+msgstr "Uczestnicy"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statystyki"
 
@@ -1691,141 +1727,137 @@ msgstr "Zaawansowane"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr "Ponowne sprawdzenie dostępności rutera..."
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Aktualizacja adresu IP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr "Ustawienia aktualizowania IPv6"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr "Całkowite wyłączenie TCP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr "Aktualizowanie adresu TCP do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr "Wyłączenie przychodzących TCP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr "Aktualizacja adresu TCP przychodzącego na automatyczny"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr "Aktualizowanie portu TCP do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr "Ostrzeżenie - porty mniejsze, niż 1024 nie są zalecane"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr "Nieprawidłowy port"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr "Aktualizacja przychodzącego portu TCP na automatyczny"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr "Aktualizowanie portu UDP do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
-msgstr "Eleganckie restartowanie w Ukryty Tryb Rutera"
+msgstr "Eleganckie restartowanie w Ukryty Tryb Węzła"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
-msgstr "Eleganckie restartowanie by wyjśc z Ukrytego Trybu Rutera"
+msgstr "Eleganckie restartowanie, by wyjść z Ukrytego Trybu Węzła"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr "Włącznie UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr "Wyłącznie UPnP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr "Włączanie trybu laptopa"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr "Wyłączenie trybu laptopa"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr "Wyłączanie UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr "Włączanie UDP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr "Wymaganie wprowadzających do SSU"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr "Nieprawidłowy adres"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr "Aktualizowanie odsetka udostępnianego pasma"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr "Zaktualizowano limit przepustowości"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bitów na sekundę"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "lub maksymalnie {0} bajtów na miesiąc"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
-msgstr "Banuj peera do ponownego uruchomienia"
+msgstr "Banuj uczestnika do ponownego uruchomienia"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23
 #, java-format
@@ -1840,12 +1872,12 @@ msgstr "zbanowany aż do ponownego uruchomienia"
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59
 msgid "Invalid peer"
-msgstr "Nieprawidłowy peer"
+msgstr "Nieprawidłowy uczestnik"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
-msgstr "Odbanuj peera"
+msgstr "Odbanuj uczestnika"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
 msgid "unbanned"
@@ -1856,9 +1888,9 @@ msgid "is not currently banned"
 msgstr "Obecnie nie jest zbanowany"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
-msgstr "Ustaw bonusy peerów"
+msgstr "Ustaw premie dla uczestników"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47
 msgid "Bad speed value"
@@ -1873,7 +1905,7 @@ msgid "Unsupported"
 msgstr "Nieobsługiwane"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr "Zapisz zmiany i reseeduj teraz"
 
@@ -1888,13 +1920,13 @@ msgstr "Rozpoczęcie procesu reseedowania"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:83
 msgid "Configuration saved successfully."
-msgstr "Konfiguracja zapisana pomyślnie."
+msgstr "Zapisano pomyślnie ustawienia."
 
 #. 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "Zamknij natychmiast"
 
@@ -1941,133 +1973,133 @@ msgstr "Wyłączenie za {0}"
 #, 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] ""
-msgstr[2] ""
+msgstr[0] "Proszę poczekać na wygaśnięcie zobowiązania routingu dla {0} tunelu"
+msgstr[1] "Proszę poczekać na wygaśnięcie zobowiązania routingu dla {0} tuneli"
+msgstr[2] "Proszę poczekać na wygaśnięcie zobowiązania routingu dla {0} tuneli"
 
 #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82
 #, java-format
 msgid "Restart in {0}"
 msgstr "Uruchom ponownie za {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr "Eleganckie zamkniecie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr "Eleganckie zamknięcie rozpoczęte"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr "Anuluj eleganckie zamykanie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr "Eleganckie zamykanie anulowane"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr "Elegancki restart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr "Zarządano eleganckiego restartu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr "Natychmiastowy restart"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr "Zarządano twardego restartu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr "Zmień klucz i zrestartuj"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr "Zmiana klucza po poprawnym restarcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr "Zmień klucz i zamknij"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr "Zmiana klucza po poprawnym zamknięciu"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Uruchom I2P przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "Nie uruchamiaj I2P przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr "Zrzuć wątki"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr "Wątki zrzucone do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "Zobacz konsole przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "Konsola będzie pokazana przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "Nie patrz na kosole przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr "Nie pokazuj kosoli przy starcie"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr "Wymuś GC"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr "Wymagany proces pełnego odśmiecania"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Usługa zainstalowana"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr "Uwaga: nie można zainstalować usługi"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Usługa usunięta"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr "Uwaga: nie można usunąć usługi"
 
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116
 msgid "Stat filter and location updated successfully to"
-msgstr ""
+msgstr "Statystyki filtru i lokalizacji zostały pomyślnie zaktualizowane do"
 
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:119
 msgid "Full statistics enabled"
@@ -2102,13 +2134,13 @@ msgid "Refresh interval must be a number"
 msgstr "Częstotliwość odświeżania musi być cyfrą"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
-msgstr ""
+msgstr "Przywróć wszystkie domyślne"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:40
 msgid "Full summary bar default restored."
-msgstr ""
+msgstr "Pełne podsumowanie paska domyślnego przywrócone."
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:41
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:45
@@ -2117,9 +2149,9 @@ msgid "Summary bar will refresh shortly."
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
-msgstr ""
+msgstr "Przywróć stan minimum"
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:44
 msgid "Minimal summary bar default restored."
@@ -2150,33 +2182,33 @@ msgstr "Zapisano kolejność i sekcje"
 #. 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
-msgstr ""
+msgstr "Zapisano pomyślnie ustawienia tunelu rozpoznawczego."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
-msgstr "Błąd podczas zapisywania konfiguracji (zaaplikowane ale nie zapisane) – proszę przejrzeć logi."
+msgstr "Błąd podczas zapisywania ustawień (zastosowane, ale nie zapisane) – przejrzyj logi błędów"
 
 #. * dummies for translation
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "1 skok"
 msgstr[1] "{0} skoki"
-msgstr[2] "{0} skosów"
+msgstr[2] "{0} skoków"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -2184,141 +2216,137 @@ msgstr[0] "1 tunel"
 msgstr[1] "{0} tunele"
 msgstr[2] "{0} tuneli"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
-msgstr ""
+msgstr "Tunele rozpoznawcze"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
-msgstr "Tunele klienta za {0}"
+msgstr "Tunele klienta dla {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr "OSTRZEŻENIE O ZAGROŻENIU ANONIMOWOŚCI – Ustawienia zawierają tunele o długości 0 skoków."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr "OSTRZEŻENIE O ZAGROŻENIU ANONIMOWOŚCI – Ustawienia zawierają tunele o długości 1 skoków."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr "OSTRZEŻENIE O ZAGROŻENIU WYDAJNOŚCI – Ustawienia zawierają bardzo długie tunele."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr "OSTRZEŻENIE O ZAGROŻENIU WYDAJNOŚCI – Ustawienia zawierają bardzo dużą ilość tuneli."
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "Długość"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "Losowość"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
-msgstr "Ilość"
+msgstr "Ilość tuneli podstawowych"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
-msgstr "Ilość zapasowa"
+msgstr "Ilość tuneli zapasowych"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "Opcje wewnętrzne"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "Opcje zewnętrzne"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr "Zmiana stylu zapisana."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr "Odświerz stronę, by zobaczyć"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr "Opcja mobilnej konsoli zapisana."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr "Nie podano nazwy użytkownika"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr "Nie podano hasła"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr "Usunięto użytkownika {0}"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25
 msgid "Set theme universally across all apps"
-msgstr ""
+msgstr "Ustaw styl we wszystkich aplikacjach"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:37
 msgid "Force the mobile console to be used"
 msgstr "Wymuś używanie mobilnej konsoli"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "Arabski"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr "Czeski"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Duński"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Niemiecki"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr "Estoński"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Grecki"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Angielski"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Fiński"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Francuski"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr "Hebrajski"
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "Węgierski"
@@ -2357,618 +2385,756 @@ msgid "Russian"
 msgstr "Rosyjski"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "turecki"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Ukraiński"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Chiński"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr "Dodaj użytkownika i hasło, by odblokować."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr "Nazwa użytkownika"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Hasło"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
-msgstr ""
+msgstr "Trwa już aktualizacja lub sprawdzanie"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Dostępne uaktualnienie , próba ściągnięcia"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Dostępna aktualizacja, kliknij przycisk po lewej, aby pobrać"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Brak dostepnych aktualizacji"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
-msgstr ""
+msgstr "Aktualizowanie URL-a wiadomości do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "wewnętrzny"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Aktualizacja hosta proxy do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Aktualizacja portu proxy do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Aktualizacja częstotliwości odświeżania do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Aktualizacja polityki aktualizacji do {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Aktualizaowanie zaktualizowanych adresów URL."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Uaktualnianie zaufanych kluczy"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Co"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
-msgstr "Zawiadom tylko"
+msgstr "Powiadom tylko"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Ściągnij i tylko zweryfikuj"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Ściągnij, zweryfikuj i zrestartuj"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
-msgstr "Błędna forma zgłoszenia, prawdopodobnie użyłeś przycisku 'wstecz' lub 'odśwież' w swojej przeglądarce. Spróbuj ponownie."
-
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
-msgstr "Jeśli problem się utrzymuje, sprawdź, czy masz włączoną obsługę ciasteczek w przeglądarce."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
-msgstr "{0} dla {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
+msgstr "Zmieniono IP"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
-msgstr "Użytkowanie pasma"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
+msgstr "Zmieniono Port"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
-msgstr "zakończony {0} temu"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
+msgstr "Zegar przesunął się"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
-msgstr "Większy"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
+msgstr "uległ awarii"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
+msgstr "Błąd krytyczny"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr "Zainstalowano nową wersję"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr "Instalacja nie udała się"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr "Błąd sieci"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr "Nowa tożsamość węzła"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr "Wyłączono floodfill"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr "Błąd braku wolnej pamięci"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr "Delikatny restart"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr "Uruchomiono węzeł"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr "Zatrzymano węzeł"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr "Zaktualizowano węzeł"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr "Pokaż wydarzenia"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr "Wydarzenia od"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr "Typ wydarzeń"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr "Wszystkie wydarzenia"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr "Filtruj wydarzenia"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr "Nie znaleziono żadnych wydarzeń"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr "Nie znaleziono żadnych wydarzeń w poprzednim {0}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr "Nie znaleziono żadnych \"{0}\" wydarzeń"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr "Nie znaleziono żadnych \"{0}\" wydarzeń w poprzednim {1}"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr "Czas"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr "Wydarzenie"
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr "Szczegóły"
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+msgid ""
+"Invalid form submission, probably because you used the 'back' or 'reload' "
+"button on your browser. Please resubmit."
+msgstr "Błędna forma zgłoszenia, prawdopodobnie użyłeś przycisku 'wstecz' lub 'odśwież' w swojej przeglądarce. Spróbuj ponownie."
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr "Jeśli problem się utrzymuje, sprawdź, czy masz włączoną obsługę ciasteczek w przeglądarce."
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr "Ogólny wykres pasma"
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr "{0} dla {1}"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr "Użytkowanie pasma"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr "zakończony {0} temu"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr "Większy"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
 msgid "Smaller"
 msgstr "Mniejszy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
 msgid "Taller"
 msgstr "Dłuższy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
 msgid "Shorter"
 msgstr "Krótszy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
 msgid "Wider"
 msgstr "Szerszy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
 msgid "Narrower"
 msgstr "Węższy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
 msgid "Larger interval"
 msgstr "Większy odstęp czasu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
 msgid "Smaller interval"
 msgstr "Mniejszy odstęp czasu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr "Poprzedni odstęp czasu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr "Następny odstęp czasu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr "Pokaż średnie"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr "zdarzenia linii czasu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr "Wszystkie czasy w UTC"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr "Skonfiguruj wyświetlanie wykresów"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr "Wybierz Statystyki"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "Okresy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "lub"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr "Wielkosc obrazu"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "szerokość"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "wysokość"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "piksele"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr "Odświeżaj co"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr "Zapisywać dane z wykresów na dysku?"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr "Zapisz ustawienia i odśwież wykresy"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr "Zapisano ustawienia rysowania wykresów"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Książka adresowa"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
-msgstr ""
+msgstr "Zarządzaj swoim plikiem hosta I2P tutaj (nazwa domeny I2P)"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr "Konfiguruj przepustowość"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr "Konfiguracja przepustowości I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr "Skonfiguruj język"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr "Wybór Języka Konsoli"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr "Dostosuj stronę główną"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr "Konfiguracja strony domowej I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonimowy klient pocztowy"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
-msgstr "Pomoc Dla Rutera I2P"
+msgstr "Pomoc węzła I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
-msgstr "Konsola rutera"
+msgstr "Konsola węzła"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Wbudowany anonimowy klient sieci BitTorrent"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrenty"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Serwer lokalnej sieci"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr "Projekt Anoncoin"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr "Raporty o błędach"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 msgstr "System śledzenia błędów"
 
 #. "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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr "Forum Developerskie"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr "Forum developerskie"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr "Tracker Bittorrent"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
-msgstr ""
+msgstr "diftracker"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr "Aplikacje I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr "Najczęściej zadawane pytania"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr "Forum społeczności"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr "Forum"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid ""
 "A public anonymous Git hosting site - supports pulling via Git and HTTP and "
 "pushing via SSH"
-msgstr ""
+msgstr "Publiczno anonimowa strona hostingowa Git - wspomaga ściaganie przez Git i HTTP oraz wysyłanie przez SSH"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr "Anonimowy Hosting Git"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr "HiddenGate"
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr "Mikroblog"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr "Wiodący serwis microblogingowy I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr "Javadocs"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr "Dokumentacja techniczna"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-msgstr "Prosta i szybka strona microblogingowa"
-
+#. "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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr "Repozytoria Debian i Tahoe-LAFS"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr "Darmowy Dostawca Usług Hostingowych"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr "Darmowy hosting eepsitów w PHP i MySQL"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr "I2P Pastebin"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr "Pastebin"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr "Wiadomości I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr "Katalog dodatków"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr "Urządzenie śledzące Postmana"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr "Strona domowa I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr "Strona projektu"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr "Statystyki Sieci I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr "Dokumentacja techniczna"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr "Trac Wiki"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr "Ugha's Wiki"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr "Główna strona Sponge'a"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr "HTTP proxy nie działa"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, java-format
 msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Twoja przeglądarka nie jest poprawnie skonfigurowana, aby używać HTTP proxy na {0}"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr "URL"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr "Kolejka zadań I2P"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr "Bierzące zadania"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr "Aktywne zadania"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr "rozpoczęto {0} temu"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr "Niedawno zakończone zadania"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr "zakończono {0} temu"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr "Gotowe/czekające zadania"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 msgid "Scheduled jobs"
 msgstr "Zaplanowane zadania"
 
 #. translators: {0} is a job name, {1} is a time, e.g. 6 min
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr "{0} zacznie się za {1}"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr "Statystyka ogólu zadań"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr "Zadanie"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr "W kolejce"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr "Uruchomiony"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr "Średia"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr "Czas"
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr "Maksimum"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr "Minimum"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr "Czeka"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "Położenie pliku"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "Nie znaleziono pliku"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "Brak logów"
 
 #. 0
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:15
 msgid "Local Router"
-msgstr "Router lokalny"
+msgstr "Węzeł lokalny"
 
 #. 1
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:16
 msgid "Router Lookup"
-msgstr "Sprawdź Router"
+msgstr "Sprawdź węzeł"
 
 #. 2
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:17
 msgid "All Routers"
-msgstr "Wszytkie rutery"
+msgstr "Wszytkie węzły"
 
 #. 3
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:18
 msgid "All Routers with Full Stats"
-msgstr "Wszytkie rutery z pełnymi statystykami"
+msgstr "Wszytkie węzły z pełnymi statystykami"
 
 #. 4
 #. 5
@@ -2976,170 +3142,179 @@ msgstr "Wszytkie rutery z pełnymi statystykami"
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
-msgstr "Ruter"
+msgstr "Węzeł"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "nie znaleziono w bazie danych sieci"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Lokalny"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "Nieopublikowany"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Miejsce przeznaczenia"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Dodaj do lokalnej książki adresowej"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Wygasa {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Wygasło {0} temu"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Brama"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Nie zainicjalizowany"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
-msgstr "Statystyka Sieciowej Bazy Danych Rutera"
+msgstr "Statystyka Sieciowej Bazy Danych Węzła"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
-msgstr ""
+msgstr "Policz"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Kraj"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Nasze informacje"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
-msgstr "Info dla peera"
+msgstr "Info dla uczestnika"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Pełny wpis"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Uaktualnione"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} temu"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Opublikowane"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Klucz podpisujący"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adres(y)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "koszt"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
-msgstr "Ukryte przy starcie"
+msgstr "Ukryte lub uruchamia się"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU z przedstawicielami"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP i SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP i SSU z przedstawicielami"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 tylko SSU, przedstawiciele"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, przedstawiciele"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, przedstawiciele"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 tylko NTCP, SSU, przedstawicieli"
 
@@ -3158,15 +3333,15 @@ msgid "Hide news"
 msgstr "Ukryj wiadomości"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Pokaż wiadomości"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr "Sprawdzanie aktualizacji dla wtyczek"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
@@ -3174,12 +3349,12 @@ msgstr[0] "1 wtyczka zaktualizowana"
 msgstr[1] "{0} wtyczki zaktualizowane"
 msgstr[2] "{0} wtyczek zaktualizowanych"
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr "Sprawdzanie dostępności aktualizacji dla wtyczek zakończone"
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
@@ -3187,7 +3362,7 @@ msgstr[0] "Pokazywanie 1 ostatniego profilu"
 msgstr[1] "Pokazywanie {0} ostatnich profili"
 msgstr[2] "Pokazywanie {0} ostatnich profili"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
@@ -3195,196 +3370,196 @@ msgstr[0] "Pokazywanie 1 starszego profilu"
 msgstr[1] "Pokazywanie {0} starszych profili"
 msgstr[2] "Pokazywanie {0} starszych profili"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ukrywanie 1 standardowego profilu."
+msgstr[1] "Ukrywanie {0} standardowych profili."
+msgstr[2] "Ukrywanie {0} standardowych profili."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
-msgstr ""
+msgstr "Grupy"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Prędkość"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "Wydajność"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "Integracja"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr "Szybkie,  Wydajne"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr "Wysoka Wydajność"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "Standarowy"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
-msgstr "Zintegrowany"
+msgstr "Zintegrowani"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr "Niedostępne"
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "profil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr "Ostatnio słyszano o"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr "Ostation słyszano od"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr "Ostatnie udane wysyłanie"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr "Ostanie nieudane wysłanie"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr "10m czas odp."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr "1godz czasu odp."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr "1dzień czas odp."
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
-msgstr ""
+msgstr "Ostatnie Dobre Wyszukiwanie"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
-msgstr ""
+msgstr "Ostatnie Złe Wyszukiwanie"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr "Godzinny Wskaźnik Niepowodzeń"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr "Dniowy Wskaźnik Niepowodzeń"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
-msgstr ""
+msgstr "Progi"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
-msgstr "szybkie peer'y"
+msgstr "szybcy uczestnicy"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
-msgstr "peer'y o wysokiej wydajności"
+msgstr "uczestnicy o wysokiej wydajności"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
-msgstr "peer'y dobrze zintegrowane"
+msgstr "uczestnicy dobrze zintegrowani"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr "jak określono przez organizatora profilu"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr "grupy"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr "ograniczenia"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 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:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "szybkość"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr "pojemność"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr "do ilu tuneli możemy się zwrócić z prośbą o dołączenie w ciągu godziny?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
-msgstr ""
+msgstr "o ilu nowych uczestnikach powiadomili nas ostatnio?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr "integracja"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
-msgstr "czy peer jest zbanowany, nieosiągalny lub nie zalicza testów tunelu?"
+msgstr "czy uczestnik jest zbanowany, nieosiągalny lub nie zalicza testów tunelu?"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr "stan"
 
@@ -3404,11 +3579,11 @@ msgstr "Wybierz wyszukiwrkę"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:57
 msgid "GO"
-msgstr ""
+msgstr "GO"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:60
 msgid "Statistics gathered during this router's uptime"
-msgstr "Statystyki zgromadzone podczas działania rutera"
+msgstr "Statystyki zgromadzone podczas działania węzła"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:63
 msgid ""
@@ -3418,7 +3593,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:64
 msgid "These statistics are primarily used for development and debugging."
-msgstr ""
+msgstr "Statystyki są głównie używane do rozwoju i debugowania."
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:105
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:156
@@ -3435,7 +3610,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:124
 msgid "Highest events per period"
-msgstr ""
+msgstr "Czas z największą liczbą wydarzeń"
 
 #. if (showAll && (curFreq.getMaxAverageEventsPerPeriod() > 0) &&
 #. (curFreq.getAverageEventsPerPeriod() > 0) ) {
@@ -3448,7 +3623,7 @@ msgstr ""
 #. buf.append(num(curFreq.getMinAverageInterval())).append("ms)");
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:135
 msgid "Lifetime average events per period"
-msgstr ""
+msgstr "Życiowa średnia wydarzeń przez okres"
 
 #. Display the strict average
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:140
@@ -3456,7 +3631,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3503,288 +3678,288 @@ msgstr "Zdarzenia w okresie szczytowym"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:219
 msgid "Graph Data"
-msgstr ""
+msgstr "Dane wykresu"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:222
 msgid "Graph Event Count"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Eksportuj dane jako XML"
+msgstr "Wykresu częstotliwości wydarzeń"
 
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
-msgstr ""
+msgstr "liczba życiowej średniej"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
-msgstr "Pomoc Dla Rutera I2P &amp; FAQ"
+msgstr "Pomoc węzła I2P oraz Najczęściej zadawane pytania"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Pomoc i FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Konfiguruj rozruch klientów i aplikacji sieciowych (usług); ręcznie uruchom uśpione usługi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Usługi I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
-msgstr "Skonfiguruj Ruter I2P"
+msgstr "Skonfiguruj węzeł I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Wnętrzności I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Wyświetl istniejące tunele i status budowy tunelu"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
-msgstr "Pokaż wszystkie aktualne połączenia z peerami"
+msgstr "Pokaż wszystkie aktualne połączenia z uczestnikami"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
-msgstr "Pokaż profile ostatnich osiągów peerów"
+msgstr "Pokaż ostatnie profile wydajności uczestników"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
-msgstr "Pokaż listę wszystkich znanych ruterów I2p"
+msgstr "Pokaż listę wszystkich znanych węzłów I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Raport zdrowotny"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Logi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
-msgstr "Wykres wydajności rutera"
+msgstr "Wykres wydajności węzła"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Wykresy"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
-msgstr "Lokalne Miejsca Docelowe"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr "Lokalne tunele"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Tunel I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "Zarządzanie ukrytymi usługami"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Ogólne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
-msgstr "Twoja Lokalna Tożsamość jest unikalną tożsamością rutera I2P podobną do adresu IP, lecz zgodną z I2P."
+msgstr "Twoja Lokalna Tożsamość jest unikalną tożsamością węzła I2P podobną do adresu IP, lecz zgodną z I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Nigdy jej nikomu nie ujawniaj, gdyż może ona doprowadzić do odkrycia Twojego rzeczywistego ip."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Lokalna Tożsamość"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
-msgstr "Twoja unikatowa tożsamość rutera I2P to"
+msgstr "Twoja unikatowa tożsamość węzłą I2P to"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "nigdy nie pokazuj nikomu"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "pokaż"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Wersja używanego softwaru I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Jak długo trwa aktualna sesja"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Czas działania"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
-msgstr "Pomóż nam optymalizować wydajność I2P konfigurując swój firewall i ruter "
+msgstr "Pomóż nam optymalizować wydajność I2P konfigurując zaporę i węzeł"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "Więcej informacji zobacz na wiki"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Uwaga: ECDSA niedostępne. Zaktualizuj Javę lub system operacyjny."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Konfiguracja aktualizacji I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Aktualizacja I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
-msgstr "Peery, z którymi komunikowaliśmy się przez ostatnie parę minut/ostatnią godzinę"
+msgstr "Uczestnicy, z którymi komunikowaliśmy się przez ostatnie parę minut/ostatnią godzinę"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Aktywne"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
-msgstr "Liczba peerów dostępnych do budowania tuneli klienta"
+msgstr "Liczba uczestników dostępnych do budowania tuneli klienta"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
-msgstr "Szybkie"
+msgstr "Szybcy"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
-msgstr "Liczba peerów dostępna do budowania tuneli rozpoznawczych"
+msgstr "Liczba uczestników dostępna do budowania tuneli rozpoznawczych"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Wysokiej przepustowości"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
-msgstr ""
+msgstr "Ilość uczestników dostępnych do zapytań bazy danych sieci"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
-msgstr "Pełna liczba peerów w naszej sieciowej bazie danych"
+msgstr "Całkowita liczba uczestników w naszej sieciowej bazie danych"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
-msgstr "Znane"
+msgstr "Znani"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
-msgstr ""
+msgstr "Ustaw przydzielanie przepustowości"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
-msgstr ""
+msgstr "Przepustowość przychodząca/wychodząca"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Razem"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Użyte"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
-msgstr ""
+msgstr "Rozpoznawcze"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Używamy tuneli dla zabezpieczenia lub uzyskania dostępu do usług w sieci"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
-msgstr ""
+msgstr "Uczestnictwo"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
-msgstr "Co znajduje się w kolejce zadań rutera?"
+msgstr "Co znajduje się w kolejce zadań węzła?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Zatłoczenie"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
-msgstr ""
+msgstr "Pokazuje wydajność węzła"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
-msgstr ""
+msgstr "Opóźnienie zadań"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
-msgstr "Wskazuje z jaką prędkością wysyłane są wiadomości do innych ruterów I2P"
+msgstr "Wskazuje, z jaką prędkością wysyłane są wiadomości do innych węzłów I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Opóźnienie wiadomości"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
-msgstr ""
+msgstr "Opóźnienie tunelu"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
-msgstr ""
+msgstr "Zakolejkowane zapytania z innych węzłów dot. uczestnictwa w tunelach"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Wiadomości i aktualizacje"
 
@@ -3795,101 +3970,106 @@ msgstr "ERR-Błąd Menedżera Klienta I2CP - sprawdź logi"
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:150
 #, java-format
 msgid "ERR-Clock Skew of {0}"
-msgstr ""
+msgstr "ERR-Odchylenie zegara o {0}"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Testuje"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr "ERR-Nierozwiązany adres TCP"
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr "ERR-Prywatny Adres TCP"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr "ERR-SymetrycznyNAT"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr ""
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
-msgstr ""
+msgstr "Za zaporą"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr "Rozłączony – sprawdź kabel sieciowe"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
 msgstr "ERR-Port UDP W Użyciu - Ustaw i2np.udp.internalPort=xxxx w zaawansowanych ustawieniach i zrestartuj"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
-msgstr "ERR-Brak Aktywnych Peer'ów, Sprawdź Połączenie Sieciowe i Firewall"
+msgstr "ERR-Brak aktywnych uczestników, sprawdź połączenie sieciowe i firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Dodaj/usuń/edytuj &amp; kontroluj swojego klienta i tunele servera"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Serwer"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "Ukryta usługa"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Pokaż tunele"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Umowy wygasły"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Przebudowanie"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "temu"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Gotowy"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Budowanie"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Tworzenie tuneli"
 
@@ -3897,31 +4077,31 @@ msgstr "Tworzenie tuneli"
 #. 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "Współdzielone klienty"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Kliknij Restart by zainstalować"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Kliknij Zamknięcie i zrestartuj, by zainstalować"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Wersja {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Aktualizacja jest dostępna"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Pobierz {0} Uaktualnień"
@@ -3930,40 +4110,40 @@ msgstr "Pobierz {0} Uaktualnień"
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
-msgstr "Pomóż z konfiguracją firewall'a"
+msgstr "Pomoc w konfiguracji zapory"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
-msgstr "Sprawdź połączenie sieciowe oraz NAT/firewall"
+msgstr "Sprawdź połączenie sieciowe oraz NAT/zaporę"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Ponownie seeduj"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Kolejność"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Góra"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "W dół"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Dół"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Wybierz sekcję, którą chcesz dodać"
 
@@ -3996,120 +4176,120 @@ msgstr "maksimum"
 msgid "now"
 msgstr "teraz"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr "konfiguruj"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr "Tunele klienta dla"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr "martwy"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "Uczestniczące tunele"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr "Otrzymuj na"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr "Przedawnienie"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr "Wysyłaj na"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr "Wskaźnik"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr "Rola"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr "Zużycie"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr "okres karencji"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr "Wyjściowy punkt końcowy"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr "Brama wejściowa"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr "Ograniczenie wyświetlania do {0} tuneli o najwyższym wskaźniku użycia"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr "Nieaktywne uczestniczące tunele"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr "Zużycie pasma"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr "Wygasa"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr "Punkt końcowy"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr "Tworzenie"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr "przychodzące"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr "wychodzące"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr "Brak tuneli; oczekiwanie na zakończenie okresu karencji."
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr "do"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr "z"
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr "książka adresowa"
 
@@ -4131,7 +4311,7 @@ msgstr "susidns"
 
 #: ../java/strings/Strings.java:17
 msgid "routerconsole"
-msgstr "konsola rutera"
+msgstr "konsola węzła"
 
 #. clients, taken from clients.config, for ConfigClientsHelper
 #. note that if the wording changes in clients.config, we have to
@@ -4166,7 +4346,7 @@ msgstr "Most aplikacji BOB"
 
 #: ../java/strings/Strings.java:30
 msgid "Open Router Console in web browser at startup"
-msgstr "Otwieraj Konsolę Rutera przy uruchamianiu przeglądarki internetowej"
+msgstr "Przy uruchamianiu węzła otwieraj konsolę w przeglądarce internetowej"
 
 #: ../java/strings/Strings.java:37
 msgid "IRC proxy"
@@ -4236,6 +4416,10 @@ msgstr "Szyfrowanie"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Tunel I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4334,343 +4518,351 @@ msgstr "itag1"
 msgid "itag2"
 msgstr "itag2"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr "konfiguruj przepustowość"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
-msgstr "Router nie działa"
+msgstr "Węzeł nie działa"
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr "Odśwież (s)"
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr "Włącz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr "Ogranicznik przepustowości"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr "I2P będzie działać najlepiej, gdy skonfigurujesz wskaźniki tak, by pasowały do prędkości Twojego połączenia internetowego."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr "KB/s WE"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr "KB/s WY"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr "Udostępnij"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr "UWAGA"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, java-format
 msgid "You have configured I2P to share only {0} KBps."
 msgstr "Skonfigurowałeś I2P by udostępniać jedynie {0}KB/sek."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr "I2P wymago co najmniej 12 KB/s, by włączyć udostępnianie łącza"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr "Włącz proszę udostępnianie (uczestnictwo  w tunelach) poprzez wybór większej przepustowości. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 msgid ""
 "It improves your anonymity by creating cover traffic, and helps the network."
 msgstr "To zwiększa Twoją anonimowość poprzez tworznie ruchu przykrywającego, jak równiż pomaga sieci."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr "I2P skonfigurawane, by udostępniać {0} KB/s."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 msgid ""
 "The higher the share bandwidth the more you improve your anonymity and help "
 "the network."
 msgstr "Im więcej pasma udostępniasz, tym stajesz się bardziej anonimowy i wspomagasz sieć."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr "Strona zaawansowanych ustawień sieciowych"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr "ustawienia zaawansowane"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr "Zaawansowana konfiguracja I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr "Zaawansowana konfiguracja I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr "Niektóre zmiany mogą wymagać restartu, aby zmiany były widoczne."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr "By poczynić zmiany, edytuj plik {0}."
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr "skonfiguruj klienty"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr "Konfiguracja klientów I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr "Konfiguracja klientów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
-msgstr "Klienty Java umieszczone poniżej są uruchamiane przez ruter i działają w tej samej JVM."
+msgstr "Klienty Java umieszczone poniżej są uruchamiane przez węzeł i działają w tej samej JVM."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
-msgstr "Dokonując tu zmian, zachowaj szczególną ostrożność. 'Konsola rutera' oraz 'zastosowanie tuneli' są wymagane dla większości funkcji I2P. Tylko zaawansowani użytkownicy powinni zmieniać ich ustawienia."
+msgstr "Dokonując tu zmian, zachowaj szczególną ostrożność. 'Konsola węzła' oraz 'tunele aplikacji' są wymagane dla większości funkcji I2P. Tylko zaawansowani użytkownicy powinni zmieniać te ustawienia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr "Aby zmienić opcje innych klientów, edytuj plik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr "Po wprowadzeniu zmian należy zrestartować Ruter."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr "Zaawansowana Konfiguracja Interfejsu Klientów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr "Konfiguracja Zewnętrznego Interfejsu I2CP (I2P Client Protocol)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr "Włączone bez SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr "Włączone z wymaganym SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Wyłączony - Klienci z zewnątrz tego procesu Java nie mogą uzyskać połączenia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
-msgstr "Port I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
 msgid "I2CP Interface"
 msgstr "Interfejs I2CP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Port I2CP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autoryzacja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr "Wymaga loginu i hasła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr "Użytkownik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr "Domyślne ustawienia będą odpowiednie dla większości użytkowników."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr "Wszystkie dokonane tu zamiany muszą zostać również skonfigurowane w kliencie zewnętrznym."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr "Wiele klientów nie wspiera SSL lub autoryzacji"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr "Konfiguracja WebApp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4678,1471 +4870,1483 @@ msgid ""
 "(e.g. i2psnark),front-ends to another client or application which must be "
 "separately enabled (e.g. susidns, i2ptunnel), or have no web interface at "
 "all (e.g. addressbook)."
-msgstr "Poniższe aplikacje sieciowe Java uruchamiane są przez klienta webConsole i działają na tej samej JVM, co ruter. Zwykle są aplikacjami sieciowymi dostępnymi przez konsolę rutera. Mogą być kompletnymi aplikacjami (np. i2psnark), aplikacjami czołowymi do innego klienta, aplikacjami, które muszą zostać oddzielnie uruchomione (np. susidns, i2ptunnel) lub nie posiadać wcale interfejsu (np. adressbook)."
+msgstr "Poniższe aplikacje Java uruchamiane są przez klienta webConsole i działają na tej samej JVM, co węzeł. Zwykle są aplikacjami dostępnymi przez konsolę węzła. Mogą być kompletnymi aplikacjami (np. i2psnark), aplikacjami czołowymi do innego klienta, aplikacjami, które muszą zostać oddzielnie uruchomione (np. susidns, i2ptunnel) lub nie posiadać wcale interfejsu (np. adressbook)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
 "your router to a newer version, so disabling the web app here is the "
 "preferred method."
-msgstr "Aplikacja sieciowa może zostać wyłączona również przez usunięcie pliku .war z katalogu webapps; jednakże plik .war i aplikacja pojawią się znowu, gdy zaktualizujesz swój ruter do nowszej wersji, zatem polecaną metodą jest wyłączenie aplikacji na tej stronie."
+msgstr "Aplikacja sieciowa może zostać wyłączona również przez usunięcie pliku WAR z katalogu webapps; jednakże plik WAR i aplikacja pojawią się znowu, gdy zaktualizujesz swój węzeł do nowszej wersji, zatem polecaną metodą jest wyłączenie aplikacji na tej stronie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr "Konfiguracja wtyczek"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr "Wtyczki podane poniżej są uruchamiane przez klienta webConsole."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr "Instalacja wtyczek"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr "Szukaj dostępnych wtyczek na {0}."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr "Aby zainstalować wtyczkę, proszę wprowadzić adres URL:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr "konfiguruj główną"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr "Domyślna strona główna"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr "Użyj starej strony głównej"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr "Wyszukiwarki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
-msgstr "Polecane Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "Wybrane ukryte usługi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
-msgstr "Lokalne usługi"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
+msgstr "Ustawienia i aplikacje"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr "konfiguruj zestaw kluczy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
-msgstr "Konfiguracja I2P Keyring"
+msgstr "Konfiguracja zestawu kluczy I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
-msgstr "Keyring routera jest używany do odszyfrowania zaszyfrowanych leaseSetów."
+msgstr "Zestaw kluczy węzła jest używany do odszyfrowania zaszyfrowanych leaseSetów."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr "Zestaw kluczy może zawierać klucze do lokalnych lub odległych zaszyfrowanych miejsc docelowych."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr "Manualne Dodanie do Zestawu Kluczy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr "Wpisz tu klucze do odległych zaszyfrowanych miejsc docelowych."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr "Klucze do miejsc lokalnych muszą zostać wpisane do"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
-msgstr "strona I2PTunnel"
+msgstr "Zarządzanie ukrytymi usługami"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr "Nazwa msc. docelowego, hash lub pełny klucz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr "Klucz szyfrujący"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr "konfiguruj logowanie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr "Konfiguracja Logowania do I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr "Konfiguruj Opcje Logowania do I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr "Plik logów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "Edytuj {0}, by zmienić"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(symbol '@' zostanie zastąpiony podczas rotacji logów)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Format logów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(użyj 'd' = data, 'c' = klasa, 't' = temat, 'p' = priorytet, 'm' = wiadomość)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Format daty w logach"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "(MM=miesiąc, dd=dzień, HH=godzina, mm=minuta, ss=sekunda, SSS=millisekunda)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Maksymalny rozmiar logów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Domyślny poziom logowania"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
-msgstr "(DEBUG i INFO nie są zalecane jako domyślne, ponieważ mogą one drastycznie spowolnić Twój router)"
+msgstr "(DEBUG i INFO nie są zalecane jako domyślne, ponieważ mogą one drastycznie spowolnić Twój węzeł)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Poziom nadpisania logów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nowe nadpisanie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr "konfiguruj działania związane z działaniem sieci"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr "Konfiguracja sieci I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr "Konfiguracja IP i Transportu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr "Pomoc jest dostępna poniżej."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr "Konfiguracja UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
-msgstr "Włącz UPnP, by otworzyć porty w firewalli"
+msgstr "Włącz UPnP, by otworzyć porty w zaporze"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr "Stan UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr "Konfiguracja IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr "Dostępny z zewnątrz adres IP lub nazwa hosta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr "Użyj wszystkich metod automatycznego wykrywania"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr "Wyłącz wykrywanie adresu IP przez UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr "Ignoruj adres IP lokalnego interfejsu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr "Używaj tylko wykrywania IP SSU"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr "Tryb ukryty – nie publikuj adresu IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr "Podaj adres IP lub nazwę hosta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr "Akcja przy zmianie IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
-msgstr "Tryb laptopa - Dla wzmocnienia anonimowości zmień tożsamość rutera oraz port UDP, gdy zmienia się IP  "
+msgstr "Tryb laptopa – Dla wzmocnienia anonimowości zmienia tożsamość węzła oraz port UDP, gdy zmienia się adres IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr "Eksperymentalny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr "Konfiguracja IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr "Wyłącz IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr "Włącz IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr "Preferuj IPv4 nad IPv6"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr "Preferuj IPv6 nad IPv4"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr "Używaj tylko IPv6 (wyłącz IPv4)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr "Konfiguracja UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr "port UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr "Wyłącz całkowicie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
-msgstr ""
+msgstr "(wybierz tylko wtedy, gdy zapora blokuje wychodzący ruch UDP)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr "Konfiguracja TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr "Użyj adresu IP wykrytego automatycznie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr "obecnie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
-msgstr "jeśl nie jesteśmy za firewallem"
+msgstr "jeśl nie jesteśmy za zaporą"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr "Zawsze używaj auto-wykrywanego adresu IP (Nie zaporowego)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
-msgstr ""
+msgstr "Wyłącz ruch przychodzący (za zaporą)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
-msgstr ""
+msgstr "(wybierz tylko wtedy, gdy zapora blokuje lub przycina wychodzący ruch TCP)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr "Dostępny z zewnątrz port TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr "Używaj portu skonfigurowanego dla UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr "Podaj port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr "Uwagi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
-msgstr "a) Nikomu nie ujawniaj numerów portów! <br/> b) Zmiana tych ustawień spowoduje restart rutera."
+msgstr "a) Nikomu nie ujawniaj numerów portów! <br/> b) Zmiana tych ustawień spowoduje restart węzła."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr "Pomoc w konfiguracji"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
-msgstr "Co prawda I2P będzie działać za większością firewalli, ale twoja szybkość i integracja z siecią zwiększy się, jeśli użyjesz przekierowania portów  UDP i TCP."
+msgstr "Co prawda I2P będzie działać za większością zapór, ale Twoja szybkość i integracja z siecią zwiększy się, jeśli użyjesz przekierowania portów UDP i TCP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
-msgstr ""
+msgstr "Jeśli możesz, zrób wyłom w swojej zaporze, który pozwoli na dostarczanie pakietów TCP i UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
-msgstr "Większość powyższych opcji jest przeznaczonych dla specjalnych sytuacji, na przykład gdy UPnP nie działa poprawnie lub niekontrolowany przez Ciebie firewall wyrządza szkody."
+msgstr "Większość powyższych opcji jest przeznaczonych dla specjalnych sytuacji, na przykład gdy UPnP nie działa poprawnie lub niekontrolowana przez Ciebie zapora wyrządza szkody."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
-msgstr "Pewne firewalle jak symetryczne NATy mogą nie współpracować poprawnie z I2P. "
+msgstr "Pewne rodzaje zapór – jak symetryczne NAT-y – mogą nie współpracować poprawnie z I2P. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr "UPnP jest używany do komunikacji z Urządzeniami Bram Internetowych (IGDs), by wykryć zewnętrzny adres IP i przekierowywać porty."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr "Obsługa UPnP jest w wersji beta i może nie działać z wielu powodów"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr "Nie znaleziono urządzenia z UPnP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr "UPnP wyłączone w urządzeniu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr "Błędy w implementacji UPnP urządzenia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
-msgstr "Wiele firewalli/ruterów na ścieżce połączenia internetowego"
+msgstr "Wiele zapór/routerów na ścieżce połączenia internetowego"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr "Zmiana urządzenia UPnP, reset lub zmiana adresu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr "Sprawdź stan UPnP tutaj."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
-msgstr "UPnP może być włączone lub wyłączone powyżej, ale zatwierdzenie zmian wymaga restartu rutera."
+msgstr "UPnP może być włączone lub wyłączone powyżej, ale zatwierdzenie zmian wymaga restartu węzła."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr "Nazwa hosta podana wyżej będzie opublikowana w bazie sieci."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
-msgstr ""
+msgstr "Oni <b>nie są prywatne</b>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr "<b>Nie podawaj adresów IP z prywatnej puli</b>, np. 127.0.0.1 lub 192.168.1.1."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
-msgstr ""
+msgstr "Jeśli podasz zły adres IP lub nazwę hosta, albo nie ustawisz poprawnie swojej zapory lub NAT-u, Twoja wydajność sieciowa znacznie spadnie."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr "Jeśli masz wątpliwości, pozostaw domyślne ustawienia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr "Pomoc ze Zdolnością Odbiorczą"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
-msgstr "Jeśli twój firewall jest otwarty, a I2P dalej myśli, że jesteś za firewallem, pamiętaj, iż możesz mieć kilka firewalli. Na przykład zewnętrzny sprzętowy router."
+msgstr "Jeśli twoja zapora jest otwarta, a I2P dalej uważa, że jesteś za zaporą – pamiętaj, iż możesz mieć kilka zapór, np. przykład zewnętrzny sprzętowy router."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr "Jeśli pojawia się błąd, możesz sprawdzić <a href=\"logs.jsp\">logi</a> w celu zdiagnozowania problemu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
-msgstr "Najprawdopodobniej Twój port UDP nie jest chroniony przez firewall."
+msgstr "Najprawdopodobniej Twój port UDP nie jest chroniony przez zaporę."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
-msgstr "Najprawdopodobniej Twój port UDP jest chroniony przez firewall."
+msgstr "Najprawdopodobniej Twój port UDP jest chroniony przez zaporę."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
-msgstr "Czasami możesz otrzymać błąd dotyczący firewalla, ponieważ metody jego wykrywania nie są 100% niezawodne."
+msgstr "Czasami możesz otrzymać błąd dotyczący zapory, ponieważ metody jej wykrywania nie są w 100% niezawodne."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
-msgstr "Jeśli błąd ten nie przestanie się pojawiać, powinieneś sprawdzić, czy Twój wewnętrzny i zewnętrzny firewall jest otwarty dla portu."
+msgstr "Jeśli błąd ten nie przestanie się pojawiać – sprawdź, czy Twoje zapory wewnętrzna i zewnętrzna są otwarte dla portu."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
-msgstr "I2P chronione firewallem działa poprawnie, gdyż ruter używa \"przedstawicieli\", by przekazywać przychodzące połączenia. Nie zatem ma powodu do niepokoju."
+msgstr "I2P chronione zaporą działa poprawnie, gdyż węzeł używa \"przedstawicieli\", by przekazywać przychodzące połączenia. Nie ma zatem powodu do niepokoju."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
-msgstr ""
+msgstr "Jednakże, otrzymasz więcej ruchu i pomożesz sieci bardziej, gdy otworzysz swoją zaporę."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr "Jeśli myślisz, że już to uczyniłeś, pamiętaj, że możesz mieć zarówno hardwarowy, jak i softwarowy firewall lub być chronionym dodatkowym firewallem, nad którym nie masz kontroli."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr "Dodatkowo niektóre rutery nie mogą przekazywać zarówno TCP jak i UDP na jednym porcie lub posiadają ograniczenia, czy błędy, które nie pozwalają na ruch do I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
-msgstr "Aktualnie ruter testuje, czy Twój port UDP jest chroniony firewallem."
+msgstr "Aktualnie węzeł testuje, czy Twój port UDP jest chroniony firewallem."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr "Ruter nie jest skonfigurowany, by udostępniać swoje adresy, zatem nie spodziewa się też nadchodzących połączeń."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
-msgstr ""
+msgstr "W niektórych krajach tryb ukryty jest automatycznie włączany dla dodatkowej ochrony."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr "Skonfigurowałeś I2P, by udostępniać więcej, niż 128B/sek pasma, lecz jesteś chroniony firewallem."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr "Jeśli rzeczywiście dysponujesz pasmem szerszym niż 128KB/sek i tak skonfigurowany I2P będzie działać poprawnie, to znacznie bardziej wspomożesz sieć otwierając firewall."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr "Proszę otworzyć firewalla lub wyłączyć powyższe przychodzące połączenia TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
-msgstr ""
+msgstr "Wydaje się, że zapora blokuje TCP, więc węzeł nie przyjmuje połączeń przychodzących."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
-msgstr ""
+msgstr "Otwórz swój firewall lub włącz UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
-msgstr ""
+msgstr "ERR - Odchylenie zegara"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
-msgstr ""
+msgstr "Twój zegar systemowy jest przesunięty, co może powodować problemy w uczestnictwie w sieci."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
-msgstr ""
+msgstr "Popraw ustawienia zegara jeśli ten problem będzie dalej występować."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr "ERR - Prywatny Adres TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr "ERR - SymetrycznyNAT"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
-msgstr ""
+msgstr "I2P wykryło, że twoja zapora to symetryczny NAT."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
-msgstr ""
+msgstr "I2P nie działą dobrze za tego typu zaporami. Prawdopodobnie nie będzie przyjmowało połączeń przychodzących, co zmniejszy Twoje uczestnictwo w sieci."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr "ERR - Port UDP Jest Używany - Ustaw i2np.udp.internalPort=xxxx w ustawieniach zaawansowanych i zrestartuj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr "Po wystąpieniu tego błędu wymagany jest restart."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr "Prosimy o skonfigurowanie hosta TCP i powyższego portu lub włącz obsługę UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr "ERR - Client Manager I2CP Error - sprawdź logi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr "Dzieje się to zazwyczaj z powodu konfliktu na porcie 7654. Sprawdź logi, by to zweryfikować."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr "Czy aktualnie działa inna instancja I2P? Zatrzymaj program powodujący konflikt i zrestartuj I2P."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
-msgstr "konfiguruj peer'y"
+msgstr "konfiguruj uczestników"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
-msgstr "Konfiguracja Peer'a I2P"
+msgstr "Konfiguracja uczestnika I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
-msgstr ""
+msgstr "Ręcznie ustawienia uczestnika"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
-msgstr "Hash rutera"
+msgstr "Hash węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
-msgstr "Recznie zbanuj / odbanuj peera"
+msgstr "Recznie zbanuj / odbanuj uczestnika"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
-msgstr "Banowanie zapobiegnie udziałowi tego peer'a w tunelach, które stworzysz."
+msgstr "Banowanie zapobiegnie udziałowi tego uczestnika w tunelach, które stworzysz."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr "Dostosuj Bonusy Profilu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
 "Capacity peers are used for some exploratory tunnels. Current bonuses are "
 "displayed on the"
-msgstr ""
+msgstr "Premie mogą być dodatenie lub ujemne. Są one brane pod uwagę przy włączaniu uczestnika do grupy szybkich lub o wysokiej wydajności. Szybcy uczestnicy są używani do budowania tuneli klienckich. Uczestnicy o wysokiej wydajności są używani do budowania tuneli rozpoznawczych. Aktualne premie są pokazane na "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr "strona profili"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
-msgstr "Zbanowane peery"
+msgstr "Zbanowani uczestnicy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr "Zbanowane adresy IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr "konfiguruj ponowne seedowanie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr "Konfiguracja Ponownego Seedowania I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr "Konfiguracja Ponownego Seedowania"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
-msgstr "Ponowne Seedowanie samouruchamialnym procesem używanym do znajdowania innych ruterów, gdy po raz pierwszy dokonujesz instalacji I2P, lub gdy Twojemu ruterowi zostało zbyt mało odesłań do ruterów."
+msgstr "Ponowne seedowanie to proces znajdowania innych węzłów, gdy po raz pierwszy dokonujesz instalacji I2P, lub gdy Twojemu węzłowi zostało zbyt mało odesłań do węzłów."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr "Jeśli ponowne seedowanie się nie powiodło, powinieneś najpierw sprawdzić swoje połączenie sieciowe."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr "Zmień je tylko jeśli HTTP jest zablokowane przez restrykcyjny firewall, ponowne seedowanie się nie powiodło i posiadasz dostęp do proxy HTTP ."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr "Zobacz {0} dla instrukcji wykonania ręcznie ponownego seedowania."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "FAQ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr "Spróbuj wpierw SSL, później nie-SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr "Używaj tylko SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr "Używaj tylko nie-SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr "Reseed URLs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr "Włączyć HTTP Proxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr "HTTP Proxy Host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr "HTTP Proxy Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr "Użyć autoryzacji HTTP Proxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr "HTTP Proxy Użytkownik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr "HTTP Proxy Hasło"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr "Włączyć HTTPS Proxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr "Host Proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr "Port Proxy HTTPS"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr "Użyć autoryzacji HTTPS Proxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr "HTTPS Proxy Użytkownik"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr "HTTPS Proxy Hasło"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
-msgstr "konfiguruj ustawienia"
+msgstr "konfiguruj usługę"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr "Konfiguracja Usług I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
-msgstr "Wyłącz Ruter"
+msgstr "Wyłącz węzeł"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
-msgstr "Eleganckie zamknięcie pozwala ruterowi zakończyć już rozpoczęte zadania, ale może zająć to kilka minut."
+msgstr "Eleganckie zamknięcie pozwala węzłowi zakończyć już rozpoczęte zadania, ale może zająć to kilka minut."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
-msgstr "Jeśli chcesz wyłączyć router natychmiast, ta opcja też jest możliwa."
+msgstr "Jeśli chcesz wyłączyć węzeł natychmiast, ta opcja też jest możliwa."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
-msgstr "Jeśli chcesz, aby ruter sam dokonał restartu po zamknięciu, możesz wybrać jedno z następujących."
+msgstr "Jeśli chcesz, aby węzeł sam dokonał restartu po zamknięciu, możesz wybrać jedno z następujących."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
-msgstr "Jest to użyteczne w niektórych przypadkach - na przykład jeśli zmieniłeś któreś z ustawień, odczytywanych przez klienta jedynie przy uruchomieniu jak na przykład hasło do konsoli rutera lub interfejs, który obserwuje."
+msgstr "Jest to użyteczne w niektórych przypadkach – na przykład jeśli zmieniłeś któreś z ustawień odczytywanych przez klienta jedynie przy uruchomieniu, np. hasło do konsoli węzła lub interfejs sieciowy, na którym nasłuchuje."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
-msgstr "Elegancki restart zajmie kilka minut, ale peery, z którymi byłeś połączony, będą wdzięczni, że ich tunele nie zostały zerwane. Twardy restart następuje natychmiast i zrywa wszystkie połączenia."
+msgstr "Elegancki restart zajmie kilka minut, ale uczestnicy, z którymi byłeś połączony, będą wdzięczni, że ich tunele nie zostały zerwane. Twardy restart następuje natychmiast i zrywa wszystkie połączenia."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
-msgstr ""
+msgstr "Po zamknięciu, węzeł poczeka 1 minutę przed ponownym uruchomieniem się."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr "Integracja zasobnika systemowego"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
-msgstr "Na platformie Windows istnieje mała aplikacja, znajdująca się w zasobniku systemowym, umożliwiająca wyświetlenie statusu rutera"
+msgstr "Na platformie Windows istnieje mała aplikacja, znajdująca się w zasobniku systemowym, umożliwiająca wyświetlenie statusu węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr "(później aplikacje klienci I2P będą w stanie integrować również ich własną funkcjonalność na pasku zadań)."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr "Jeśli używasz systemu operacyjnego Windows, możesz w tym miejscu włączać/wyłączać tę ikonę."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr "Ukryj ikonę w zasobniku systemowym"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr "Uruchom przy starcie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr "Możesz wybrać, czy I2P będzie uruchamiane przy starcie poprzez wybór jednej z poniższych opcji - I2P zainstaluje (lub usunie) odpowiednią usługę."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr "Jeśli wolisz okno poleceń, możesz też uruchomić"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr "Uwaga"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
-msgstr "Jeśli używasz w tym momencie usługi I2P, usunięcie spowoduje natychmiastowe wyłączenie rutera."
+msgstr "Jeśli w tym momencie używasz I2P jako usługę, usunięcie spowoduje natychmiastowe wyłączenie węzła."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr "Możesz chcieć wziąć pod uwagę bezpieczne wyłączenie jak powyżej, a następnie uruchomienie uninstall_i2p_service_winnt.bat."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr "Odpluskwianie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr "Pokaż kolejkę zadań"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr "Czasami pomocnym może okazać się debugowanie I2P za pomocą thread dump'u. By dokonać debugowania wybierz tę opcję i przejrzyj wątek zrzucony do <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
-msgstr "Uruchom przeglądarkę kiedy router uruchamiania routera?"
+msgstr "Włączać przeglądarkę przy uruchamianiu węzła?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr "Głównym interfejsem konfiguracyjnym I2P jest ta konsola sieciowa, więc dla Twojej wygody I2P przy starcie może uruchamiać przeglądarkę internetową wskazującą na"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr "konfiguruj mapę przeglądową"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr "Konfiguracja Mapy Przeglądowej I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr "Częstotliwość Odświeżania"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr "sekundy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr "Dostosuj Mapę Przeglądową"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr "konfiguruj ststystyki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr "Konfiguracja statystyk I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr "Konfiguruj Zbiór Statystyk I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr "Włączyć pełne statystyki?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr "zmiana wymaga ponownego uruchomienia"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr "Plik statystyk"
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr "Filtr"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr "zaznacz wszystkie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr "Log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr "Wykres"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr "Zaawansowany filtr"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr "konfiguruj tunele"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr "Konfiguracja tuneli I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr "Domyślne ustawienia są odpowiednie dla większości użytkowników."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
-msgstr "Istnieje fundamentalna równowaga pomiędzy anonimowością i wydajnością."
+msgstr "Zwiększenie anonimowości zawsze odbywa się kosztem wydajności i vice versa."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
-msgstr "Tunele dłuższe, niż 3 hop'y (na przykład 2 hop'y + 0-2 hop'y, 3 hop'y + 0-1 hop'y, 3hop'y + 0-2 hop'y) lub high quantity + backup quantity, mogą poważnie zredukować wydajność lub wiarygodność."
+msgstr "Tunele dłuższe niż 3 skoki (na przykład 2 skoki + 0-2 skoki, 3 skoki + 0-1 skok, 3 skoki + 0-2 skoki) lub duża ilość tuneli podstawowych i zapasowych mogą poważnie zmniejszyć wydajność."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr "Może spowodować duże zużycie pasma wyjściowego i/lub procesora."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
-msgstr "Zmieniaj te ustawienia z uwagą, dokonuj zmian jeśli masz problemy."
+msgstr "Zmieniaj te ustawienia z rozwagą. Dokonuj zmian, jeśli pojawiają się problemy. "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
-msgstr "Ustawienia tunelu eksploatacyjnego zostały zmienione i zapisane w pliku router.config ."
+msgstr "Ustawienia tunelu rozpoznawczego zostały zmienione i zapisane w pliku router.config."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr "Zmiany tunelu klienta są tymczasowe i nie są zapisane."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
-msgstr "By dokonać permanentnych zmian tunelu klienta zobacz"
+msgstr "By dokonać permanentnych zmian tunelu klienta, zobacz"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
-msgstr "strona i2ptunnel"
+msgstr "Zarządzanie ukrytymi usługami"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr "konfiguruj UI"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr "Konfiguracja I2P UI"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
-msgstr "Motyw Konsoli Rutera"
+msgstr "Styl konsoli węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
-msgstr "Wybór motywu nie jest możliwy dla przeglądarki Internet Explorer, przepraszamy."
+msgstr "Wybór stylu nie jest możliwy dla przeglądarki Internet Explorer, przepraszamy."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
-msgstr "Jeśli nie używasz IE, prawdopodobnie Twoja przeglądarka symuluje bycie IE; prosimy o skonfigurowanie Twojej przeglądarki (lub proxy) by używać innego User Agent string jeśli chciałbyś mieć dostęp do motywów konsoli."
+msgstr "Jeśli nie używasz IE, prawdopodobnie Twoja przeglądarka symuluje bycie IE. Jeśli chciałbyś mieć możliwość zmiany stylu konsoli, prosimy o skonfigurowanie Twojej przeglądarki (lub proxy), by używać innego łańcucha User-Agent."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
-msgstr "Język konsoli rutera"
+msgstr "Język konsoli węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
-msgstr "Zapraszamy do przyłączenia się do projektu tłumaczeniowego konsoli rutera! Skontaktuj się z developerami  #i2p-dev na IRC, by pomóc."
+msgstr "Zapraszamy do przyłączenia się do projektu tłumaczenia konsoli węzła! Skontaktuj się z developerami na kanale IRC #i2p-dev."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
-msgstr "Hasło konsoli rutera"
+msgstr "Hasło konsoli węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
-msgstr "Motyw Konsoli Rutera"
+msgstr "ustawienia aktualizacji"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr "Konfiguracja Uaktualniania I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr "Sprawdź aktualności i uaktualnienia I2P  "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr "Wiadomości i aktualizacje I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr "Sprawdź aktualności"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr "Aktualności"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr "Trwa aktualizacja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr "URL wiadomości"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr "Częstotliwość odświeżania"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
-msgstr "Polityka aktualizacj"
+msgstr "Polityka aktualizacji"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
-msgstr "Pobrać wiadomości przez eepProxy?"
+msgstr "Pobierać wiadomości przez eepProxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr "Aktualizować przez eepProxy?"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr "eepProxy host"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr "eepProxy port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr "Aktualizuj adresy URL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr "Zaufane klucze"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr "Budowa Unsigned URL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr "Uaktualnienia będą dostarczane poprzez Twojego menadżera paczek."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr "główna"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr "Witaj w I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr "Książka Adresowa I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr "Otwórz w nowej karcie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr "Twoja przeglądarka nie wspiera iFrames."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr "Kliknij tu, by kontynuować."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Błąd wewnętrzny"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr "Przepraszamy! Wystąpił błąd wewnętrzny."
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr "Proszę zgłaszać błędy na {0} lub {1}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr "Możesz użyć loginu \"guest\" i hasła \"guest\", jeśli nie chcesz się rejestrować."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr "Proszę zawrzeć tę informację w raportach o błędach"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr "Szczegóły błędu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Błąd {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr "Wersja I2P oraz Uruchomione  Środowisko"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr "Zauważ, że informacje systemowe, znaczniki czasowe log'ów i wiadomości dziennika mogą dostarczać wskazówek dotyczących Twojego położenia; weryfikuj wszystko, co dołączasz do zgłoszeń o błędach."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr "Nie znaleziono strony"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
-msgstr "Przepraszamy! Próbujesz połączyć się z nieistniejącą stroną lub zasobem Konsoli Rutera."
+msgstr "Przepraszamy! Próbujesz połączyć się z nieistniejącą stroną lub zasobem konsoli węzła."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr "Błąd 404"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr "nie znaleziono"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr "wydarzenia"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr "Log wydarzeń I2P"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr "wykresy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr "Wykresy wydajności sieci I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr "Naciśnij flagę, by wybrać język. Naciśnij 'konfiguruj język' poniżej, by zmienić go później."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr "Szukaj I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr "Tematyczne Eepsite'y"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr "zarządzający tunelem I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr "Zarządzający Tunelem I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Plik Zrzutu Jar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr "kolejka zadań"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
-msgstr "Kolejka zadań Routera I2P"
+msgstr "Kolejka zadań węzła I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr "logi"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
-msgstr "Logi Routera I2P"
+msgstr "Logi węzła I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr "Logi krytyczne"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
-msgstr "Logi Routera"
+msgstr "Logi węzła"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr "Logi wydarzeń"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr "Pokaż logi wydarzeń"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr "sieciowa baza danych"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr "Baza Danych Sieci I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr "Nie Znaleziono Aplikacji Internetowej"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr "Aplikacja Sieciowa Nie Działa"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr "Wymagana aplikacja sieciowa nie jest uruchomiona."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr "Odwiedź <a href=\"/configclients.jsp#webapp\">stronę konfiguracji klientów</a> by rozpocząć."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
-msgstr "połączenia peer'a"
+msgstr "połączenia uczestnika"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
-msgstr "Peer'y Sieci I2P"
+msgstr "uczestnicy sieci I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
-msgstr "profile peer'a"
+msgstr "profile uczestników"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
-msgstr "Profile Peer'a Sieci I2P"
+msgstr "Profile uczestników sieci I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr "Dowód"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr "statystyki"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
-msgstr "Statystyki Rutera I2P"
+msgstr "Statystyki węzł I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr "Wyłącz {0} odświeżanie"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr "torrenty"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr "Menadżer Pobierania Torrentów I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr "podsumowanie tunelu"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr "Podsumowanie Tunelu I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
-msgstr "Profil peer'a"
+msgstr "Profil uczestnika"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
-msgstr "Profil dla peer''a {0}"
+msgstr "Profil uczestnika {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr "webmail"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr "Webmail I2P"
diff --git a/apps/routerconsole/locale/messages_pt.po b/apps/routerconsole/locale/messages_pt.po
index 141d5fced8208180975db59791237f05716c54ef..be3644283f51ed88bb717476bfbf5d34da89ae42 100644
--- a/apps/routerconsole/locale/messages_pt.po
+++ b/apps/routerconsole/locale/messages_pt.po
@@ -15,7 +15,7 @@
 # Rafael Ferrari, 2013
 # Ruthein Alex <rutweiller@hotmail.com>, 2012
 # Ruthein Alex <rutweiller@hotmail.com>, 2012
-# Tulio Simoes Martins Padilha, 2013
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
 # tuliouel, 2013
 # wicked, 2012
 # wicked, 2012
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -53,7 +53,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -62,7 +62,7 @@ msgstr[1] "{0} seg"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -71,64 +71,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 hora"
 msgstr[1] "{0} horas"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "indisponível"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 dia"
 msgstr[1] "{0} dias"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Banido pelo Roteador: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Banido pelo Roteador"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP banido pelo registro {0} na blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IPs banidos até reiniciar"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IPs banidos permanentemente"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "De"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Para"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "nenhum"
 
@@ -138,92 +138,92 @@ msgstr "nenhum"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Rejeitando túneis: Iniciando"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "A rejeitar túneis: Grande atraso nas mensagens"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "A rejeitar a maioria dos túneis: Grande numero de pedidos"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "A rejeitar túneis: Limite atingido"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "A rejeitar túneis: Limite de largura de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "A rejeitar a maioria dos túneis: Limite de largura de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Aceitar a maioria dos túneis"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "A aceitar túneis"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "A rejeitar túneis: A Desligar"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "A rejeitar túneis"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Ressemeando"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "A propagação encontrou apenas 1 Roteador."
 msgstr[1] "A propagação encontrou {0} Roteadores."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "A propagação falhou."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Ver {0} para ajuda."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "página de configuração de propagação"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Propagação: procurar semente de URL"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -257,7 +257,7 @@ msgstr "Quantos pares estamos comunicando ativamente"
 msgid "Known fast peers"
 msgstr "Pares conhecidos rápidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Registro do banco de dados da rede I2P"
 
@@ -267,45 +267,54 @@ msgstr "Registro do banco de dados da rede I2P"
 msgid "No transports (hidden or starting up?)"
 msgstr "Sem transportes (escondidos ou a iniciar?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Inalcançável em qualquer transporte"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Endereço de Transporte do Roteador"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} é usado para conexões de saída apenas"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP não está habilitado"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "O limite da tua conexão de transporte foi definido automaticamente baseado na configuração de largura de banda."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Para substituir esses limites, adiciona as definições i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn na página de configuração avançada."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definições"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -314,251 +323,258 @@ msgstr "Definições"
 msgid "Peer"
 msgstr "Par"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "O Par/Vizinho remoto, identificado pelo hash de roteador"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dir"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Conexões de entrada"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Conexões de saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Eles se ofereceram para nos ajudar (ajudando os outros iniciarem conexões de entrada atravessando o seu firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Nos oferecemos para ajudar (ajudar outros atravessar o firewall deles)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Quanto tempo desde que o ultimo pacote foi recebido / enviado"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Inativo"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Entrada/Saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "A suavizada taxa de transferência de entrada / saída (KBytes por segundo)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "A quanto tempo foi estabelecida esta conexão"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Cima"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Skew"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "A diferença entre o relógio do Par e o seu"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "A janela de congestionamento, que é quantos bytes podem ser enviados sem reconhecimento"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "O numero de mensagens enviadas que aguardam reconhecimento"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "O numero máximo de mensagens para enviar em simultâneo"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "O numero de envios pendentes que excede a janela de congestionamento"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "O limitador de inicio lento "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "O tempo de ida e volta em milisegundos"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "O tempo limite de retransmissão de milisegundos"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Limite máximo actual de tamanho de pacotes / máximo estimado de tamanho de pacotes (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "O numero total de pacotes enviados pelo par"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "O numero total de pacotes recebidos pelo par"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "O numero total de pacotes retransmitidos para o par"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "O numero total de pacotes recebidos em duplicado pelo par"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Configuração comum da WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Estado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Fluxo de subida"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Fluxo de descida"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Conexão PPP na WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Tempo em funcionamento"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP Externo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Encaminhamento Layer 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Serviço de Conexão Padrão"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Conexão IP WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Configuração link ethernet WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Dispositivo encontrado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Sub dispositivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Status UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Dispositivos UPnP desactivados."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP está desligado. Você por acaso tem mais que 1 roteador UPnP na sua LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP não encontrou nenhum dispositivo compatível na sua LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "O endereço IP externo informado pelo UPnP é {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "O endereço IP externo atual não está disponível"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP informa que o fluxo de descida de dados no máximo é {0}bits/seg"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP informa que o fluxo de subida de dados no máximo é {0}bits/seg"
@@ -567,280 +583,276 @@ msgstr "UPnP informa que o fluxo de subida de dados no máximo é {0}bits/seg"
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "porta {0} {1,number,#####} foi redirecionada com sucesso pelo UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "Porta {0} {1,number,#####} NÃO foi redirecionada pelo UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP não está habilitado"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Desacertar excessivo do relógio: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Conexões NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Tempo Limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Fila de Saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Voltar Logado?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Entrada"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} par"
 msgstr[1] "{0} pares"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Conexões UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Ordenar por tipos de Pares"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Direcção/Introdução"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Ordenar por entrada inactiva"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Ordenar por saída inactiva"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Ordenar por taxa de entrada"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Ordenar por taxa de saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Ordenar por tempo de conexão ligada"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Ordenar por desajustamento do relógio"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Ordenar por janela de congestionamento"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Ordenar por limitador de inicio lento "
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Ordenar por tempo de ida e volta"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Ordenar por tempo limite de retransmissão"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Ordenar por unidade de transmissão de saída máxima"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Ordenar por envio de pacotes"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Ordenar por pacotes recebidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Ordenar por pacotes retransmitidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Ordenar por pacotes recebidos mais que uma vez"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Oferecemos-nos para os apresentar"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Eles oferecem-se para nos apresentar"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Sufocada"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 falha"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} falhas"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Banido"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "backlogged"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "A cancelar pedidos de túneis: Demasiado lento"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "A descartar pedidos de túnel: Sobrecarregado"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "A rejeitar túneis: Sobrecarga de pedidos"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "A rejeitar túneis: Limite de conexão"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "A rejeitar pedidos de túneis: Carga elevada"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "A descartar pedidos de túneis: Tempo de fila"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Nova versão para a extensão {0} está disponível"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Não foi possível verificar por atualizações {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Nenhuma versão nova disponível para extrensão {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} bytes transferidos"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Falha na transferência de {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Atualização baixada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Reiniciando"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Atualização verificada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "de {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Arquivo de atualização sem assinatura {0} está corrompido"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Cópia para {0} falhou"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Actualizações na rede desactivadas. Verifique o gestor de pacotes."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Não possui permissões de escrita no directório de instalação do I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Necessita primeiro de actualizar para a versão {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Java na versão {0} é requerido, no entanto a versão {1} é a actualmente instalada"
@@ -1348,8 +1360,8 @@ msgid "Add Client"
 msgstr "Adicionar cliente"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Cliente"
 
@@ -1380,9 +1392,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versão"
 
@@ -1404,7 +1416,7 @@ msgstr "Licença"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Website"
 
@@ -1417,7 +1429,7 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Verificar por actualizações "
@@ -1439,7 +1451,7 @@ msgstr "Apagar"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1449,7 +1461,7 @@ msgstr "Apagar selecionados"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1468,6 +1480,7 @@ msgstr "Voltar ao padrão"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1548,7 +1561,7 @@ msgstr "Destino invalido"
 msgid "Log overrides updated"
 msgstr "Substituições de registros atualizadas"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Log de configuração salva"
 
@@ -1597,7 +1610,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Remover"
 
@@ -1616,7 +1629,7 @@ msgid "Home Page"
 msgstr "Página inicial"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Network"
 
@@ -1672,8 +1685,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnels"
@@ -1692,15 +1705,15 @@ msgid "Logging"
 msgstr "Logging"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Pares"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Stats"
 
@@ -1713,7 +1726,7 @@ msgstr "Advanced "
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1823,16 +1836,16 @@ msgstr "Actualizando participação percentual de banda larga"
 msgid "Updated bandwidth limits"
 msgstr "Actualizado limites de banda larga"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "Desconhecido"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits por segundo"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "ou {0} bytes por mês no máximo"
@@ -2398,7 +2411,7 @@ msgstr "Nome de usuário"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Adicionar"
 
@@ -2407,86 +2420,86 @@ msgstr "Adicionar"
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Atualização ou verificação já em andamento"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Atualização disponível, tentando baixar agora"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Atualização disponível, clique no botão à esquerda para baixar"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Nenhuma atualização disponível"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Atualizando a URL de notícias para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "interno"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Alterando servidor proxy para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Alterando porta do proxy para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Alterando período de atualização para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nunca"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Alterando política de atualização para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Actualizando actualização de URL ."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Atualizando chaves confiadas."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Alterando URL de atualizações não assinadas para {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Sempre"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Avisar apenas"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Descarregar e verificar apenas"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Descarregar, verificar e reiniciar"
 
@@ -2644,7 +2657,7 @@ msgid "{0} for {1}"
 msgstr "{0} para {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Taxa de uso"
 
@@ -2758,12 +2771,12 @@ msgid "Graph settings saved"
 msgstr "Configurações de gráfico salvas"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Livro de endereços"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Gerenciar o seu arquivo de hosts I2P aqui (resolução de nomes de domínio I2P)"
 
@@ -2794,17 +2807,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Configuração da página inicial do I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Cliente do webmail anônimo"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Ajuda do Roteador I2P"
 
@@ -2814,17 +2827,17 @@ msgid "Router Console"
 msgstr "Painel do Roteador"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Cliente BitTorrent anônimo embutido"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrentes"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Servidor web local"
 
@@ -2910,10 +2923,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Documentos técnicos"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "Web site simples e rápido de micro blogues."
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2996,7 +3007,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "O navegador não está configurado adequadamente para usar o proxy HTTP em {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nome"
 
@@ -3146,148 +3157,157 @@ msgid "Unpublished"
 msgstr "Não publicado"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Expira em {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Expirado {0} atrás"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Concessão"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Túnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Não iniciado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Estatísticas do roteador I2P"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Contagem"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "País"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Nossas informações"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Informações do Par para"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Informação completa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Escondido"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Atualizado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} atrás"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publicado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Endereço(s)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "custo"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Invisível ou iniciando"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU com intermediadores"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP e SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP e SSU com intermediadores"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "Apenas IPv6 com introdutores SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "SSU IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "SSU introdutores com IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "NTCP IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "NTCP e SSU com IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "NTCP e SSU introdutores com IPv6"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "Apenas NTCP e SSU introdutores com IPv6"
 
@@ -3306,7 +3326,7 @@ msgid "Hide news"
 msgstr "Esconder notícias"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Mostrar notícias"
 
@@ -3387,7 +3407,7 @@ msgid "Failing"
 msgstr "Falhando"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrado"
 
@@ -3600,7 +3620,7 @@ msgid "Lifetime average frequency"
 msgstr "Média total de frequência"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3651,282 +3671,282 @@ msgstr "Dados do Gráfico"
 msgid "Graph Event Count"
 msgstr "Contador de Eventos do Gráfico"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exportar dados como arquivo XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Valor médio total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "Ajuda do Roteador I2P &amp; Perguntas Frequentes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Ajuda &amp; Perguntas Freqüentes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Configurar o inicio de clientes e webapps (serviços); iniciar manualmente os serviços parados"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Serviços I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configurar Roteador I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Detalhes I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Ver túneis estabelecidos e estado da construção de túneis"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Mostrar todas conexões atuais com os pares"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Mostrar perfis de performance recentes dos pares"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Mostrar lista de todos os roteadores I2P conhecidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "Banco de dados da rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Relatório de Saúde"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Registros"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Gráfico de performance do roteador"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Estatísticas textuais de performance do roteador"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Destinos Locais"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Túnel I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Geral"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Tua identidade local é a identificação do roteador I2P, parecido com um endereço IP mas para a rede I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Não reveles isso a ninguém, pois isso pode revelar teu endereço IP externo."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Identidade local"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Seu identificador I2P único é"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "nunca mostre-o para alguém"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "mostrar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Versão do I2P sendo usada agora"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Tempo de duração desta sessão"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Tempo em funcionamento"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Ajuda na configuração do seu firewall e roteador para o melhor desempenho I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configurar atualizações I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Atualizações do I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Pares que estivemos conversando nos últimos minutos ou na última hora"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Ativos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Número de pares disponíveis para construir túneis cliente"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Rápidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Número de pares disponíveis para construir túneis exploradores"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Alta capacidade"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "O número de pares disponíveis para as consultas ao banco de dados da rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Número total de pares em nosso banco de dados da rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Conhecidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configurar limites de velocidade"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Velocidade entr/sai"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Usados"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Usado para criar e testar túneis, e comunicar com pares de floodfill"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Exploradores"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Túneis usados para prover ou acessar serviços na rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Túneis com nossa participação, contribuindo diretamente para a transmissão de dados da rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Participantes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "A proporção de Saltos de Túnel que oferecemos para Saltos de Túnel que usamos - um valor acima de 1.00 indica uma contribuição positiva para a rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Razão de compartilhamento"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "O quê está na fila de tarefas do roteador?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Congestionamento"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indica o desempenho do roteador"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Atraso tarefa"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indica quão rapidamente mensagens saindo para outros roteadores I2P são enviadas"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Atraso de mensagem"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Tempo de retorno da mensagem para um teste de túnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Atraso túnel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "Pedidos enfileirados vindos de outros roteadores para participar em túneis"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Backlog"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Notícias &amp; Atualizações"
 
@@ -4000,43 +4020,43 @@ msgstr "ERR-UDP desligado e Host/Porta do TCP de entrada não configurado"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN-Firewall bloqueando e UDP desligado"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Adic./remover/editar &amp; controlar seus tuneis de cliente e servidor"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Servidor"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Mostrar túneis"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Concessões vencidas"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Reconstruindo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "atrás"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Pronto"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Construindo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Construindo túneis"
 
@@ -4044,31 +4064,31 @@ msgstr "Construindo túneis"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "clientes compartilhados"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Clique Reiniciar para instalar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Clique Desligar e reiniciar para instalar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versão {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Actualização disponível."
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Download {0} Atualização"
@@ -4077,40 +4097,40 @@ msgstr "Download {0} Atualização"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Download Atualização<br>Não assinada {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Ajuda com a configuração do firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Verificar as conexões de rede e o firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Ressemear"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Ordem"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Topo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Baixo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Baixo"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Selecione uma seção a ser adicionada"
 
@@ -4383,6 +4403,10 @@ msgstr "Criptografia"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Túnel I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4700,7 +4724,7 @@ msgstr "Configuração avançada de rede"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4788,13 +4812,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Desabilitado - Clientes fora deste processo Java não podem conectar"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "Porta I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "Interface I2CP"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Porta I2CP"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorização"
@@ -4881,13 +4905,14 @@ msgid "Search Engines"
 msgstr "Mecanismos de busca"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Eepsites recomendados"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Serviços locais"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4946,48 +4971,53 @@ msgstr "Configurar opções de log do I2P"
 msgid "Log file"
 msgstr "Arquivo log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(o símbolo '@' será substituído durante o log rotate)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Formato do log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(usar 'd' = data, 'c' = classe, 't' = tarefa, 'p' = prioridade, 'm' = mensagem)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Formato de datas em relatórios"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM\" = mês, 'dd' = dia, 'HH' = hora, 'mm' = minutos, 'ss' = segundos, 'SSS' = milissegundos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Tamanho max. do log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Nível de log padrão"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG e INFO não são recomendados, pois deixam servidor I2P mais lento)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Mudar nível de log"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Novo nível"
 
@@ -6175,18 +6205,6 @@ msgstr "Clique numa bandeira para selecionar um idioma. Clique 'configurar idiom
 msgid "Search I2P"
 msgstr "Busca I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Eepsites importantes"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "gerenciador de túneis I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Gerenciador de túneis I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Dump arquivo Jar"
diff --git a/apps/routerconsole/locale/messages_pt_BR.po b/apps/routerconsole/locale/messages_pt_BR.po
index 7ed13592011c9b5faa5a8507c8f67dcbe3cf132d..91fd0a3e6f0cd955edf1982f9e0adb7eb258477c 100644
--- a/apps/routerconsole/locale/messages_pt_BR.po
+++ b/apps/routerconsole/locale/messages_pt_BR.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-09-01 00:51+0000\n"
-"Last-Translator: blueboy\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[1] ""
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -50,7 +50,7 @@ msgstr[1] "{0} seg"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -59,64 +59,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} horas"
 msgstr[1] "{0} horas"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0} dias"
 msgstr[1] "{0} dias"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Banido pela hash do roteador: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Banido pela hash do roteador"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP banido pela entrada {0} de blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
-msgstr ""
+msgstr "IPs banidos até reinicialização"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
-msgstr ""
+msgstr "IPs banidos permanentemente"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
-msgstr "D"
+msgstr "De"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Para"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr ""
 
@@ -126,90 +126,92 @@ msgstr ""
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Rejeitando túneis: inicializando"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Rejeitando túneis: mensagens com tempo de retardo alto"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Rejeitando a maioria dos túneis: Muitos pedidos"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Rejeitando túneis: limite atingido"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Rejeitando túneis: limitação na largura de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Rejeitando a maioria dos túneis: limitação na largura de banda"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Aceitando a maioria dos túneis"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Aceitando túneis"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Rejeitando túneis: desligando"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Rejeitando túneis"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, 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:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Ver {0} para obter ajuda."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -243,7 +245,7 @@ msgstr ""
 msgid "Known fast peers"
 msgstr "Nodos rápidos conhecidos"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Entrada do BD da rede"
 
@@ -253,298 +255,314 @@ msgstr "Entrada do BD da rede"
 msgid "No transports (hidden or starting up?)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Tipo de assinatura sem suporte"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Endereços de transporte do roteador"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} é usado somente por conexões de saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Para sobrescrever estes limites, adicione as espeficações i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn na página de configurações avançadas."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definições"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Nó remoto, identificado pela hash do roteador"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dir"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Conexão entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Conexão de saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
-msgstr ""
+msgstr "Oferecemos-nos para introduzí-los (ajude outros usuários a atravessar o firewall)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Entrada/Saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Defasagem"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr ""
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Número total de pacotes enviados ao nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "O número total de pacotes recebidos do nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "O número total de pacotes retransmitidos ao nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "O número total de pacotes duplicados recebidos do nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Serviço"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Ligado a"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP externo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Serviço de conexão pré-definido"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Dispositivo encontrado"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
-msgstr ""
+msgstr "Subdispositivo"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -553,275 +571,276 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Entrante"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Saída"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} nó"
 msgstr[1] "{0} nodos"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Ordenar pela hash do nó"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Direção/Introdução"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
-msgstr ""
+msgstr "Ofereceram-se para nos introduzir"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Obstruído"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 falha"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} falhas"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Banido"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr ""
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Rejeitando túneis: limitado pela conexão"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Um nova versão da extensão {0} está disponível"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Não há nenhuma nova versão da extensão {0} disponível"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B transferidos"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Atualização baixada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Reinicializando"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Atualização verificada"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "de {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "A cópia para {0} falhou"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -832,167 +851,175 @@ msgid "Checking for update of plugin {0}"
 msgstr ""
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Atualizando"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../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:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr "Baixar extensão de {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr "Extensão baixada"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr "Não é possível criar o diretório da extensão {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
-#, java-format
-msgid "Plugin from {0} is corrupt"
-msgstr "A extensão de {0} está corrompida"
-
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
-#, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
-msgstr "A extensão de {0} não contém o arquivo de configuração necessário"
-
 #. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
 #. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
 msgid "Plugin from {0} contains an invalid key"
 msgstr "A extensão de {0} contém uma chave inválida"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
 msgid "Plugin signature verification of {0} failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
+#, java-format
+msgid "Plugin from {0} is corrupt"
+msgstr "A extensão de {0} está corrompida"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
+#, java-format
+msgid "Plugin from {0} does not contain the required configuration file"
+msgstr "A extensão de {0} não contém o arquivo de configuração necessário"
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr "A extensão de {0} possui nome ou versão inválidos"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr "Esta extensão requer a versão {0} ou mais recente do roteador I2P"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
-msgstr ""
+msgstr "Não foi possível copiar a extensão para o diretório {0}"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
-msgstr ""
+msgstr "A extensão será instalada na pŕoxima reinicialização."
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr "A extensão {0} foi instalada"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr "A extensão {0} foi instalada e inicializada"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
-msgstr ""
+msgstr "A extensão {0} foi instalada mas falhou ao inicializar, verifique os logs"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
-msgstr ""
+msgstr "A extensão {0} foi instalada mas falhou ao inicializar"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr ""
@@ -1000,134 +1027,136 @@ msgstr ""
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:192
 #, java-format
 msgid "Updating from {0}"
-msgstr ""
+msgstr "Atualizando a partir de {0}"
 
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:265
 #, java-format
 msgid "No new version found at {0}"
 msgstr "Nenhuma nova versão de {0} foi encontrada"
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "Painel do roteador I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr "Configuração salva com sucesso"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1135,313 +1164,314 @@ msgid ""
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr "Salvar configuração do cliente"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "Salvar configuração da interface"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "Salvar configuração da extensão"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Instalar extensão"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Extensão deletada {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr ""
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Inicializar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "Mais um cliente adicionado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "Configuração da extensão salva."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "inicializado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Falhou ao iniciar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Falhou ao procurar servidor"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr "Nenhum URL da extensão foi especificado."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr "Nenhum URL de atualização foi especificado para {0}."
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
-msgstr ""
+msgstr "Usuário {0} adicionado"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
-msgstr ""
+msgstr "Configuração da interface salva"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
-msgstr ""
+msgstr "Reinicialização necessária para que se tenha efeito"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Editar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Adicionar cliente"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr "Classe e argumentos"
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Cliente"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Executar na inicialização?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Executar na inicialização?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr "Classe e argumentos"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Descrição"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Extensão"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versão"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Assinado por"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Data"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Autor"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Licença"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Website"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Linque de atualização"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Parar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Verificar se há atualizações"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Quer mesmo deletar {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 msgstr "Deletar"
 
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
-msgstr ""
+msgstr "Adicionar item"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Salvar"
 
@@ -1472,12 +1502,12 @@ msgid "Removed"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Adicionar chave"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Deletar chave"
 
@@ -1519,7 +1549,7 @@ msgstr "Destino inválido"
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr ""
 
@@ -1542,7 +1572,7 @@ msgstr ""
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr ""
 
@@ -1551,24 +1581,24 @@ msgid "DEBUG"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERRO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFORMAÇÃO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "AVISO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Remover"
 
@@ -1587,53 +1617,54 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Rede"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr ""
 
@@ -1642,8 +1673,8 @@ msgid "UI"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Túneis"
@@ -1653,7 +1684,7 @@ msgid "Clients"
 msgstr "Clientes"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr ""
 
@@ -1662,15 +1693,15 @@ msgid "Logging"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Nós"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Estatísticas"
 
@@ -1680,139 +1711,135 @@ msgstr "Avançado"
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr "Salvar modificações"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr "Atualizando endereço IP"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bits por segundo"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr "Banir nó até reinicializar"
 
@@ -1832,7 +1859,7 @@ msgid "Invalid peer"
 msgstr "Nó inválido"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr "Nó desbanido"
 
@@ -1845,7 +1872,7 @@ msgid "is not currently banned"
 msgstr "não se encontra banido"
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr ""
 
@@ -1862,7 +1889,7 @@ msgid "Unsupported"
 msgstr "Sem suporte"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr ""
 
@@ -1881,9 +1908,9 @@ 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr "Desligar imediatamente"
 
@@ -1938,118 +1965,118 @@ msgstr[1] ""
 msgid "Restart in {0}"
 msgstr "Reinicializar em {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr "Executar a I2P na inicialização"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr "Não execute a I2P na inicialização"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr "Visualizar painel da inicialização"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr "Mostrar painel na inicialização"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr "Não visualizar painel na inicialização"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr "Serviço instalado"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr "Serviço removido"
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr ""
 
@@ -2090,7 +2117,7 @@ msgid "Refresh interval must be a number"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr ""
 
@@ -2105,7 +2132,7 @@ msgid "Summary bar will refresh shortly."
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr ""
 
@@ -2138,117 +2165,117 @@ 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 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/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0} saltos"
 msgstr[1] "{0} saltos"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0} túneis"
 msgstr[1] "{0} túneis"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr "Túneis exploratórios"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr "comprimento"
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr "Randomização"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr "Quantidade"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr "Opções de entrada"
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr "Opções de saída"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr "Alteração do tema salva."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr "Para visualizar, recarregue a página."
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr ""
@@ -2261,50 +2288,46 @@ msgstr ""
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Alemão"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "Inglês"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Francês"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr ""
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr ""
@@ -2343,596 +2366,734 @@ msgid "Russian"
 msgstr "Russo"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Senha"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Nunca"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Sempre"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Informar apenas"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Baixar e verificar apenas"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Baixar, verificar e reinicializar"
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
 msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
-msgstr "{0} para {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
-msgstr "Uso da largura de banda"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+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:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr ""
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr "{0} para {1}"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr "Uso da largura de banda"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
 msgid "Smaller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
 msgid "Taller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
 msgid "Shorter"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
 msgid "Wider"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
 msgid "Narrower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
 msgid "Larger interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
 msgid "Smaller interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
 msgid "Previous interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
 msgid "Next interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
 msgid "Plot averages"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
 msgid "plot events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
 msgid "All times are UTC."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Configure Graph Display"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
 msgid "Select Stats"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+#: ../java/src/net/i2p/router/web/GraphHelper.java:360
 msgid "Periods"
 msgstr "Períodos"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
 msgid "or"
 msgstr "ou"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "Image sizes"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
 msgid "width"
 msgstr "largura"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr "altura"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr "pixels"
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Livro de endereços"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Cliente de webmail anônimo"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Ajuda do roteador I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr "Painel do roteador"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrentes"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 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:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, 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:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 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:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr "localização do arquivo"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr "Nenhuma mensagem de registro"
 
@@ -2962,170 +3123,179 @@ msgstr ""
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr "Roteador"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr "não encontrado no banco de dados da rede"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr "Local"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr "Não publicado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destino"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Expira em {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Expirou a {0} atrás"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Túnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Não inicializado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Contagem"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Trasportes"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "País"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Informação nossa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Entrada completa"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Atualizado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} atrás"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publicado"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Endereço(s)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "custo"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Oculto ou inicializando"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP e SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3144,229 +3314,229 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr ""
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, 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:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, 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:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, 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:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr "Capacidade"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr "Integração"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr "Padrão"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr ""
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr "perfil"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr "nodos rápidos"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr "nodos de alta capacidade"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr "nodos bem integrados"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr "grupos"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 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:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr "velocidade"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr "capacidade"
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr ""
 
@@ -3438,7 +3608,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3489,282 +3659,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exportar dados como XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Ajuda &amp; Perguntas Frequentes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Serviços I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configurar o roteador I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Mostrar uma lista com todos os roteadores I2P conhecidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Registros"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
-msgstr "Destinos locais"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Túnel I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Informações gerais"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Identidade local"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "O identificador, único, do seu roteador I2P é"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "nunca revele-o para alguém"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "mostrar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Ligado a"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Ativos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Rápidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Com alta capacidade"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "O número total de nodos em nosso banco de dados da rede"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Conhecidos"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Largura de banda: Entrada/Saída"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Usados"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Exploratórios"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Participantes"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Taxa de compartilhamento"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "O que está na fila de tarefas do roteador?"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Congestionamento"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3778,98 +3948,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Testando"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr "ERR-Endereço TCP privado"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr "ERR-NATsimétrico"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr ""
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr "Sob Firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 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:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN - Sob Firewall com UDP proibido."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Servidor"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Mostrar túneis"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -3877,31 +4052,31 @@ 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versão {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -3910,40 +4085,40 @@ msgstr ""
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Ajuda com a configuração do Firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -3976,120 +4151,120 @@ msgstr ""
 msgid "now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr "Túneis de cliente para"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr "Túneis participantes"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr "Uso"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr "Participante"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr "Túneis participantes inativos"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr "entrada"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr "saída"
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr ""
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr "livro de endereços"
 
@@ -4216,6 +4391,10 @@ msgstr "Criptografia"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Túnel I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4314,343 +4493,351 @@ msgstr ""
 msgid "itag2"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr ""
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr ""
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, 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:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 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:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 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:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr "Configuração avançada da I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr "Configuração do cliente I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr "Configuração do cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr "Autorizado sem SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr "Autorizado com necessidade de SSL"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
-msgstr "Porta do I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
 msgid "I2CP Interface"
 msgstr "Interface do I2CP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Porta do I2CP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorização"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr "Necessário nome de usuário e senha"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4660,7 +4847,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4668,711 +4855,719 @@ msgid ""
 "preferred method."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr "Instalação de extensão"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr "Página do túnel I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr "Configuração de IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr "Especificar o hostname ou IP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr "Experimental"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr "Configuração do UDP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr "porta do UDP:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr "Configuração do TCP"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr "Usar endereço de IP automaticamente detectado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr "atualmente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr "Especificar porta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr "Ajuda de configuração"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr "Aparentemente, a porta do UDP não está sob Firewall."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr "Parece que a porta do UDP está sob Firewall."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr "AVISO - Sob Firewall com UDP bloqueado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr "ERR - Endereço de TCP privado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr "ERR - NATsimétrico"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr "Por favor, configure um host e uma porta para o TCP acima ou habilite o UDP."
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr "Configuração do nó I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr "Hash do roteador"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr "Banir manualmente / Desbanir um nó"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5380,749 +5575,753 @@ msgid ""
 "displayed on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr "Página de perfis"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr "Nodos banidos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr "IPs banidos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr "a FAQ"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr "Depurando"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr ""
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr "Configuração do túnel I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr "página do túnel i2p"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr "Tema do painel do roteador"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr "Idioma do painel do roteador"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr "Configuração das atualizações da I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr "Novidades &amp; Atualizações da I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr "Atualização em andamento"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr ""
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr "Conexões de nodos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
 msgstr "Nodos da rede I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr "perfis dos nodos"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
 msgstr "Perfis dos nodos da rede I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr "Perfil do nó"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr "Perfil para o nó {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_ro.po b/apps/routerconsole/locale/messages_ro.po
index df307bcdbd3270dc3c5bef8b1a76876cd45b0b45..c0a7b3bc66c9e417185122f680bdc4d7b68616e4 100644
--- a/apps/routerconsole/locale/messages_ro.po
+++ b/apps/routerconsole/locale/messages_ro.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the routerconsole package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 # CimpianAlin <inactive+CimpianAlin@transifex.com>, 2013
 # Predator <Predator@windowslive.com>, 2013
@@ -11,27 +11,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 22:02+0000\n"
-"PO-Revision-Date: 2014-09-08 20:19+0000\n"
-"Last-Translator: Petre Catalin Alexandru <cosmoreddog@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/"
-"ro/)\n"
-"Language: ro\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#. NOTE TO TRANSLATORS: Feel free to translate all these as you see fit, there are several options...
-#. spaces or not, '.' or not, plural or not. Try not to make it too long, it is used in
+#. NOTE TO TRANSLATORS: Feel free to translate all these as you see fit, there
+#. are several options...
+#. spaces or not, '.' or not, plural or not. Try not to make it too long, it
+#. is used in
 #. a lot of tables.
 #. milliseconds
 #. Note to translators, may be negative or zero, 2999 maximum.
-#. {0,number,####} prevents 1234 from being output as 1,234 in the English locale.
+#. {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:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +42,7 @@ msgstr[2] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -51,7 +52,7 @@ msgstr[2] "{0} sec"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -61,7 +62,7 @@ msgstr[2] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -69,13 +70,13 @@ msgstr[0] "1 hour"
 msgstr[1] "{0} hours"
 msgstr[2] "{0} hours"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -83,109 +84,113 @@ msgstr[0] "1 zi"
 msgstr[1] "{0} zile"
 msgstr[2] "{0} zile"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Banat de hash router: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Banat de hash router"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP-urile banate de blocklist.txt {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP-uri Banat până la repornire"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP-uri Permanent banate"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "De la "
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Pentru"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "nici unul"
 
 #. NPE, too early
 #. if (_context.router().getRouterInfo().getBandwidthTier().equals("K"))
-#. setTunnelStatus("Not expecting tunnel requests: Advertised bandwidth too low");
+#. setTunnelStatus("Not expecting tunnel requests: Advertised bandwidth too
+#. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Tuneluri de respingere: Startarea"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Respingere tuneluri: Mesajul are întârziere mare"
 
 #. hard to do {0} from here
-#. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
+#. tunnels: High number of requests");
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Respingere a majoritatea tunelurilor: Număr mare de cereri"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Respingere tuneluri: Limită atinsă"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Respingere tuneluri: Limita de lățime de bandă"
 
 #. hard to do {0} from here
-#. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels: Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
+#. Bandwidth limit");
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Respingere a majoritatea tunelurilor: Limită lățime de bandă"
 
 #. hard to do {0} from here
-#. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
+#. tunnels");
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Accepta majoritatea tunelurilor"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Accepta tuneluri"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Respingere tuneluri: Oprire"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Refuza tuneluri"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseeding"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
@@ -193,34 +198,33 @@ msgstr[0] "Însământarea a adus doar 1 router."
 msgstr[1] "Însământarea a preluat doar {0} routere."
 msgstr[2] "Reseed a preluat doar {0} routere."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed a eșuat."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Vezi {0} pentru ajutor."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "Pagina de configurare pentru reseed"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseeding: preluare a URL-ului de seed."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
-msgstr ""
-"Reseeding: preluare informații din router de la URL-ul de seed ({0} succes "
-"{1} erori de succes,)."
+msgstr "Reseeding: preluare informații din router de la URL-ul de seed ({0} succes {1} erori de succes,)."
 
-#. NOTE TO TRANSLATORS - each of these phrases is a description for a statistic
+#. NOTE TO TRANSLATORS - each of these phrases is a description for a
+#. statistic
 #. to be displayed on /stats.jsp and in the graphs on /graphs.jsp.
 #. Please keep relatively short so it will fit on the graphs.
 #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:33
@@ -247,59 +251,64 @@ msgstr "Cu câți colegii vorbim în mod activ"
 msgid "Known fast peers"
 msgstr "Colegii rapizi cunoscute"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Intrare NetDb"
 
-#. This used to be "no common transports" but it is almost always no transports at all
+#. This used to be "no common transports" but it is almost always no
+#. transports at all
 #: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:73
 msgid "No transports (hidden or starting up?)"
 msgstr "Nici un transport (ascunse sau în pornire?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Inaccesibil pe orice transport"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Adrese de transport Router"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} conexiuni de ieșire sunt folosite"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP nu este activat"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
-msgstr ""
-"Limitele de conexiune de transport sunt setate automat în funcție de lățimea "
-"de bandă configurată."
+msgstr "Limitele de conexiune de transport sunt setate automat în funcție de lățimea de bandă configurată."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
-msgstr ""
-"Pentru a trece peste aceste limite, se adaugă i2np.tcp.maxConnections "
-"setările = nnn n i2np.udp.maxConnections = nnn pe pagina de configurare "
-"avansată."
+msgstr "Pentru a trece peste aceste limite, se adaugă i2np.tcp.maxConnections setările = nnn n i2np.udp.maxConnections = nnn pe pagina de configurare avansată."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definiții"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -308,328 +317,323 @@ msgstr "Definiții"
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Peer de la distanța, identificat de hash router"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dir"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Conexiune de intrare"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Conexiune de ieșire"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
-msgstr ""
-"Ei sau oferit să ne introducă ( ajută alți peer să treacă de firewalul "
-"nostru)"
+msgstr "Ei sau oferit să ne introducă ( ajută alți peer să treacă de firewalul nostru)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-msgid "We offered to introduce them (help other peers traverse their firewall)"
-msgstr ""
-"Noi ne oferim sa îi introducem pe ei ( ajută alți peer să treacă de "
-"firewalul lor)"
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
+msgid ""
+"We offered to introduce them (help other peers traverse their firewall)"
+msgstr "Noi ne oferim sa îi introducem pe ei ( ajută alți peer să treacă de firewalul lor)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Cât de mult timp a trecut de când un pachet a fost primit / trimis"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Inactiv"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "In/Out"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Rata de transfer la intrare / ieșire (KBytes pe secundă)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Acum cât de mult timp în urmă a fost stabilită acestă conexiune"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "În sus"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Oblic"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Diferența dintre ceasul unui peer și al tău"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
-msgstr ""
-"Ferestra de congestie, arată cât de mulți bytes pot fi trimiși fără "
-"confirmare"
+msgstr "Ferestra de congestie, arată cât de mulți bytes pot fi trimiși fără confirmare"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Numărul de mesaje trimise care așteaptă confirmarea"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Numărul maxim de mesaje simultane pentru trimitere"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
-msgstr ""
-"Numărul celor care așteaptă să fie trimise si care depășesc fereastra de "
-"congestie"
+msgstr "Numărul celor care așteaptă să fie trimise si care depășesc fereastra de congestie"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Start lent"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Timpul de călătorie dus-întors în milisecunde"
 
-#. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The standard deviation of the round trip time in milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
+#. standard deviation of the round trip time in
+#. milliseconds")).append("<br>\n" +
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Timpul de expirare retransmis în milisecunde"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
-msgstr ""
-"Curent maxim trimite dimensiunea pachetului / maxima estimată pentru "
-"primirea dimensiunii pachetului (bytes)"
+msgstr "Curent maxim trimite dimensiunea pachetului / maxima estimată pentru primirea dimensiunii pachetului (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Numărul total de pachete trimise la peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Numărul total de pachete primite de la peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Numărul total de pachete retransmise la peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Numărul total de pachete duplicat primite de la peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Serviciu"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Interfață comuna de configurare WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Stare"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Tip"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "în amonte"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "în aval"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Conexiune WAN PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Disponibilitate"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP extern"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Stratul 3 Transmiterea"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Serviciul de conexiune implicit"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Conexiune WAN IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet Link configurare"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Dispozitiv găsit"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Subdispozitiv"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Stare UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
-msgstr ""
-"UPnP a fost dezactivat, Ai mai mult de un dispozitiv UPnP Internet Gateway "
-"pe LAN?"
+msgstr "UPnP a fost dezactivat, Ai mai mult de un dispozitiv UPnP Internet Gateway pe LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP nu a găsit nici un dispozitiv UPnP-conștient, compatibil pe LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "IP-ul curent extern raportat de UPnP este {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "IP-ul curent extern nu este disponibil."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP raportează rata de biți maximă în aval este {0} biti / sec"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP raportează rata de biți maximă în amonte este {0} biti / sec"
 
 #. {0} is TCP or UDP
-#. {1,number,#####} prevents 12345 from being output as 12,345 in the English locale.
+#. {1,number,#####} prevents 12345 from being output as 12,345 in the English
+#. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0}port {1,number,#####} a fost înaintat cu succes prin UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0}port {1,number,#####} n-a fost înaintat cu succes prin UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP nu este activat"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Ceas deviat excesiv: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Conexiune NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Limită"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "În lista de așteptare"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Conectat înapoi?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "De intrare"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "De ieșire"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
@@ -637,214 +641,213 @@ msgstr[0] "{0} utilizator"
 msgstr[1] "{0} utilizatori"
 msgstr[2] "{0} utilizatori"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Conexiuni UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sortat după hash-ul peer-ului"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Direcție / Introducere"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sortează după intrare inactivă"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sortează după ieșire inactivă"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sortează după rata de intrare"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sortează după rata de de ieșire"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sortează după timpul de conectare"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sortează după fus orar"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sorteaza dupa fereastra de congestie"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sortează dupa pragul de start lent"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sortează după timpul dus-intors"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sortează după timpul de retransmisie"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sortează după unitățiile maxime de ieșire transmise"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sortează după pachetele trimise"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sortează după pachetele primite"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sortează după pachetele retransmise"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sortează după pachetele primite mai mult decât o dată"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Ne oferim să îi introducem"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Ei sau oferit să ne introducă"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Asfixiat"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 eșuare"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} eșuări"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Banat"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "restante"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Arunc cererile tunelului: Prea lent"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Arunc cererile tunelului: Supraîncărcat"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
-#, fuzzy
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
-msgstr "Respingere tuneluri: Mesajul are întârziere mare"
+msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Resping Tuneluri: Cerere supraîncărcată"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Respinge Tuneluri: Limită de conexiune"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Arunc cererile de tunel: Încărcătura mare"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Arunc cererile de tunel: Timp așteptare"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Noua versiune plug-in {0} este disponibil"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Verificarea actualizarii a eșuat pentru plug-inul {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Nici un versiune nouă este disponibilă pentru plugin-ul {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} B transferat"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Transferul nu a reușit din {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Actualizare descarcata"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "restartare"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Actualizari verificate"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "din {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Fișierul de actualizare nesemnat din {0} este corupt"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Copierea a eșuat {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Trebuie intai sa actualizati la versiunea {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Necesita versiunea Java {0} dar vrersiunea Java instalata este {1}"
@@ -893,7 +896,8 @@ msgstr "Plugin descărcat"
 msgid "Cannot create plugin directory {0}"
 msgstr "Nu pot crea directorul pentru plugin-ul {0}"
 
-#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + "</b>");
+#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
+#. + signer + "</b>");
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
@@ -911,9 +915,8 @@ msgstr "Verificarea semnăturii plugin-ului {0} a esuat"
 
 #. don't display signer, we're really checking the key not the signer name
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
-#, fuzzy
 msgid "Plugin not installed - signer is untrusted"
-msgstr "Plugin-ul {0} a fost instalat si pornit"
+msgstr ""
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
 #, java-format
@@ -949,9 +952,7 @@ msgstr "Plugin necesită Java versiunea {0} sau mai mare"
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
-msgstr ""
-"Plugin descărcat este numai pentru instalări noi, dar plugin-ul este deja "
-"instalat."
+msgstr "Plugin descărcat este numai pentru instalări noi, dar plugin-ul este deja instalat."
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
@@ -964,20 +965,17 @@ msgstr "Semnătura plugin-ului descărcat nu se potrivește cu plugin-ul instala
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
-msgstr ""
-"Versiunea plug-inului descarcat {0} nu este mai nouă decât plugin-ul instalat"
+msgstr "Versiunea plug-inului descarcat {0} nu este mai nouă decât plugin-ul instalat"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
-msgstr ""
-"Actualizarea plugin-ului necesită versiunea plug-in instalat {0} sau mai mare"
+msgstr "Actualizarea plugin-ului necesită versiunea plug-in instalat {0} sau mai mare"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
-msgstr ""
-"Actualizarea plugin-ului necesită versiunea plug-in instalat {0} sau mai mica"
+msgstr "Actualizarea plugin-ului necesită versiunea plug-in instalat {0} sau mai mica"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
@@ -1021,9 +1019,7 @@ msgstr "Plugin-ul {0} a fost instalat si pornit"
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
-msgstr ""
-"Plugin-ul {0}a fost instalat, dar nu a reușit să porneasca, verifica "
-"jurnalele"
+msgstr "Plugin-ul {0}a fost instalat, dar nu a reușit să porneasca, verifica jurnalele"
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
@@ -1158,9 +1154,7 @@ msgstr "Consola de Router I2P"
 
 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
-msgstr ""
-"Eroare la actualizarea de configurare - vă rugăm să consultați jurnalele de "
-"eroare"
+msgstr "Eroare la actualizarea de configurare - vă rugăm să consultați jurnalele de eroare"
 
 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
@@ -1174,9 +1168,7 @@ msgstr "Configurație salvată cu succes"
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs"
-msgstr ""
-"Eroare la salvarea de configurare (aplicată, dar nu salvată) - vă rugăm să "
-"consultați jurnalele de eroare"
+msgstr "Eroare la salvarea de configurare (aplicată, dar nu salvată) - vă rugăm să consultați jurnalele de eroare"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
@@ -1363,8 +1355,8 @@ msgid "Add Client"
 msgstr "Adaugă client"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Client"
 
@@ -1395,9 +1387,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Versiune"
 
@@ -1419,7 +1411,7 @@ msgstr "Licență"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Website"
 
@@ -1432,7 +1424,7 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Verificați după actualizări"
@@ -1454,7 +1446,7 @@ msgstr "Șterge"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1464,7 +1456,7 @@ msgstr "Șterge pe cel ales"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1483,6 +1475,7 @@ msgstr "Restabileşte implicitele"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1563,24 +1556,20 @@ msgstr "destinație nevalidă"
 msgid "Log overrides updated"
 msgstr "Suprascrie jurnal actualizat"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Jurnalul de configurare salvat"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
 msgid ""
 "Add additional logging statements above. Example: net.i2p.router.tunnel=WARN"
-msgstr ""
-"Adaugă declarații de logare suplimentare de mai sus. Exemplu: net.i2p.router."
-"tunnel = warn"
+msgstr "Adaugă declarații de logare suplimentare de mai sus. Exemplu: net.i2p.router.tunnel = warn"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:49
 msgid ""
-"Or put entries in the logger.config file. Example: logger.record.net.i2p."
-"router.tunnel=WARN"
-msgstr ""
-"Sau pune intrări în fișierul logger.config. Exemplu: logger.record.net.i2p."
-"router.tunnel = warn"
+"Or put entries in the logger.config file. Example: "
+"logger.record.net.i2p.router.tunnel=WARN"
+msgstr "Sau pune intrări în fișierul logger.config. Exemplu: logger.record.net.i2p.router.tunnel = warn"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:50
 msgid "Valid levels are DEBUG, INFO, WARN, ERROR, CRIT"
@@ -1616,7 +1605,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Elimina"
 
@@ -1635,7 +1624,7 @@ msgid "Home Page"
 msgstr "Pagina de pornire"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Rețeaua"
 
@@ -1691,8 +1680,8 @@ msgid "UI"
 msgstr "UI"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tuneluri"
@@ -1711,15 +1700,15 @@ msgid "Logging"
 msgstr "Logare"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peers"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistici"
 
@@ -1732,7 +1721,7 @@ msgstr "Avansat"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1842,16 +1831,16 @@ msgstr "Actualizare procent cota pe lățimea de bandă"
 msgid "Updated bandwidth limits"
 msgstr "Limitele pe lățimea de bandă actualizate"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "necunoscut"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "biți pe secundă"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "sau {0} biți maximum pe o lună de zile"
@@ -2181,7 +2170,8 @@ msgstr "Mutat"
 msgid "Saved order of sections."
 msgstr "Ordinea sectiunilor este salvata"
 
-#. the count isn't really correct anyway, since we don't check for actual changes
+#. 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
 msgid "Updated settings for all pools."
@@ -2198,9 +2188,7 @@ msgstr "configurarea tunelului de exploatare a fost salvat cu succes"
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
-msgstr ""
-"Eroare la salvarea de configurare (aplicat, dar nu salvat) - vă rugăm să "
-"consultați jurnalele de eroare."
+msgstr "Eroare la salvarea de configurare (aplicat, dar nu salvat) - vă rugăm să consultați jurnalele de eroare."
 
 #. * dummies for translation
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
@@ -2421,7 +2409,7 @@ msgstr "Nume utilizator"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Adaugă"
 
@@ -2430,102 +2418,100 @@ msgstr "Adaugă"
 msgid "Password"
 msgstr "Parolă"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Actualizarea sau verificarea deja în curs de desfășurare"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Actualizare disponibilă, încercarea de a descărca acum"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Actualizare disponibilă, faceți clic pentru a descărca"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Nicio actualizare disponibilă"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Actualizarea URL-ul de noutăți la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "Intern"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Actualizarea proxy la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Actualizarea portului proxy la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Actualizarea frecventei reinnoirii la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Niciodată"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Actualizarea reinnoirii politicii la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Actualizarea URL-uri de actualizare."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Actualizarea cheiei de încredere."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Actualizarea politicii de actualizare la {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Fiecare"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Numai anuntare"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Descarcă și verifică numai"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Descărca, verifică, și repornește"
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:34
-#, fuzzy
 msgid "Aborted startup"
-msgstr "Rulați la pornire"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:35
 msgid "Enabled floodfill"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:36
-#, fuzzy
 msgid "Changed IP"
-msgstr "IP-uri blocate"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:37
 msgid "Changed port"
@@ -2540,29 +2526,25 @@ msgid "Crashed"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:40
-#, fuzzy
 msgid "Critical error"
-msgstr "Log-uri critice"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:41
 msgid "Installed new version"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:42
-#, fuzzy
 msgid "Install failed"
-msgstr "Instalează plugin"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:43
-#, fuzzy
 msgid "Network error"
-msgstr "Rețeaua"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:44
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:47
-#, fuzzy
 msgid "New router identity"
-msgstr "Corecție noua"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:45
 msgid "Disabled floodfill"
@@ -2573,43 +2555,36 @@ msgid "Out of memory error"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:48
-#, fuzzy
 msgid "Reseeded router"
-msgstr "Însământarea a adus doar 1 router."
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:49
-#, fuzzy
 msgid "Soft restart"
-msgstr "Repornire grea"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:50
-#, fuzzy
 msgid "Started router"
-msgstr "Deconectează router"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:51
-#, fuzzy
 msgid "Stopped router"
-msgstr "Deconectează router"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:52
-#, fuzzy
 msgid "Updated router"
-msgstr "Actualizat"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:53
 msgid "Watchdog warning"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:101
-#, fuzzy
 msgid "Display Events"
-msgstr "plot events"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:105
-#, fuzzy
 msgid "Events since"
-msgstr "evenimente in {0}"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:110
 msgid "Event type"
@@ -2617,29 +2592,26 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:116
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:147
-#, fuzzy
 msgid "All events"
-msgstr "plot events"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:121
-#, fuzzy
 msgid "Filter events"
-msgstr "plot events"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:169
-#, fuzzy
 msgid "No events found"
-msgstr "Nu-s evenimente"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "No events found in previous {0}"
-msgstr "Nu s-a găsit versiune noua {0}"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:173
-#, fuzzy, java-format
+#, java-format
 msgid "No \"{0}\" events found"
-msgstr "Nu-s evenimente"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:174
 #, java-format
@@ -2652,30 +2624,24 @@ msgid "Time"
 msgstr "Timp"
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:181
-#, fuzzy
 msgid "Event"
-msgstr "1 eveniment"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/EventLogHelper.java:183
-#, fuzzy
 msgid "Details"
-msgstr "Testul a esuat"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/FormHandler.java:227
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
-msgstr ""
-"Transmitere formular invalid, probabil pentru că ați folosit butonul \"reload"
-"\" sau \"back\" de pe browser-ul dumneavoastră. Vă rugăm retrimiteți."
+msgstr "Transmitere formular invalid, probabil pentru că ați folosit butonul \"reload\" sau \"back\" de pe browser-ul dumneavoastră. Vă rugăm retrimiteți."
 
 #: ../java/src/net/i2p/router/web/FormHandler.java:229
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
-msgstr ""
-"Dacă problema persistă, verificați dacă aveți activate cookie-urile în "
-"browser-ul dumneavoastră."
+msgstr "Dacă problema persistă, verificați dacă aveți activate cookie-urile în browser-ul dumneavoastră."
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:162
 msgid "Combined bandwidth graph"
@@ -2689,7 +2655,7 @@ msgid "{0} for {1}"
 msgstr "{0} pentru {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "utilizarea lățimii de bandă"
 
@@ -2803,12 +2769,12 @@ msgid "Graph settings saved"
 msgstr "Setări grafice salvate"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Agendă"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Gestionați fisierul I2P hosts aici (I2P DNS) "
 
@@ -2839,17 +2805,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Configurarea paginii de pornire I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Client webmail anonim"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Email"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P router ajutor "
 
@@ -2859,17 +2825,17 @@ msgid "Router Console"
 msgstr "consola router"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Construiti  clientul BitTorrent"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torente"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Server web local"
 
@@ -2885,7 +2851,8 @@ msgstr "bug-uri"
 msgid "Bug tracker"
 msgstr "Bug tracker"
 
-#. "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S +
+#. "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:43
 msgid "Dev Forum"
 msgstr "Forumul dezvoltatorilor"
@@ -2934,9 +2901,8 @@ msgid "Anonymous Git Hosting"
 msgstr "Git hosting anonim "
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:49
-#, fuzzy
 msgid "HiddenGate"
-msgstr "Ascuns"
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
@@ -2955,11 +2921,10 @@ msgstr "Javadoc"
 msgid "Technical documentation"
 msgstr "Documentație tehnică"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr ""
-
-#. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S +
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr "Debian și depozite Tahoe-LAFS"
@@ -3004,7 +2969,8 @@ msgstr "pagina de pornire I2P"
 msgid "Project Website"
 msgstr "Site-ul proiectului"
 
-#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S +
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr "Statistica rețelei I2P"
@@ -3036,11 +3002,10 @@ msgstr "Proxy HTTP nu este pornit"
 #: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, java-format
 msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
-msgstr ""
-"Browser-ul dvs. nu este corect configurat să utilizeze proxy HTTP la {0}"
+msgstr "Browser-ul dvs. nu este corect configurat să utilizeze proxy HTTP la {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Nume"
 
@@ -3190,148 +3155,157 @@ msgid "Unpublished"
 msgstr "Nepublicat"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destinație"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Expiră in {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Expirat în urmă cu {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Nu este inițializat"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Statisticile Router-ului in rețeaua bazei de date"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Număra"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transporturi"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Regiune"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Informațiile noastre"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Informațile despre peer"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Intrare completă"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Ascuns"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Actualizat"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} în urmă"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publicat"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adresă(se)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "cost"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Ascuns sau pentru pornire"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU cu introducere"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP si SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3350,7 +3324,7 @@ msgid "Hide news"
 msgstr "Ascunde noutati"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Afișează noutati"
 
@@ -3435,7 +3409,7 @@ msgid "Failing"
 msgstr "Eșuat"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrat"
 
@@ -3538,8 +3512,7 @@ msgstr "grupuri"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
-msgstr ""
-"capacitățile în netDb nu sunt utilizate pentru a determinarea profilurilor"
+msgstr "capacitățile în netDb nu sunt utilizate pentru a determinarea profilurilor"
 
 #. capabilities
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
@@ -3551,9 +3524,7 @@ msgstr "majuscule"
 msgid ""
 "peak throughput (bytes per second) over a 1 minute period that the peer has "
 "sustained in a single tunnel"
-msgstr ""
-"transfer de vârf (bytes pe secundă), pe o perioada de la 1 minut pe care "
-"utilizatorul a susținut într-un singur tunel"
+msgstr "transfer de vârf (bytes pe secundă), pe o perioada de la 1 minut pe care utilizatorul a susținut într-un singur tunel"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
@@ -3609,14 +3580,11 @@ msgstr "Statisticile colectate în timpul uptime acestui router"
 msgid ""
 "The data gathered is quantized over a 1 minute period, so should just be "
 "used as an estimate."
-msgstr ""
-"Datele colectate sunt cuantificate pe o perioadă de 1 minut, deci trebuie "
-"folosite doar ca o estimare."
+msgstr "Datele colectate sunt cuantificate pe o perioadă de 1 minut, deci trebuie folosite doar ca o estimare."
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:64
 msgid "These statistics are primarily used for development and debugging."
-msgstr ""
-"Aceste statistici sunt utilizate în principal pentru dezvoltare și depanare."
+msgstr "Aceste statistici sunt utilizate în principal pentru dezvoltare și depanare."
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:105
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:156
@@ -3635,12 +3603,14 @@ msgstr "evenimente de rulare medii pe perioada"
 msgid "Highest events per period"
 msgstr "Cele mai mari evenimente pe perioada"
 
-#. if (showAll && (curFreq.getMaxAverageEventsPerPeriod() > 0) && (curFreq.getAverageEventsPerPeriod() > 0) ) {
+#. if (showAll && (curFreq.getMaxAverageEventsPerPeriod() > 0) &&
+#. (curFreq.getAverageEventsPerPeriod() > 0) ) {
 #. buf.append("(current is ");
 #. buf.append(pct(curFreq.getAverageEventsPerPeriod()/curFreq.getMaxAverageEventsPerPeriod()));
 #. buf.append(" of max)");
 #. }
-#. buf.append(" <i>avg interval between updates:</i> (").append(num(curFreq.getAverageInterval())).append("ms, min ");
+#. 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:135
 msgid "Lifetime average events per period"
@@ -3652,7 +3622,7 @@ msgid "Lifetime average frequency"
 msgstr "Frecvență medie pe durata de pornire"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3705,296 +3675,282 @@ msgstr "Grafic de date"
 msgid "Graph Event Count"
 msgstr "Numar de evenimente grafic"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Data Export ca XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Valoarea medie pe durata de pornire"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P router-ajutor &amp;FAQ  "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Ajutor &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
-msgstr ""
-"Configurarea pornirii clienților și aplicațiilor web (servicii); porniti "
-"manual servicii latente"
+msgstr "Configurarea pornirii clienților și aplicațiilor web (servicii); porniti manual servicii latente"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Servicii I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Configurarea I2P Router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P Internals"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Vezi tuneluri existente și statutul construirii tunelului  "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Arată toate conexiunile actuale ale utilizatorilor "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Afișare profilului de performanță recent"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profiluri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Afișează lista tuturor router-urilor I2P cunoscute"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Health Raport"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Înregistrări"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Grafic performantei router-ului "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Grafice"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Statisticile textuale de performanță router-ului"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Destinații locale"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Tunelul I2P"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "General"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
-msgstr ""
-"Identitatea locală este identitatea dvs. unica router I2P, similar cu o "
-"adresă IP, dar adaptate la I2P."
+msgstr "Identitatea locală este identitatea dvs. unica router I2P, similar cu o adresă IP, dar adaptate la I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
-msgstr ""
-"Nu dezvălui acest lucru pentru oricine, așa cum se poate descoperi IP real."
+msgstr "Nu dezvălui acest lucru pentru oricine, așa cum se poate descoperi IP real."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "identitatea locală"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Identitatea unică a router-ului I2P este"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "nu-l descoperi nimănui"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "Afișează"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Versiunea programului I2p pe care o rulam"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Cât timp am fost porniți  pentru această sesiune"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Disponibilitate"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
+msgstr "Ajutor cu configurarea firewall-ul și router-ul pentru performanțe optime I2P"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
 msgstr ""
-"Ajutor cu configurarea firewall-ul și router-ul pentru performanțe optime I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Configurarea Actualizări I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Actualizare I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Utilizatorii ce au convorbit în ultimele câteva minute / ultima ora"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Activ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Numărul de colegii disponibile pentru construirea de tuneluri client"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Rapid"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
-msgstr ""
-"Numărul de colegii disponibile pentru construirea de tuneluri de explorare"
+msgstr "Numărul de colegii disponibile pentru construirea de tuneluri de explorare"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "De mare capacitate"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
-msgstr ""
-"Numărul de utilizatori disponibili pentru anchete de baze de date din rețea"
+msgstr "Numărul de utilizatori disponibili pentru anchete de baze de date din rețea"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Numărul total de utilizatori în baza de date rețea"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Cunoscute"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Configurarea alocării benzii de router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Lățime de bandă în / out"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Total"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Utilizat"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
-"Used for building and testing tunnels, and communicating with floodfill peers"
-msgstr ""
-"Utilizate pentru construirea și testarea tuneluri, și de a comunica cu "
-"colegii floodfill"
+"Used for building and testing tunnels, and communicating with floodfill "
+"peers"
+msgstr "Utilizate pentru construirea și testarea tuneluri, și de a comunica cu colegii floodfill"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Explorare"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
-msgstr ""
-"Tuneluri pe care le folosim pentru a furniza sau accesa la serviciile din "
-"rețea"
+msgstr "Tuneluri pe care le folosim pentru a furniza sau accesa la serviciile din rețea"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Participare"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 ""
-"Raportul tunelului hamei oferite la  tunele hamei folosite - o valoare mai "
-"mare de 1.00 indică o contribuție pozitivă la rețea"
+msgstr "Raportul tunelului hamei oferite la  tunele hamei folosite - o valoare mai mare de 1.00 indică o contribuție pozitivă la rețea"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Rată partajare:"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "congestie"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indicare performantei router-ului"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indică cât de repede se trimit mesaje de ieșire la alte routere I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "întârziere mesajului"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Timpul dus-intors pentru un test de tunel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Intirziere tunelului"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
-msgstr ""
-"Cereri din coada de așteptare din alte routere pentru a participa în tuneluri"
+msgstr "Cereri din coada de așteptare din alte routere pentru a participa în tuneluri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Noutati &amp; Actualizari "
 
@@ -4020,9 +3976,8 @@ msgid "OK"
 msgstr "OK"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:165
-#, fuzzy
 msgid "ERR-Unresolved TCP Address"
-msgstr "ERR-Private adresa TCP "
+msgstr ""
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
@@ -4055,14 +4010,11 @@ msgstr "Deconectat - Verificați cablul de rețea"
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
-msgstr ""
-"ERR-UDP port este in folosire - setati i2np.udp.internalPort=xxxx in "
-"configurari avansate si restartati"
+msgstr "ERR-UDP port este in folosire - setati i2np.udp.internalPort=xxxx in configurari avansate si restartati"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
-msgstr ""
-"ERR-Nu sunt utilizatori activi, verifica conexiunea la rețea și Firewall"
+msgstr "ERR-Nu sunt utilizatori activi, verifica conexiunea la rețea și Firewall"
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
@@ -4072,45 +4024,43 @@ msgstr "ERR-UDP dezactivat și TCP host / port de intrare nu este setat"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "AVERTISMENT-Firewall cu UDP deconectat"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
-msgstr ""
-"Adauga / sterge / editeaza &amp; controleaza clientul și tunelurile server-"
-"ului dvs."
+msgstr "Adauga / sterge / editeaza &amp; controleaza clientul și tunelurile server-ului dvs."
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "arata tuneluri"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Arende expirate"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Reconstruire:"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "în urmă"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Gata"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Construire:"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Construire tunelelor"
 
@@ -4118,72 +4068,73 @@ msgstr "Construire tunelelor"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "clientii comune"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Faceți restart pentru a instala"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Faceți clic pe Oprire și reporniți pentru a instala"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Versiune {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "actualizare disponibila"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Descarcă {0} actualizari"
 
 #. 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:729
+#. If the translation is shorter than the English, you should probably not
+#. include <br>
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Descarca actualizare <br> nesemnata{0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Ajutor cu configurarea firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Verificați conexiunea la rețea și NAT / firewall"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Comandă"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Sus"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Jos"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Jos"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Selectați o secțiune pentru adăugare"
 
@@ -4456,6 +4407,10 @@ msgstr "Criptare"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Tunelul I2P"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4604,7 +4559,8 @@ msgstr "configurarea traficului"
 msgid "Router is down"
 msgstr "Router-ul este deactivat"
 
-#. We have intl defined when this is included, but not when compiled standalone.
+#. We have intl defined when this is included, but not when compiled
+#. standalone.
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
@@ -4706,9 +4662,7 @@ msgstr "Limitare benzii de retea"
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
-msgstr ""
-"I2P va funcționa mai bine dacă configurați rata pentru a se potrivi cu "
-"viteza conexiunii internet."
+msgstr "I2P va funcționa mai bine dacă configurați rata pentru a se potrivi cu viteza conexiunii internet."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
@@ -4741,16 +4695,12 @@ msgstr "I2P necesită cel puțin 12KBps pentru a permite partajarea."
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
-msgstr ""
-"Vă rugăm să activați partajarea (participarea în tuneluri) prin configurarea "
-"lățimii de bandă."
+msgstr "Vă rugăm să activați partajarea (participarea în tuneluri) prin configurarea lățimii de bandă."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 msgid ""
 "It improves your anonymity by creating cover traffic, and helps the network."
-msgstr ""
-"Acesta îmbunătățește anonimitatea, prin crearea de trafic acoperire, și "
-"ajută la rețea."
+msgstr "Acesta îmbunătățește anonimitatea, prin crearea de trafic acoperire, și ajută la rețea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
@@ -4761,9 +4711,7 @@ msgstr "Ați configurat I2P de a împărtăși {0} kbps."
 msgid ""
 "The higher the share bandwidth the more you improve your anonymity and help "
 "the network."
-msgstr ""
-"Cu cit este mai mare lățimea de banda cu atât se îmbunătățește anonimitate "
-"Dvs și ajutorul rețelei."
+msgstr "Cu cit este mai mare lățimea de banda cu atât se îmbunătățește anonimitate Dvs și ajutorul rețelei."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
@@ -4780,7 +4728,7 @@ msgstr "Pagina de configurare avansată a rețelei"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4808,9 +4756,9 @@ msgid "Some changes may require a restart to take effect."
 msgstr "Unele modificări pot necesita o repornire pentru a avea efect"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
-#, fuzzy, java-format
+#, java-format
 msgid "To make changes, edit the file {0}."
-msgstr "Pentru a modifica alte opțiuni de client, editați fișierul"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
@@ -4828,19 +4776,14 @@ msgstr "Configurare client"
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
-msgstr ""
-"Clientii Java enumerate mai jos sunt pornite de către router-ul și se "
-"executa în aceeași JVM."
+msgstr "Clientii Java enumerate mai jos sunt pornite de către router-ul și se executa în aceeași JVM."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
-"Be careful changing any settings here. The 'router console' and 'application "
-"tunnels' are required for most uses of I2P. Only advanced users should "
+"Be careful changing any settings here. The 'router console' and 'application"
+" tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
-msgstr ""
-"Fiti atent la schimbarea oricaror setari de aici. \"Consola router-ului\" si "
-"\"tunelurile de aplicare\" sunt necesare pentru majoritatea I2P. Doar "
-"utilizatorii avansati ar trebuii sa le schimbe."
+msgstr "Fiti atent la schimbarea oricaror setari de aici. \"Consola router-ului\" si \"tunelurile de aplicare\" sunt necesare pentru majoritatea I2P. Doar utilizatorii avansati ar trebuii sa le schimbe."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
@@ -4873,13 +4816,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Dezactivat - clienți în afara acestui proces Java nu pot conecta"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "Portul I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "Interfata I2CP"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Portul I2CP"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Autorizare"
@@ -4900,9 +4843,7 @@ msgstr "Setările implicite vor lucra pentru majoritatea oamenilor."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
-msgstr ""
-"Orice modificări efectuate aici trebuie să fie, de asemenea, configurate în "
-"clientul extern."
+msgstr "Orice modificări efectuate aici trebuie să fie, de asemenea, configurate în clientul extern."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
@@ -4916,17 +4857,11 @@ msgstr "Configurarea WebApp"
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
-"accessible through the router console. They may be complete applications (e."
-"g. i2psnark),front-ends to another client or application which must be "
+"accessible through the router console. They may be complete applications "
+"(e.g. i2psnark),front-ends to another client or application which must be "
 "separately enabled (e.g. susidns, i2ptunnel), or have no web interface at "
 "all (e.g. addressbook)."
-msgstr ""
-"Aplicatiilor web Java enumerate mai jos sunt pornite de client webConsole și "
-"se executa în aceeași JVM ca router. Ele sunt, de obicei, aplicatii web "
-"accesibile prin consola router. Ele pot fi aplicații complete (de exemplu, "
-"i2psnark), frontal-end-uri la un alt client sau de cerere care trebuie să "
-"fie activate separat (de exemplu, susidns, i2ptunnel), sau nu au nici o "
-"interfata web, de fel (de exemplu, Agenda)."
+msgstr "Aplicatiilor web Java enumerate mai jos sunt pornite de client webConsole și se executa în aceeași JVM ca router. Ele sunt, de obicei, aplicatii web accesibile prin consola router. Ele pot fi aplicații complete (de exemplu, i2psnark), frontal-end-uri la un alt client sau de cerere care trebuie să fie activate separat (de exemplu, susidns, i2ptunnel), sau nu au nici o interfata web, de fel (de exemplu, Agenda)."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
@@ -4934,11 +4869,7 @@ msgid ""
 "directory; however the .war file and web app will reappear when you update "
 "your router to a newer version, so disabling the web app here is the "
 "preferred method."
-msgstr ""
-"O aplicație web poate fi, de asemenea, dezactivată prin ștergerea fișierul ."
-"war din directorul de aplicații web; Cu toate acestea, fișierul .war  și Web "
-"App va reapărea la  reactualizarea router-ului la o versiune mai nouă, deci "
-"dezactivarea Web App este metoda preferată."
+msgstr "O aplicație web poate fi, de asemenea, dezactivată prin ștergerea fișierul .war din directorul de aplicații web; Cu toate acestea, fișierul .war  și Web App va reapărea la  reactualizarea router-ului la o versiune mai nouă, deci dezactivarea Web App este metoda preferată."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
@@ -4946,8 +4877,7 @@ msgstr "Configurare plugin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
-msgstr ""
-"Plugin-urile enumerate mai jos sunt pornite de către client webConsole."
+msgstr "Plugin-urile enumerate mai jos sunt pornite de către client webConsole."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
@@ -4979,13 +4909,14 @@ msgid "Search Engines"
 msgstr "Motoare de căutare"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Eepsites recomandate"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Servicii locale"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -5002,9 +4933,7 @@ msgstr "router-ul keyring este folosit pentru a decripta leaseSets criptate."
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
-msgstr ""
-"keyring poate conține cheile pentru destinațiile criptate locale sau la "
-"distanță."
+msgstr "keyring poate conține cheile pentru destinațiile criptate locale sau la distanță."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
@@ -5046,54 +4975,53 @@ msgstr "Configurarea optiunilor jurnalului I2P"
 msgid "Log file"
 msgstr "Fișier jurnal"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(simbolul \"@\" va fi înlocuit în timpul rotației log)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "formatul de înregistrare jurnalului"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
-msgstr ""
-"(utilizarea \"d\" = dată, 'c' = clasă, \"T\" = fir, 'p' = prioritate, \"M\" "
-"= mesaj)"
+msgstr "(utilizarea \"d\" = dată, 'c' = clasă, \"T\" = fir, 'p' = prioritate, \"M\" = mesaj)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Formatarea datei jurnalului:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
-msgstr ""
-"('MM' = luna, 'dd' = zi, \"HH\" = oră, 'mm' = minute, \"SS\" = secunde, \"SSS"
-"\" = milisecunde)"
+msgstr "('MM' = luna, 'dd' = zi, \"HH\" = oră, 'mm' = minute, \"SS\" = secunde, \"SSS\" = milisecunde)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Dimensiune fișierului jurnalului maxim:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Nivel implicit de jurnalare:"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
-msgstr ""
-"(Depanare și informații nu sunt recomandate implicite , deoarece acestea vor "
-"încetini drastic router-ului)"
+msgstr "(Depanare și informații nu sunt recomandate implicite , deoarece acestea vor încetini drastic router-ului)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Corecție de nivel de jurnalizare"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Corecție noua"
 
@@ -5171,9 +5099,7 @@ msgstr "Acțiune atunci când se schimbă IP"
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
-msgstr ""
-"Mod laptop - schimba identitatea router si portul UDP atunci când se "
-"modifică IP pentru anonimatul îmbunătățit"
+msgstr "Mod laptop - schimba identitatea router si portul UDP atunci când se modifică IP pentru anonimatul îmbunătățit"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
@@ -5240,9 +5166,7 @@ msgstr "dacă nu suntem în spatele firewall"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
-msgstr ""
-"Utilizați întotdeauna auto-detectarea adresei IP (Nu suntem in spate unui "
-"firewall)"
+msgstr "Utilizați întotdeauna auto-detectarea adresei IP (Nu suntem in spate unui firewall)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
@@ -5251,9 +5175,7 @@ msgstr "Dezactivarea intrare (firewall)"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
-msgstr ""
-"(numai dacă se afla în spatele unui firewall ce reguleaza sau blochează "
-"ieșire UDP)"
+msgstr "(numai dacă se afla în spatele unui firewall ce reguleaza sau blochează ieșire UDP)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
@@ -5275,9 +5197,7 @@ msgstr "Notițe"
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
-msgstr ""
-"a) nu descoperiti numerele de port! b) Modificarea acestor setări va reporni "
-"router."
+msgstr "a) nu descoperiti numerele de port! b) Modificarea acestor setări va reporni router."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
@@ -5287,51 +5207,38 @@ msgstr "Ajutor de configurare"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
-"integration will generally improve if the I2P port is forwarded for both UDP "
-"and TCP."
-msgstr ""
-"În timp ce I2P va funcționa bine în spatele majorității firewall, vitezele "
-"de integrare in rețea va îmbunătăți, în general, în cazul în care portul I2P "
-"este transmis atât pentru UDP și TCP."
+"integration will generally improve if the I2P port is forwarded for both UDP"
+" and TCP."
+msgstr "În timp ce I2P va funcționa bine în spatele majorității firewall, vitezele de integrare in rețea va îmbunătăți, în general, în cazul în care portul I2P este transmis atât pentru UDP și TCP."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
-"If you can, please poke a hole in your firewall to allow unsolicited UDP and "
-"TCP packets to reach you."
-msgstr ""
-"Dacă se poate, vă rugăm să scormoniți o gaura în firewall pentru a permite "
-"pachete nesolicitate UDP și TCP pentru ca sa ajungă la Dvs"
+"If you can, please poke a hole in your firewall to allow unsolicited UDP and"
+" TCP packets to reach you."
+msgstr "Dacă se poate, vă rugăm să scormoniți o gaura în firewall pentru a permite pachete nesolicitate UDP și TCP pentru ca sa ajungă la Dvs"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
-msgstr ""
-"Dacă nu puteti, I2P suporta UPnP (Universal Plug and Play) și UDP hole "
-"punching cu \"SSU introductions\" la trafic releu."
+msgstr "Dacă nu puteti, I2P suporta UPnP (Universal Plug and Play) și UDP hole punching cu \"SSU introductions\" la trafic releu."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
-"Most of the options above are for special situations, for example where UPnP "
-"does not work correctly, or a firewall not under your control is doing harm."
-msgstr ""
-"Cele mai multe dintre opțiunile de mai sus sunt pentru situații speciale, de "
-"exemplu, în cazul în care UPnP nu funcționează corect, sau un firewall nu se "
-"află sub controlul dvs."
+"Most of the options above are for special situations, for example where UPnP"
+" does not work correctly, or a firewall not under your control is doing "
+"harm."
+msgstr "Cele mai multe dintre opțiunile de mai sus sunt pentru situații speciale, de exemplu, în cazul în care UPnP nu funcționează corect, sau un firewall nu se află sub controlul dvs."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
-msgstr ""
-"Unele firewall-uri, cum ar fi NAT simetrice poate să nu funcționeze bine cu "
-"I2P."
+msgstr "Unele firewall-uri, cum ar fi NAT simetrice poate să nu funcționeze bine cu I2P."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
-msgstr ""
-"UPnP este folosit pentru a comunica cu dispozitivele gateway Internet (Igds) "
-"pentru a detecta adresa IP externă și  porturi înaintate."
+msgstr "UPnP este folosit pentru a comunica cu dispozitivele gateway Internet (Igds) pentru a detecta adresa IP externă și  porturi înaintate."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
@@ -5369,9 +5276,7 @@ msgstr "Revedeți starea UPnP aici."
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
-msgstr ""
-"UPnP poate fi activat sau dezactivat  mai sus, dar schimbarea necesită "
-"repornirea routerului să aibă efect."
+msgstr "UPnP poate fi activat sau dezactivat  mai sus, dar schimbarea necesită repornirea routerului să aibă efect."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
@@ -5383,19 +5288,16 @@ msgstr "Ele <b> nu sunt private </b>"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
-"Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1."
-msgstr ""
-"De asemenea, <b> nu introduceți o adresă de IP privată </ b> ca de exemplu "
-"127.0.0.1 sau 192.168.1.1."
+"Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
+"192.168.1.1."
+msgstr "De asemenea, <b> nu introduceți o adresă de IP privată </ b> ca de exemplu 127.0.0.1 sau 192.168.1.1."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
-msgstr ""
-"Dacă specificați adresa IP sau hostname greșit, sau nu configurați corect "
-"NAT sau firewall, performanța rețelei va degrada semnificativ."
+msgstr "Dacă specificați adresa IP sau hostname greșit, sau nu configurați corect NAT sau firewall, performanța rețelei va degrada semnificativ."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
@@ -5410,18 +5312,13 @@ msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
-msgstr ""
-"Dacă credeți că ați deschis  firewall și I2P încă crede că sunteti in "
-"spatele unui firewall, amintiți-vă că este posibil să fiti in spatele mai "
-"multor firewall-uri, de exemplu, software și router  extern."
+msgstr "Dacă credeți că ați deschis  firewall și I2P încă crede că sunteti in spatele unui firewall, amintiți-vă că este posibil să fiti in spatele mai multor firewall-uri, de exemplu, software și router  extern."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
-msgstr ""
-"Dacă există o eroare, <a href=\"logs.jsp\"> jurnalele </a> pot ajuta, "
-"diagnostica problema."
+msgstr "Dacă există o eroare, <a href=\"logs.jsp\"> jurnalele </a> pot ajuta, diagnostica problema."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
@@ -5435,55 +5332,39 @@ msgstr "Portul UDP pare să fie in spatele unui firewall."
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
-msgstr ""
-"Deoarece metodele de detectare firewall nu sunt 100% sigure, acest lucru "
-"poate fi uneori afișat ca eroare."
+msgstr "Deoarece metodele de detectare firewall nu sunt 100% sigure, acest lucru poate fi uneori afișat ca eroare."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
-msgstr ""
-"Cu toate acestea, în cazul în care acesta apare în mod constant, trebuie să "
-"verificați dacă atât firewall de externe și interne sunt deschise pentru "
-"acest portul."
+msgstr "Cu toate acestea, în cazul în care acesta apare în mod constant, trebuie să verificați dacă atât firewall de externe și interne sunt deschise pentru acest portul."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
-msgstr ""
-"I2P va funcționa bine atunci când se afla în  spatele unui firewall, nu "
-"există niciun motiv de îngrijorare. Când se afla in spatele unui firewall, "
-"router-ul folosește \"Introducers\" pentru conexiuni de intrare releu."
+msgstr "I2P va funcționa bine atunci când se afla în  spatele unui firewall, nu există niciun motiv de îngrijorare. Când se afla in spatele unui firewall, router-ul folosește \"Introducers\" pentru conexiuni de intrare releu."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
-msgstr ""
-"Cu toate acestea, veți obține mai mult trafic și de veti ajuta rețeaua mai "
-"mult, dacă veti deschide firewall-ul."
+msgstr "Cu toate acestea, veți obține mai mult trafic și de veti ajuta rețeaua mai mult, dacă veti deschide firewall-ul."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
-msgstr ""
-"Dacă credeți că ați făcut deja acest lucru, amintiți-vă că ar putea avea "
-"atât un hardware și un firewall software, sau să fie în spatele unui "
-"firewall suplimentar, care nu poate fi controlat."
+msgstr "Dacă credeți că ați făcut deja acest lucru, amintiți-vă că ar putea avea atât un hardware și un firewall software, sau să fie în spatele unui firewall suplimentar, care nu poate fi controlat."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
-msgstr ""
-"De asemenea, unele routere nu poate înainta în mod corect atât TCP și UDP pe "
-"un singur port, sau pot avea alte limitări sau bug-uri care le împiedică "
-"trecerea trafic prin I2P."
+msgstr "De asemenea, unele routere nu poate înainta în mod corect atât TCP și UDP pe un singur port, sau pot avea alte limitări sau bug-uri care le împiedică trecerea trafic prin I2P."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
@@ -5493,16 +5374,13 @@ msgstr "Router-ul testează în prezent dacă portul UDP este blocat."
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
-msgstr ""
-"Router-ul nu este configurat pentru a publica adresa sa, prin urmare, nu se "
-"așteaptă conexiuni de intrare."
+msgstr "Router-ul nu este configurat pentru a publica adresa sa, prin urmare, nu se așteaptă conexiuni de intrare."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
-msgstr ""
-"Modul ascuns este activat automat pentru o protecție sporită în anumite țări."
+msgstr "Modul ascuns este activat automat pentru o protecție sporită în anumite țări."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
@@ -5510,21 +5388,16 @@ msgstr "AVERTIZARE - Firewall și rapid"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
-"You have configured I2P to share more than 128KBps of bandwidth, but you are "
-"firewalled."
-msgstr ""
-"Ați configurat I2P pentru a partaja mai mult de 128KBps de lățime de bandă, "
-"dar va aflati in spatele unui firewall."
+"You have configured I2P to share more than 128KBps of bandwidth, but you are"
+" firewalled."
+msgstr "Ați configurat I2P pentru a partaja mai mult de 128KBps de lățime de bandă, dar va aflati in spatele unui firewall."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
-msgstr ""
-"În timp ce I2P va funcționa bine în această configurație, dacă aveți într-"
-"adevăr peste 128KBps de lățime de bandă pentru partajare, acesta va fi mult "
-"mai util la rețeaua dacă deschideți firewall-ul."
+msgstr "În timp ce I2P va funcționa bine în această configurație, dacă aveți într-adevăr peste 128KBps de lățime de bandă pentru partajare, acesta va fi mult mai util la rețeaua dacă deschideți firewall-ul."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
@@ -5533,16 +5406,12 @@ msgstr "AVERTIZARE - Firewall și Floodfill"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
-msgstr ""
-"Ați configurat I2P să fie un router floodfill, dar va aflați în spatele unui "
-"firewall."
+msgstr "Ați configurat I2P să fie un router floodfill, dar va aflați în spatele unui firewall."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
-msgstr ""
-"Pentru cea mai bună participare ca un router floodfill, ar trebui să "
-"deschideți firewall-ul."
+msgstr "Pentru cea mai bună participare ca un router floodfill, ar trebui să deschideți firewall-ul."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
@@ -5552,24 +5421,17 @@ msgstr "AVERTIZARE - Firewall cu intrare TCP Activat"
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
-msgstr ""
-"Ați configurat intrare TCP, însă portul UDP este blocat de firewall, și, "
-"prin urmare, este probabil ca portul TCP este in spatele unui firewall, de "
-"asemenea."
+msgstr "Ați configurat intrare TCP, însă portul UDP este blocat de firewall, și, prin urmare, este probabil ca portul TCP este in spatele unui firewall, de asemenea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
-"If your TCP port is firewalled with inbound TCP enabled, routers will not be "
-"able to contact you via TCP, which will hurt the network."
-msgstr ""
-"Dacă portul TCP este in spatele unui firewall cu intrare TCP-ului, routere "
-"nu va fi în măsură să vă contacteze prin intermediul TCP, care va afecta "
-"rețea."
+"If your TCP port is firewalled with inbound TCP enabled, routers will not be"
+" able to contact you via TCP, which will hurt the network."
+msgstr "Dacă portul TCP este in spatele unui firewall cu intrare TCP-ului, routere nu va fi în măsură să vă contacteze prin intermediul TCP, care va afecta rețea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
-msgstr ""
-"Vă rugăm să deschideți firewall-ul sau dezactivați intrare TCP de mai sus."
+msgstr "Vă rugăm să deschideți firewall-ul sau dezactivați intrare TCP de mai sus."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
@@ -5583,9 +5445,7 @@ msgstr "Ați configurat TCP intrare, cu toate acestea ați dezactivat UDP."
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
-msgstr ""
-"Pare să fiți in spatele unui firewall in  TCP, prin urmare, router-ul nu "
-"poate accepta conexiuni de intrare."
+msgstr "Pare să fiți in spatele unui firewall in  TCP, prin urmare, router-ul nu poate accepta conexiuni de intrare."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
@@ -5599,9 +5459,7 @@ msgstr "Eroare - abaterea ceasului"
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
-msgstr ""
-"Ceasul sistemului dvs. este incorect, ceea ce face dificil participarea in "
-"rețea."
+msgstr "Ceasul sistemului dvs. este incorect, ceea ce face dificil participarea in rețea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
@@ -5615,9 +5473,7 @@ msgstr "ERR- Adresa privata TCP"
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
-msgstr ""
-"Nu trebuie niciodată să faceți publica adresă IP inrutabil, cum ar fi "
-"127.0.0.1 sau 192.168.1.1 ca adresa dvs. externa."
+msgstr "Nu trebuie niciodată să faceți publica adresă IP inrutabil, cum ar fi 127.0.0.1 sau 192.168.1.1 ca adresa dvs. externa."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
@@ -5636,40 +5492,31 @@ msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
-msgstr ""
-"I2P nu funcționează bine în spatele acestui tip de firewall. E posibil ca nu "
-"acceptati conexiuni de intrare, ceea ce va limita participarea în rețea."
+msgstr "I2P nu funcționează bine în spatele acestui tip de firewall. E posibil ca nu acceptati conexiuni de intrare, ceea ce va limita participarea în rețea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
-msgstr ""
-"ERR-UDP port este in folosire - setati i2np.udp.internalPort=xxxx in "
-"configurari avansate si restartati"
+msgstr "ERR-UDP port este in folosire - setati i2np.udp.internalPort=xxxx in configurari avansate si restartati"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
-#, fuzzy
 msgid ""
 "I2P was unable to bind to the configured port noted on the advanced network "
 "configuration page ."
-msgstr "I2P nu a reusit legarea la portul 8887 sau un alt port configurat."
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
-msgstr ""
-"Verificați dacă un alt program nu foloseste portul configurat. Dacă este "
-"așa, opriți acel program sau configurați I2P să utilizeze alt port."
+msgstr "Verificați dacă un alt program nu foloseste portul configurat. Dacă este așa, opriți acel program sau configurați I2P să utilizeze alt port."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
-msgstr ""
-"Acest lucru poate fi o eroare tranzitorie, dacă alt program nu mai foloseste "
-"portul."
+msgstr "Acest lucru poate fi o eroare tranzitorie, dacă alt program nu mai foloseste portul."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
@@ -5683,9 +5530,7 @@ msgstr "ERR-UDP dezactivat și TCP host / port de intrare nu este setat"
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
-msgstr ""
-"Nu ați configurat TCP intrare cu hostname și port de mai sus, cu toate "
-"acestea ați dezactivat UDP."
+msgstr "Nu ați configurat TCP intrare cu hostname și port de mai sus, cu toate acestea ați dezactivat UDP."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
@@ -5693,8 +5538,7 @@ msgstr "Prin urmare, router-ul nu poate accepta conexiuni de intrare."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
-msgstr ""
-"Vă rugăm să configurați o TCP si portul de mai sus sau sa permiteti UDP."
+msgstr "Vă rugăm să configurați o TCP si portul de mai sus sau sa permiteti UDP."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
@@ -5702,9 +5546,7 @@ msgstr "ERR-Client Manager I2CP Eroare - verifica log-uri"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
-msgstr ""
-"Acest lucru se datorează de obicei conflictului la port 7654 . Verificați "
-"jurnalele "
+msgstr "Acest lucru se datorează de obicei conflictului la port 7654 . Verificați jurnalele "
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
@@ -5735,9 +5577,7 @@ msgstr "Blocare / dezblocarea manuala a utilizatorului"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
-msgstr ""
-"Blocarea va împiedica participarea acestui utilizator în tuneluri pe care le "
-"creați."
+msgstr "Blocarea va împiedica participarea acestui utilizator în tuneluri pe care le creați."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
@@ -5745,15 +5585,11 @@ msgstr "Reglați Bonusuri pentru profil"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
-"Bonuses may be positive or negative, and affect the peer's inclusion in Fast "
-"and High Capacity tiers. Fast peers are used for client tunnels, and High "
+"Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
+" and High Capacity tiers. Fast peers are used for client tunnels, and High "
 "Capacity peers are used for some exploratory tunnels. Current bonuses are "
 "displayed on the"
-msgstr ""
-"Bonusurile pot fi pozitive sau negative, și afectează includerea egal în "
-"niveluri rapide și de mare capacitate. Colegii rapide sunt utilizate pentru "
-"tuneluri client, și colegii de mare capacitate sunt utilizate pentru unele "
-"tuneluri de explorare. Bonusurile actuale sunt afișate pe"
+msgstr "Bonusurile pot fi pozitive sau negative, și afectează includerea egal în niveluri rapide și de mare capacitate. Colegii rapide sunt utilizate pentru tuneluri client, și colegii de mare capacitate sunt utilizate pentru unele tuneluri de explorare. Bonusurile actuale sunt afișate pe"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
@@ -5784,25 +5620,18 @@ msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
-msgstr ""
-"restabilirea este procesul de bootstrapping folosit pentru a găsi alte "
-"routere atunci când instalați prima data I2P, sau atunci când router-ul are "
-"prea puține referințe router rămase."
+msgstr "restabilirea este procesul de bootstrapping folosit pentru a găsi alte routere atunci când instalați prima data I2P, sau atunci când router-ul are prea puține referințe router rămase."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
-msgstr ""
-"Dacă reseeding nu a reușit, ar trebui să verificați mai întâi conexiunea la "
-"rețea."
+msgstr "Dacă reseeding nu a reușit, ar trebui să verificați mai întâi conexiunea la rețea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
-msgstr ""
-"Schimba acestea numai dacă HTTP este blocat de un firewall , reseed nu a "
-"reușit, și aveți acces la un proxy HTTP."
+msgstr "Schimba acestea numai dacă HTTP este blocat de un firewall , reseed nu a reușit, și aveți acces la un proxy HTTP."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
@@ -5895,51 +5724,40 @@ msgstr "Deconectează router"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
-"Graceful shutdown lets the router satisfy the agreements it has already made "
-"before shutting down, but may take a few minutes."
-msgstr ""
-"Oprirea corecta permite router de a aplica modificările pe care le-ati făcut "
-"deja înainte de a opri, dar poate dura câteva minute."
+"Graceful shutdown lets the router satisfy the agreements it has already made"
+" before shutting down, but may take a few minutes."
+msgstr "Oprirea corecta permite router de a aplica modificările pe care le-ati făcut deja înainte de a opri, dar poate dura câteva minute."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
-"If you need to kill the router immediately, that option is available as well."
-msgstr ""
-"Dacă aveți nevoie de a opri imediat router, această opțiune este de asemenea "
-"disponibila."
+"If you need to kill the router immediately, that option is available as "
+"well."
+msgstr "Dacă aveți nevoie de a opri imediat router, această opțiune este de asemenea disponibila."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
-"If you want the router to restart itself after shutting down, you can choose "
-"one of the following."
-msgstr ""
-"Dacă doriți ca router-ul să se restarteze după închiderea, puteți alege una "
-"dintre următoarele."
+"If you want the router to restart itself after shutting down, you can choose"
+" one of the following."
+msgstr "Dacă doriți ca router-ul să se restarteze după închiderea, puteți alege una dintre următoarele."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
-msgstr ""
-"Acest lucru este util în anumite situații - de exemplu, dacă ați schimbat "
-"cateva setari pe care aplicațiile client citesc doar la pornire, cum ar fi "
-"parola consolei router-ului sau interfeței si ascultă-l."
+msgstr "Acest lucru este util în anumite situații - de exemplu, dacă ați schimbat cateva setari pe care aplicațiile client citesc doar la pornire, cum ar fi parola consolei router-ului sau interfeței si ascultă-l."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
-msgstr ""
-"Un restart lent va dura câteva minute (dar colegii dumneavoastră vor aprecia "
-"răbdarea), în timp ce o repornire rapida face acest lucru imediat."
+msgstr "Un restart lent va dura câteva minute (dar colegii dumneavoastră vor aprecia răbdarea), în timp ce o repornire rapida face acest lucru imediat."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
-"After tearing down the router, it will wait 1 minute before starting back up "
-"again."
-msgstr ""
-"După oprirea router-ului, așteptați 1 minut înainte de a începe din nou."
+"After tearing down the router, it will wait 1 minute before starting back up"
+" again."
+msgstr "După oprirea router-ului, așteptați 1 minut înainte de a începe din nou."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
@@ -5949,22 +5767,18 @@ msgstr "Integrare în systray"
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
-msgstr ""
-"Pe platforma Windows, există o aplicație mică pentru a sta în bara de "
-"sistem, permițându-vă vizualizarea stării a router-ului"
+msgstr "Pe platforma Windows, există o aplicație mică pentru a sta în bara de sistem, permițându-vă vizualizarea stării a router-ului"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
-msgstr ""
-"(mai târziu, aplicațiile client I2P vor fi capabile să integreze propriile "
-"funcționalități în bara de sistem)."
+msgstr "(mai târziu, aplicațiile client I2P vor fi capabile să integreze propriile funcționalități în bara de sistem)."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
-msgid "If you are on windows, you can either enable or disable that icon here."
-msgstr ""
-"Dacă sunteți pe Windows, puteți activa sau dezactiva aceasta icoana aici."
+msgid ""
+"If you are on windows, you can either enable or disable that icon here."
+msgstr "Dacă sunteți pe Windows, puteți activa sau dezactiva aceasta icoana aici."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
@@ -5980,12 +5794,9 @@ msgstr "Rulați la pornire"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
-"You can control whether I2P is run on startup or not by selecting one of the "
-"following options - I2P will install (or remove) a service accordingly."
-msgstr ""
-"Puteți controla dacă I2P se execută la pornire sau nu prin selectarea uneia "
-"din următoarele opțiuni - I2P va instala (sau elimina) un serviciu "
-"corespunzător."
+"You can control whether I2P is run on startup or not by selecting one of the"
+" following options - I2P will install (or remove) a service accordingly."
+msgstr "Puteți controla dacă I2P se execută la pornire sau nu prin selectarea uneia din următoarele opțiuni - I2P va instala (sau elimina) un serviciu corespunzător."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
@@ -5998,19 +5809,15 @@ msgstr "Notă"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
-"If you are running I2P as service right now, removing it will shut down your "
-"router immediately."
-msgstr ""
-"Dacă se execută I2P ca serviciu chiar acum, eliminarea va opri router-ul "
-"imediat."
+"If you are running I2P as service right now, removing it will shut down your"
+" router immediately."
+msgstr "Dacă se execută I2P ca serviciu chiar acum, eliminarea va opri router-ul imediat."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
-msgstr ""
-"Poate doriți sa opriți lent ca mai sus atunci rulați "
-"uninstall_i2p_service_winnt.bat."
+msgstr "Poate doriți sa opriți lent ca mai sus atunci rulați uninstall_i2p_service_winnt.bat."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
@@ -6022,13 +5829,10 @@ msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
-"At times, it may be helpful to debug I2P by getting a thread dump. To do so, "
-"please select the following option and review the thread dumped to <a href="
-"\"logs.jsp#servicelogs\">wrapper.log</a>."
-msgstr ""
-"Uneori, acesta poate fi de ajutor pentru a depana I2P de a obține thread "
-"dump Pentru a face acest lucru, vă rugăm să selectați opțiunea următoare și "
-"sa revizuiti thread dump la <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
+"At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
+" please select the following option and review the thread dumped to <a "
+"href=\"logs.jsp#servicelogs\">wrapper.log</a>."
+msgstr "Uneori, acesta poate fi de ajutor pentru a depana I2P de a obține thread dump Pentru a face acest lucru, vă rugăm să selectați opțiunea următoare și sa revizuiti thread dump la <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
@@ -6038,10 +5842,7 @@ msgstr "Lansarea browser-ul la pornire router-ului?"
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
-msgstr ""
-"Interfata de configurare principal I2P este această consolă web, astfel "
-"încât pentru  confortul dumneavoastră poate I2P lansa un browser web la "
-"pornire indică la"
+msgstr "Interfata de configurare principal I2P este această consolă web, astfel încât pentru  confortul dumneavoastră poate I2P lansa un browser web la pornire indică la"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
@@ -6128,18 +5929,13 @@ msgstr "Există un compromis fundamental între anonimitatea și performanță."
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
-"hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely "
-"reduce performance or reliability."
-msgstr ""
-"Tuneluri mai lungi de 3 hamei (de exemplu, 2 hamei + 0-2 hamei, 3 hamei + "
-"0-1 hamei, 3 hamei + 0-2 hamei), sau o cantitate mare cantitate de rezervă "
-"+, poate reduce drastic performanta sau fiabilitatea."
+"hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
+" reduce performance or reliability."
+msgstr "Tuneluri mai lungi de 3 hamei (de exemplu, 2 hamei + 0-2 hamei, 3 hamei + 0-1 hamei, 3 hamei + 0-2 hamei), sau o cantitate mare cantitate de rezervă +, poate reduce drastic performanta sau fiabilitatea."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
-msgstr ""
-"Folosirea inalta de CPU si /sau folosirea bandei de iesire poate fi ca "
-"rezultat"
+msgstr "Folosirea inalta de CPU si /sau folosirea bandei de iesire poate fi ca rezultat"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
@@ -6176,18 +5972,14 @@ msgstr "Oformarea Consolei Router "
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
-msgstr ""
-"selecția oformarii este dezactivata pentru Internet Explorer, îmi pare rău."
+msgstr "selecția oformarii este dezactivata pentru Internet Explorer, îmi pare rău."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
-msgstr ""
-"Dacă nu utilizați IE, este posibil ca browser-ul se preface a fi IE, vă "
-"rugăm să configurați browser-ul dvs. (sau proxy) pentru a utiliza un alt "
-"agent șir utilizator dacă doriți să accesați temele consola."
+msgstr "Dacă nu utilizați IE, este posibil ca browser-ul se preface a fi IE, vă rugăm să configurați browser-ul dvs. (sau proxy) pentru a utiliza un alt agent șir utilizator dacă doriți să accesați temele consola."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
@@ -6197,9 +5989,7 @@ msgstr "Limba consolei router-ului"
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
-msgstr ""
-"Vă rugăm să contribuiți la proiectul de traducere consolei router! {Puteți "
-"lua legătura cu dezvoltatorii din # I2P-dev pe IRC pentru ajutor."
+msgstr "Vă rugăm să contribuiți la proiectul de traducere consolei router! {Puteți lua legătura cu dezvoltatorii din # I2P-dev pe IRC pentru ajutor."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
@@ -6342,11 +6132,9 @@ msgstr "Vă rugăm să raportați bug-uri pe {0} sau {1}."
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
-"You may use the username \"guest\" and password \"guest\" if you do not wish "
-"to register."
-msgstr ""
-"Puteți utiliza numele de utilizator \"guest\" și parola \"guest\", dacă nu "
-"doriți să înregistrați."
+"You may use the username \"guest\" and password \"guest\" if you do not wish"
+" to register."
+msgstr "Puteți utiliza numele de utilizator \"guest\" și parola \"guest\", dacă nu doriți să înregistrați."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
@@ -6371,11 +6159,9 @@ msgstr "I2P versiune și mediu de funcționare "
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
-"clues to your location; please review everything you include in a bug report."
-msgstr ""
-"Rețineți că sistemul de informații, amprente de timp jurnal, și mesajele de "
-"jurnal pot oferi indicii pentru locația dvs., vă rugăm să revedeți tot ce "
-"includ într-un raport de bug."
+"clues to your location; please review everything you include in a bug "
+"report."
+msgstr "Rețineți că sistemul de informații, amprente de timp jurnal, și mesajele de jurnal pot oferi indicii pentru locația dvs., vă rugăm să revedeți tot ce includ într-un raport de bug."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
@@ -6385,9 +6171,7 @@ msgstr "Pagina nu a fost găsită"
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
-msgstr ""
-"Ne pare rău! A parea să fie solicitata o pagină inexistentă din consola "
-"router sau resurse."
+msgstr "Ne pare rău! A parea să fie solicitata o pagină inexistentă din consola router sau resurse."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
@@ -6398,14 +6182,12 @@ msgid "not found"
 msgstr "Nu s-a găsit"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
-#, fuzzy
 msgid "events"
-msgstr "Nu-s evenimente"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
-#, fuzzy
 msgid "I2P Event Log"
-msgstr "I2P router jurnal"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
@@ -6421,26 +6203,12 @@ msgstr "Graficele de performanță I2P"
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
-msgstr ""
-"Faceți clic pe un steag pentru a selecta o limbă. Faceți clic pe \"configura "
-"limba\" de mai jos pentru a schimba mai târziu."
+msgstr "Faceți clic pe un steag pentru a selecta o limbă. Faceți clic pe \"configura limba\" de mai jos pentru a schimba mai târziu."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr "Caută în I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Eepsites de interes"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "Managerul tunelului I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Managerul tunelului I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar Fisier Dump"
@@ -6503,11 +6271,9 @@ msgstr "Aplicația web solicitată nu se execută."
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
-"Please visit the <a href=\"/configclients.jsp#webapp\">config clients page</"
-"a> to start it."
-msgstr ""
-"Vă rugăm să vizitați<a href=\"/configclients.jsp#webapp\">configurare "
-"clientilor</a> pentru a porni"
+"Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
+"page</a> to start it."
+msgstr "Vă rugăm să vizitați<a href=\"/configclients.jsp#webapp\">configurare clientilor</a> pentru a porni"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
@@ -6575,6 +6341,3 @@ msgstr "mail web"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr "I2P Webmail"
-
-#~ msgid "Rechecking router reachability..."
-#~ msgstr "Reverificare accesibilitatea routerului ..."
diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po
index b5ac269d1e656492be56679b8eb2c015c88bf9fc..f15ad5ec80af78c3889eace500e78e858720a2cd 100644
--- a/apps/routerconsole/locale/messages_ru.po
+++ b/apps/routerconsole/locale/messages_ru.po
@@ -22,15 +22,15 @@
 # Roman A. <transifex@basicxp.ru>, 2013
 # varnav, 2013
 # Roman A. <transifex@basicxp.ru>, 2013
-# yume, 2014
+# yume, 2014-2015
 # Andrey Lukyanenko <operru32@yandex.ru>, 2013
 # Roman A. <transifex@basicxp.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 20:12+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 10:58+0000\n"
 "Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -60,7 +60,7 @@ msgstr[2] "{0,number,####} мс"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -70,7 +70,7 @@ msgstr[2] "{0} с"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -80,7 +80,7 @@ msgstr[2] "{0} мин."
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -88,13 +88,13 @@ msgstr[0] "{0} час"
 msgstr[1] "{0} часа"
 msgstr[2] "{0} часов"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "н/д"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -102,44 +102,44 @@ msgstr[0] "{0} день"
 msgstr[1] "{0} дня"
 msgstr[2] "{0} дней"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Заблокирован по хешу маршрутизатора: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Заблокирован по хешу маршрутизатора"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP заблокирован по записи в blocklist.txt: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP-адреса, заблокированные до перезапуска"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP-адреса, заблокированные навсегда"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "От кого"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Кому"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "нет"
 
@@ -149,66 +149,66 @@ msgstr "нет"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Не принимаем туннели: маршрутизатор запускается"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Не принимаем туннели: высокая задержка сообщений"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Не принимаем туннели: высокое число запросов"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Не принимаем туннели: достигнут предел числа туннелей"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Не принимаем туннели: достигнут предел пропускной способности"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Не принимаем туннели: достигнут предел пропускной способности"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Принимаем большинство туннелей"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Принимаем туннели"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Не принимаем туннели: маршрутизатор в процессе отключения"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Не принимаем туннели"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Начальная загрузка"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
@@ -216,26 +216,26 @@ msgstr[0] "При начальной загрузке получены данн
 msgstr[1] "При начальной загрузке получены данные только о {0} маршрутизаторах."
 msgstr[2] "При начальной загрузке получены данные только о {0} маршрутизаторах."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Начальная загрузка не удалась."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Смотрите {0} для получения помощи."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "страница настройки начальной загрузки"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Производится начальная загрузка: загружается URL каталога маршрутизаторов."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -269,7 +269,7 @@ msgstr "Количество пиров, с которыми мы активно
 msgid "Known fast peers"
 msgstr "Известные быстрые узлы"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Запись сетевой БД"
 
@@ -279,45 +279,54 @@ msgstr "Запись сетевой БД"
 msgid "No transports (hidden or starting up?)"
 msgstr "Нет транспортных протоколов (в скрытом режиме или запущен недавно?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "Неподдерживаемый тип подписи"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Недоступен по всем транспортным протоколам"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Адреса транспортов маршрутизатора"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} используется только для исходящих соединений"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP не включен"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Справка"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Пределы транспортных соединений назначены автоматически на основе заданной вами пропускной способности."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Для переопределения этих пределов добавьте параметры i2np.ntcp.maxConnections=nnn и i2np.udp.maxConnections=nnn на странице расширенных настроек."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Обозначения"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -326,251 +335,258 @@ msgstr "Обозначения"
 msgid "Peer"
 msgstr "Узел"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Удаленный узел, идентифицируемый хешем маршрутизатора"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Направление"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Входящее соединение"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Исходящее соединение"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Этот узел предлагает себя в качестве нашего посредника (для того, чтобы другие узлы могли соединяться с нами в обход нашего брандмауэра)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Мы предлагаем себя в качестве посредника для этого узла (чтобы другие узлы могли соединяться с ним в обход его брандмауэра)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Сколько прошло времени после приема/передачи последнего пакета"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Неактивен"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Прием/передача"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Усреднённые скорости приёма/передачи (кБайт/сек) "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Время жизни соединения"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Подключен"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Сдвиг"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Разница хода часов между узлом и нами"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "<i>Congestion Window</i>. Окно перегрузки — количество байт, которое мы можем послать без полученного подтверждения"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Количество отправленных сообщений, ожидающих подтверждения"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Максимальное количество параллельно отправляемых сообщений"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Количество ожидающих посылок, превосходящих размер окна перегрузки"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "<i>Slow Start Threshold</i>. Порог медленного старта"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "<i>Round-Trip Time</i>. Время между отправкой запроса и получением ответа (в миллисекундах)"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "<i>Retransmit Time-Out</i>. Время ожидания подтверждения перед повторной отправкой пакета (в миллисекундах)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "<i>Maximum Transfer Unit</i>. Текущий максимальный размер исходящих/входящих пакетов (в байтах) "
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "Передано"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Общее количество отправленных узлу пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "Принято"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Общее количество принятых от узла пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Повт. отправлено"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Общее количество повторно отправленных узлу пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Повт. принято"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Общее количество повторно принятых от узла пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Служба"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Общая конфигурация WAN-интерфейсов"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Состояние"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Тип"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Восходящий канал"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Нисходящий канал"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "PPP WAN-соединение"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Время работы"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Внешний IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "L3-пересылка"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Служба соединения по умолчанию"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "IP WAN-соединение"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Настройки соединения WAN Ethernet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Найдено устройство"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Подустройство"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Состояние UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Отключить UPnP Устройства"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP был отключен; есть ли у вас более одного шлюза с поддержкой UPnP в локальной сети?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "В локальной сети не найдено ни одного поддерживающего UPnP устройства."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Текущий внешний IP-адрес, полученный через UPnP: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Текущий внешний IP-адрес не доступен."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP сообщает максимальную скорость нисходящего потока {0}бит/секунду"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP сообщает максимальную скорость восходящего потока {0}бит/секунду"
@@ -579,67 +595,63 @@ msgstr "UPnP сообщает максимальную скорость восх
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} порт {1,number,#####} был успешно проброшен с помощью UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} порт {1,number,#####} не был проброшен с помощью UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP не включен"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Чрезмерный сдвиг времени: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP-соединения"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Предел"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Тайм-аут"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Исходящая очередь"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "В очереди?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Входящие"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Исходящие"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
@@ -647,213 +659,213 @@ msgstr[0] "{0} пир"
 msgstr[1] "{0} пира"
 msgstr[2] "{0} пиров"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP-соединения"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Сортировать по хешу узла"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Направление/посредничество"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Сортировать по неактивности приема"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Сортировать по неактивности передачи"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Сортировать по скорости приема"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Сортировать по скорости передачи"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Сортировать по времени жизни соединения"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Сортировать по сдвигу часов"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Сортировать по размеру окна перегрузки"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Сортировать по порогу медленного старта"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Сортировать по времени прохождения сигнала"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Сортировать по тайм-ауту повторной передачи"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Сортировать по размеру исходящего MTU"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Сортировать по количеству отправленных пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Сортировать по количеству принятых пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Сортировать по количеству повторно отправленных пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Сортировать по количеству повторно принятых пакетов"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Мы предлагаем себя в качестве посредника для этого узла"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Этот узел предлагает себя в качестве нашего посредника"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Дросселирован"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 сбой"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} сбоя(-ев)"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Заблокирован"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "перегружен"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Игнорируем запросы туннелей: время выполнения превысило ожидаемое"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Игнорируем запросы туннелей: слишком высокая нагрузка"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr "Отклоняем туннели: скрытый режим"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Не принимаем туннели: слишком много запросов"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Не принимаем туннели: достигнут предел числа соединений"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Игнорируем запросы туннелей: высокая нагрузка"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Игнорируем запросы туннелей: слишком большое время пребывания в очереди"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Доступна новая версия {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Ошибка при проверке наличия обновлений для модуля {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Для модуля {0} нет обновлений"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0} байт загружено"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Не удалось произвести передачу файлов из {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Обновление загружено"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Производится перезапуск"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Подлинность обновления проверена"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "из {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Обнаружено повреждение в неподписанном обновлении, загруженном из {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Не удалось скопировать в {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Внутрисетевые обновления отключены. Проверьте менеджер пакетов."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Отсутствует разрешение на запись в директорию установки I2P."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Сначала вы должны обновить до версии {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Требуется Java версии {0} но установлена Java версии {1}"
@@ -1361,8 +1373,8 @@ msgid "Add Client"
 msgstr "Добавить клиент"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Клиентские"
 
@@ -1393,9 +1405,9 @@ msgid "Plugin"
 msgstr "Модуль"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Версия"
 
@@ -1417,7 +1429,7 @@ msgstr "Лицензия"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Веб-сайт"
 
@@ -1430,7 +1442,7 @@ msgid "Stop"
 msgstr "Остановить"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Проверить наличие обновлений"
@@ -1452,7 +1464,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1462,7 +1474,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1481,6 +1493,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1561,7 +1574,7 @@ msgstr "Неверный адрес назначения"
 msgid "Log overrides updated"
 msgstr "Переопределения журналирования обновлены"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Конфигурация журналирования сохранена"
 
@@ -1610,7 +1623,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1629,7 +1642,7 @@ msgid "Home Page"
 msgstr "Домашняя страница"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Сеть"
 
@@ -1685,8 +1698,8 @@ msgid "UI"
 msgstr "Интерфейс"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Туннели"
@@ -1705,15 +1718,15 @@ msgid "Logging"
 msgstr "Журналирование"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Узлы"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Статистика"
 
@@ -1726,7 +1739,7 @@ msgstr "Расширенные"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1836,16 +1849,16 @@ msgstr "Обновление доли транзитного трафика"
 msgid "Updated bandwidth limits"
 msgstr "Пределы полосы пропускания обновлены"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "неизвестен"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "бит в секунду"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "или {0} байт в месяц максимум"
@@ -2414,7 +2427,7 @@ msgstr "Имя пользователя"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Добавить"
 
@@ -2423,86 +2436,86 @@ msgstr "Добавить"
 msgid "Password"
 msgstr "Пароль"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Обновление или проверка уже в процессе"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Доступно обновление, идет попытка загрузки"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Доступно обновление, нажмите кнопку слева для загрузки"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Нет доступных обновлений"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Изменение URL новостей на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "внутренний"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Изменение узла прокси на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Изменение порта прокси на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Изменение частоты обновлений на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Никогда"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Изменение политики обновлений на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Обновление URL обновлений."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Обновление доверенных ключей."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Изменение URL неподписанных обновлений на {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Каждые"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Только уведомлять"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Только скачивать и проверять целостность"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Скачивать, проверять целостность и перезапускать"
 
@@ -2660,7 +2673,7 @@ msgid "{0} for {1}"
 msgstr "{0} за {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Загрузка канала"
 
@@ -2774,12 +2787,12 @@ msgid "Graph settings saved"
 msgstr "Настройки графиков сохранены"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Адресная книга"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Управление файлами hosts (единственный механизм, используемый I2P для разрешения доменных имен)"
 
@@ -2810,17 +2823,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Конфигурация домашней страницы маршрутизатора I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Анонимный почтовый клиент с веб-интерфейсом"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "Эл. почта"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "Справка маршрутизатора I2P"
 
@@ -2830,17 +2843,17 @@ msgid "Router Console"
 msgstr "Консоль маршрутизатора I2P"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Встроенный анонимный BitTorrent-клиент"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Торренты"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Локальный веб-сервер"
 
@@ -2926,10 +2939,8 @@ msgstr "Документация Java"
 msgid "Technical documentation"
 msgstr "Техническая документация"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -3012,7 +3023,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Ваш браузер не настроен должным образом для использования HTTP-прокси {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Название"
 
@@ -3162,148 +3173,157 @@ msgid "Unpublished"
 msgstr "неопубликованный"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "адрес назначения"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "Добавить в локальную адресную книгу"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Истекает через {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Истек {0} назад"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Туннель"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "База не инициализирована"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Статистика маршрутизаторов"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Количество"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Транспортный протокол"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Страна"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Информация о нас"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Информация об узле"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Полная запись"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Скрытый"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Обновленный"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} назад"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Опубликовано"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "Подписывающий ключ"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Адрес(а)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "cost"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "В скрытом режиме или недавно запущен"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU через посредников"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP и SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP и SSU через посредников"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "Только IPv6 SSU, представители"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, представители"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, представители"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "Только IPv6 NTCP, SSU, представители"
 
@@ -3322,7 +3342,7 @@ msgid "Hide news"
 msgstr "Скрыть новости"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Показать новости"
 
@@ -3407,7 +3427,7 @@ msgid "Failing"
 msgstr "Сбоящие"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "интегрированные"
 
@@ -3620,7 +3640,7 @@ msgid "Lifetime average frequency"
 msgstr "Средняя частота за время работы"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3673,282 +3693,282 @@ msgstr "График данных"
 msgid "Graph Event Count"
 msgstr "График количества событий"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Экспорт данных в XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Среднее значение за время работы"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "Справка и FAQ маршрутизатора I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Справка и FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Настройка автозапуска клиентов и веб-приложений (служб), ручной запуск неактивных приложений"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "Службы I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Настройка маршрутизатора I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "Настройки I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Отобразить существующие туннели и состояние строящихся"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Просмотр списка текущих соединений с узлами"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Просмотр недавних профилей производительности узлов"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Профили"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Показать список всех известных I2P-маршрутизаторов"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "Сетевая БД"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Отчет о состоянии маршрутизатора"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Журналы"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "График производительности маршрутизатора"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Графики"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Статистика производительности маршрутизатора в текстовом виде"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr "Локальные туннели"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "Менеджер туннелей"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "Управление скрытыми сервисами"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Общая информация"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Ваш локальный идентификатор — это уникальный идентификатор Вашего I2P-маршрутизатора, как IP-адрес, но применительно к I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "Никогда не сообщайте его кому-либо, это может раскрыть Ваш IP-адрес."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Локальный идентификатор"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Уникальный идентификатор Вашего I2P-маршрутизатора:"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "никому его не показывайте"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "показать"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Версия запущенного ПО I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Время работы маршрутизатора с последнего запуска"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Время работы"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Помощь в настройке брандмауэра и маршрутизатора для обеспечения оптимальной производительности I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "Подробнее в wiki"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "Внимание: ECDSA недоступно. Обновите Java или ОС."
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Настройка обновления I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "Обновление I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Узлы, с которыми была связь за последние минуты/часы"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Активные"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Число узлов, доступных для создания клиентских туннелей"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Быстрые"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Число узлов, доступных для создания зондирующих туннелей"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Высокоемкие"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Число узлов, доступных для запросов к сетевой БД"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Общее число узлов в нашей сетевой БД"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Известные"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Настройка ограничений скорости"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Трафик (вх./исх.)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Всего"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Объем"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Используются для создания и тестирования туннелей и соединения с floodfill-узлами"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Зондирующие"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Туннели, используемые для доступа к службам сети или их публикации"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Туннели, в которых мы принимаем участие, непосредственно способствующие пропускной способнсти сети"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Транзитные"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "Доля транзита отображает соотношение предоставляемой нами пропускной способности для транзитных туннелей по отношению к потребляемой нами скорости. Соотношение 1.00 означает положительный вклад в сеть"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Доля транзита"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Просмотр очереди заданий маршрутизатора"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Занятость"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Отражает производительность маршрутизатора"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Задержка задач"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Показывает, как быстро исходящие сообщения отправляются другим I2P-маршрутизаторам"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Задежка сообщений"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Тест времени прохождения туннеля"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Задержка туннелей"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "Очередь запросов от других маршрутизаторов, принимающих участие в туннелях"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Очередь"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Новости и обновления"
 
@@ -4022,43 +4042,43 @@ msgstr "ОШИБКА — UDP отключен и не заданы адрес/п
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "ПРЕДУПРЕЖДЕНИЕ — Заблокирован извне при отключенном UDP"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Управление клиентскими и серверными туннелями"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Сервер"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "Скрытый сервис"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Перейти к списку туннелей"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Срок аренды истек"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Перестроение"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "назад"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Готов к работе"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Построение"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Построение туннелей"
 
@@ -4066,31 +4086,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "коллективных клиентов"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Перезапустите I2P-маршрутизатор для установки"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Остановите и снова запустите I2P-маршрутизатор для установки"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Версия {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Доступно обновление"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Скачать обновление {0}"
@@ -4099,40 +4119,40 @@ msgstr "Скачать обновление {0}"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Скачать неподписанное<br>обновление {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Помощь в настройке брандмауэра"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Проверьте сетевое соединение и настройки NAT/брандмауэра"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Повторить начальную загрузку"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Порядок"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Верх"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Вниз"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Низ"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Выберите секцию для добавления"
 
@@ -4405,6 +4425,10 @@ msgstr "Шифрование"
 msgid "i2cp"
 msgstr "I2CP"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "Менеджер туннелей"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "Сетевой пул"
@@ -4722,7 +4746,7 @@ msgstr "Расширенные сетевые настройки"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4810,13 +4834,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Выключен — клиенты снаружи данного Java-процесса не могут подключиться"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "Порт I2CP"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "Интерфейс I2CP"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "Порт I2CP"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Авторизация "
@@ -4903,13 +4927,14 @@ msgid "Search Engines"
 msgstr "Поисковые системы"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Рекомендуемые I2P-сайты"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "Интересные скрытые сервисы"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Локальные службы"
+msgid "Applications and Configuration"
+msgstr "Приложения и настройки"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4968,48 +4993,53 @@ msgstr "Настройка опций журналирования I2P"
 msgid "Log file"
 msgstr "Файл журнала"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "Отредактируйте {0} для изменений"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(во время ротации журнала символ '@' будет заменен на номер)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Формат записи в журнал"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "('d' = дата, 'c' = класс, 't' = поток, 'p' = приоритет, 'm' = сообщение)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Формат даты"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = месяц, 'dd' = день, 'HH' = часы, 'mm' = минуты, 'ss' = секунды, 'SSS' = миллисекунды)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Макс. размер файла журнала"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Уровень детализации по умолчанию"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(не рекомендуется использовать уровни DEBUG и INFO для постоянного использования, так как они сильно замедлят работу Вашего маршрутизатора)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Переопределения уровня детализации"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Новое переопределение"
 
@@ -6197,18 +6227,6 @@ msgstr "Нажмите на флаг для выбора языка. В даль
 msgid "Search I2P"
 msgstr "Поиск по I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "I2P-сайты по интересам"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "Менеджер туннелей I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Менеджер туннелей I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Дамп Jar-файла"
diff --git a/apps/routerconsole/locale/messages_sv.po b/apps/routerconsole/locale/messages_sv.po
index a9857c9da52be068c2fd3a1b29ca46646bdaa2db..88846c35646cd0a00052bf606dcd8439922bdaa0 100644
--- a/apps/routerconsole/locale/messages_sv.po
+++ b/apps/routerconsole/locale/messages_sv.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -46,7 +46,7 @@ msgstr[1] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -55,7 +55,7 @@ msgstr[1] "{0} sek"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -64,64 +64,64 @@ msgstr[1] "{0} min"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "1 timme"
 msgstr[1] "{0} timmar"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "n/a"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "1 dag"
 msgstr[1] "{0} dagar"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Bannad med hjälp av routerhash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Bannad med hjälp av routerhash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP bannad med hjälp av blocklist.txt post {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP blockerade tills omstart "
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP permanent blockerat"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Från"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Till"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "ingen"
 
@@ -131,92 +131,92 @@ msgstr "ingen"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Avvisar tunlar: Startar"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Avvisar tunnlar: Hög meddelandefördröjning"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Avvisar tunnlar: Högt antal förfrågningar"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Avvisar tunnlar: Gränsen nådd"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Avvisar tunnlar: Bandbreddsgräns"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Avvisar de flesta tunnlarna: Bandbreddsgräns"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Accepterar de flesta tunnlarna"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Accepterar tunnlar"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Avvisar tunnlar: Stänger ner"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Avvisar tunnlar"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Reseedar"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Reseed hämtad endast en router."
 msgstr[1] "Reseed hämtad endast {0} routrar."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Reseed misslyckades."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Se {0} för hjälp"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "sida för konfiguration av omseedning"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Reseed: hämtar seed URL."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -250,7 +250,7 @@ msgstr "Hur många peers vi aktivt talar med"
 msgid "Known fast peers"
 msgstr "Snabba kända peerer"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb post"
 
@@ -260,45 +260,54 @@ msgstr "NetDb post"
 msgid "No transports (hidden or starting up?)"
 msgstr "Inga transporter (gömd eller håller på att startas?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Onåbar på varje transport"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Router transport adresser"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} används för utgående anslutningar enbart"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP är inte aktiverat"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Din transportförbindelses gränser sätts automatiskt baserat på din konfigurerade bandbredd."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "För att åsidosätta dessa gränser, lägg till inställningarna i2np.ntcp.maxConnections = nnn och i2np.udp.maxConnections = nnn på den avancerade inställningarsidan."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Definitioner"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -307,251 +316,258 @@ msgstr "Definitioner"
 msgid "Peer"
 msgstr "Peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Fjärr peeren, identifierad med routerhash"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Mapp"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Inkommande anslutning"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Utgående anslutning"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "De erbjöd att introducera oss (hjälp andra traversera vår brandvägg)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Vi erbjöd att introducera dom (hjälp andra att traversera deras brandvägg)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Tiden sedan ett paket har mottagits / sänts"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Stillastående"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "In/Ut"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Den utjämnade ingående / utgående överföringshastigheten (KByte per sekund)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Tiden sedan denna anslutning etablerades"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Uppe"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Tidsförvridning"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Skillnaden mellan peerens klocka och din"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Överbelastningsfönster, vilket är hur många bytes kan sändas utan en bekräftelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Antalet skickade meddelanden som väntar på bekräftelse"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Maximala antalet samtidiga meddelande som ska skickas"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Antalet försändningar som överstiger överbelastningsfönstret"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Den tröskel för långsam start"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Tur och returtid i millisekunder"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Återsändnings timeout i millisekunder"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Nuvarande maximala försändningsstorlek för paket / uppskattad maximal mottagningsstorlek för paket (bytes)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Det totala antalet paket som skickats till denna peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Det totala antalet paket som har mottagits från denna peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "DUP TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Det totala antalet paket som återutsänds till peer"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "DUP RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Totalt antal dupplicerade paket mottagna från peeren"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Service"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Grundinställningar WAN inställningar"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Typ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Uppström"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Nerström"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP anslutning"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Upptid"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Extern IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Lager 3 vidarebefordring"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Standard anslutningstjänst"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP Anslutning"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN Ethernet Link-konfiguration"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Hittade enhet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Subenhet "
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP Status"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Inaktiverade UPnP Enheter"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP har deaktiverats. Har du mer än en   UPnP Internet Gateway enhet i ditt LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP har inte hittat någon UPnP-aware kompatibel enhet på ditt LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Den nuvarande externa IP-adress som rapporterats av UPnP är {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Den aktuella externa IP-adress är inte tillgänglig."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP rapporterar att den högsta nedströms hastigheten är {0} bits / sekund"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP rapporterar att den högsta uppströms hastigheten är {0} bits / sekund"
@@ -560,280 +576,276 @@ msgstr "UPnP rapporterar att den högsta uppströms hastigheten är {0} bits / s
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} port {1,number,#####} var framgångsrikt vidarebefordrad av UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} port {1,number,#####} blev inte vidarebefordrad av UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP är inte aktiverat"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Överdriven klockförskjutning: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCPanslutningar"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Gräns"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Jobbkö"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Släpar efter?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Inkommande"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Utgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} peer"
 msgstr[1] "{0} peers"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP-anslutningar"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sortera efter peer hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Riktning/Inledning"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sortera efter stillastående inkommande"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sortera efter utgående utgående"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sortera efter inkommande hastighet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sortera efter utgående hastighet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sortera efter anslutningsupptid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sortera efter klockanvridning"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sortera efter överbelastningfönster"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sortera efter långsam starttröskel"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sortera efter tur och returtid"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sortera efter omsändningstimeout"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sortera efter utgående maximal överföringsenhet"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sortera efter paket som skickats"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sortera efter paket som mottagits"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sortera efter paket som återutsänds"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sortera efter paket som mottagits fler än en gång"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Vi erbjöd oss att introducera dem"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "De erbjöd sig att introducera oss"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Strypt"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 misslyckande"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} misslyckande"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Förbjudna"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "backlogged"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Släpper tunnelförfrågningar: För långsam"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Släpper tunnelförfrågningar: Överlastad"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Avvisar tunnlar: Begäran överlastad"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Avvisar tunnlar: Anslutningsgräns"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Släpper tunnelförfrågningar: Hög belastning"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Släpper tunnelförfrågningar: Kötid"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Ny version för plugin {0} finns tillgänglig"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Uppdateringskontroll misslyckades för plugin {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Ingen ny version tillgänglig för plugin {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B överfört"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Överföring misslyckades från {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Uppdatering hämtad"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Startar om"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Update verifierad"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "från {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Osignerad uppdateringsfil från {0} är korrumperad"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Misslyckades med att kopiera till {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "Nätverks-uppdateringar inaktiverade. Kontrollera pakethanteraren."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "Inga skrivrättigheter för I2P installations-katalogen."
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "Uppdatera först till version {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "Kräver Java version {0} installerad Java version är {1}"
@@ -1341,8 +1353,8 @@ msgid "Add Client"
 msgstr "Lägg till Klient"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Klient"
 
@@ -1373,9 +1385,9 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Version"
 
@@ -1397,7 +1409,7 @@ msgstr "Licens"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Webbplats"
 
@@ -1410,7 +1422,7 @@ msgid "Stop"
 msgstr "Stoppa"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Kontrollera efter uppdateringar"
@@ -1432,7 +1444,7 @@ msgstr "Ta bort"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1442,7 +1454,7 @@ msgstr "Ta bort valda"
 
 #: ../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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1461,6 +1473,7 @@ msgstr "Återställ standardvärden"
 
 #: ../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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1541,7 +1554,7 @@ msgstr "Ogiltig destination"
 msgid "Log overrides updated"
 msgstr "Loggöverskridningar uppdaterad"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Loggkonfiguration sparades"
 
@@ -1590,7 +1603,7 @@ msgstr "WARN"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1609,7 +1622,7 @@ msgid "Home Page"
 msgstr "Startsida "
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Nätverk"
 
@@ -1665,8 +1678,8 @@ msgid "UI"
 msgstr "Användargränssnitt"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tunnlar"
@@ -1685,15 +1698,15 @@ msgid "Logging"
 msgstr "Logging"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Peers"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "Statistik"
 
@@ -1706,7 +1719,7 @@ msgstr "Avancerad"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1816,16 +1829,16 @@ msgstr "Uppdaterar bandbreddsprocent för delning"
 msgid "Updated bandwidth limits"
 msgstr "Uppdaterade bandbreddsgräns"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "okänd"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "bitar per sekund"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "eller högst {0} byte per månad"
@@ -2391,7 +2404,7 @@ msgstr "Användarnamn"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Lägg till "
 
@@ -2400,86 +2413,86 @@ msgstr "Lägg till "
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "Uppdatering eller kontroll pågår"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Uppdatering tillgänglig, försöker ladda ner nu"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Uppdatering tillgänglig, klicka på knappen till vänster för att ladda ner"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Ingen uppdatering tillgänglig"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "Uppdaterar nyhets URLer till {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "intern"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "Uppdaterar poxyvärd till {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "Uppdaterar proxyport yill {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "Uppdaterar uppdateringsfrekvensen till {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "Uppdaterar uppdaterings policy till {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Uppdaterar uppdaterings URL:er."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Uppdaterar nycklar med tillit till."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "Uppdaterar osignerad uppdaterings URL till {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Alltid"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Berätta endast"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Ladda ner och kontrollera endast"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "Ladda ner, kontrollera och starta om"
 
@@ -2637,7 +2650,7 @@ msgid "{0} for {1}"
 msgstr "{0} för {1}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Bandbreddsanvändning"
 
@@ -2751,12 +2764,12 @@ msgid "Graph settings saved"
 msgstr "Grafinställningar sparade"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Adressbok"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "Hantera din I2P host-fil här (I2P domännamns uppslag)"
 
@@ -2787,17 +2800,17 @@ msgid "I2P Home Page Configuration"
 msgstr "Konfiguration av I2P startsida"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonym webbmailklient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "E-post"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Router Hjälp"
 
@@ -2807,17 +2820,17 @@ msgid "Router Console"
 msgstr "Router Konsol"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "Inbyggd anonym Bittorrentklient"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrents"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "Lokal webserver"
 
@@ -2903,10 +2916,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "Teknisk dokumentation"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-msgstr "Enkel och snabb microblogging sajt"
-
+#. "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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2989,7 +3000,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "Din webbläsare är inte korrekt konfigurerad för att använda HTTP-proxy på {0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Namn"
 
@@ -3139,148 +3150,157 @@ msgid "Unpublished"
 msgstr "Opubliserad"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Destination"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "Går ut om {0}"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "Gick ut {0} sedan"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "Lease"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tunnel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Inte intierad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Nätverksdatabas Routerstatistik"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Antal"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Land"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Vår information"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "Peer information för"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Full post"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Gömd"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} sedan"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Publicerad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adress(er)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "kostnad"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Gömd eller startar"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU med introducerare"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP och SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP och SSU med introducerare"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "Endast IPv6 SSU, introducerade"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, introducerade"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, introducerade"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "Endast IPv6 NTCP, SSU, introducerade"
 
@@ -3299,7 +3319,7 @@ msgid "Hide news"
 msgstr "Dölj nyheter"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "Visa nyheter"
 
@@ -3380,7 +3400,7 @@ msgid "Failing"
 msgstr "Misslyckas"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Integrerad"
 
@@ -3593,7 +3613,7 @@ msgid "Lifetime average frequency"
 msgstr "Genomsnittlig livstids frekvens"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3644,282 +3664,282 @@ msgstr "Graf Data"
 msgid "Graph Event Count"
 msgstr "Diagram över antal händelser"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Exportera Data som XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Livstids medelvärde"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Router Hjälp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Hjälp &amp; FAQ"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "Konfigurera start av klienter och webbappar (tjänster), starta vilande tjänster manuellt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P tjänster"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "Konfigurera I2P Router"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P internt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Visa existerande tunnlar och status för tunnlar som byggs"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Visa alla aktuella peeranslutningar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Visa de senaste peer prestanda profiler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Visa lista över alla kända I2P routrar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Hälsorapport"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Loggar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Diagram över router prestanda"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Grafer"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "resultatstatistik för router i textform"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Lokala Destinationer"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Allmänt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "Din lokala identitet är din unika I2P routers identitet, liknande en ip-adress men anpassad för I2P."
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "avslöja aldrig den för någon eftersom det kan avslöja din  ip-adress "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Lokal identitet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Din unika I2P router identitet är"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "avslöja det aldrig till någon"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "visa"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "Den version av I2P vi kör "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Hur länge vi har kört för denna session"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Upptid"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "Hjälp med att konfigurera din brandvägg och router för optimal prestanda för I2P"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "Konfigurera I2P uppdateringar "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P uppdatering"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "Peers vi har pratat med de senaste minuterna/timmarna"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "Antal peers tillgängliga för att bygga klient tunnlar "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Snabb"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "Antal peers tillgängliga för att bygga undersökande tunnlar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Hög kapacitet"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "Anta tillgängliga för  nätverksdatabasförfrågningar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "Totala antalet peers i vår nätverksdatabas"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Kända"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Ställ in routerns bandbreddsallokering"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Bandbredd in/ut"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Totalt"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Använda"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "Används för att bygga och testa tunnlar och kommunicera med floodfill peers"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Utforskande"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "Tunnlar vi använder för att tillhandahålla eller få tillgång till tjänster i nätverket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "Tunnlar vi deltar i och direkt bidrar med bandbredd till nätverket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Deltagande"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "Förhållandet mellan tunneln hopp ger vi tillhandahåller och använder - ett värde större än 1,00 indikerar ett positivt bidrag till nätverket"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Delningsratio"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Vad är i routerns arbeteskö"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Trängsel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "Indikerar routern prestanda"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "Arbetsfördröjning"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "Indikerar hur snabbt utåtgåendemeddelanden till andra I2P routers sänds "
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "Meddelandefördröjning"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "Tur och retur tid för ett tunnel test"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tunnelfördröjning"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "Köade förfrågningar från andra routrar att delta i tunnlar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Eftersläpning"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "Nyheter &amp; Uppdateringar "
 
@@ -3993,43 +4013,43 @@ msgstr "ERR-UDP avslaget och inåtriktad TCP adress/port är inte inställd"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "WARN-Bakom brandvägg med UDP avslaget"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "Lägg till/ta bort/ ändra &amp; ställ in dina klient och server tunnlar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Visa tunnlar"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Leasning utgången"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Bygger om"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "sedan"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Redo"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Bygger"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Bygger tunnlar"
 
@@ -4037,31 +4057,31 @@ msgstr "Bygger tunnlar"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "delade klienter"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Klicka på Omstart för att installera"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Klicka Stäng av och starta om för att installera"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "Uppdateringar tillgängliga"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "Hämtat {0} uppdateringar"
@@ -4070,40 +4090,40 @@ msgstr "Hämtat {0} uppdateringar"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "Hämta osignerade <br> uppdateringar {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Hjälp med brandväggskonfigurationen"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "Kontrollera nätverksanslutningen och NAT/brandvägg "
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Reseed"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "Ordning"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "Top"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "Ner"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "Botten"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "Välj ett avsnitt för att lägga till det"
 
@@ -4376,6 +4396,10 @@ msgstr "Kryptering"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTunnel"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4693,7 +4717,7 @@ msgstr "Sida för avancerade nätverksinställningar "
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4781,13 +4805,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "Inaktivera - klienter utanför denna Java process kan inte ansluta"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP Port"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP Interface"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP Port"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "Auktorisation"
@@ -4874,13 +4898,14 @@ msgid "Search Engines"
 msgstr "Sökmotorer"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "Rekommenderade  Eepsiter"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "Lokala tjänster"
+msgid "Applications and Configuration"
+msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4939,48 +4964,53 @@ msgstr "Konfigurera I2P Loggningsval"
 msgid "Log file"
 msgstr "Loggfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(symbolen '@' kommer ersättar under loggrotation)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "Logginläggformat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "(använd 'd' = daum, 'c' = klass, 't' = tråd, 'p' = prioritet, 'm' = meddelande)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "Logg datumformat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = månad, 'dd' = dag, 'HH' = timme, 'mm' = minut, 'ss' = sekund, 'SSS' = millisekund)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "Loggfilens maxima storlek"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "Standard loggnings nivå  "
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(DEBUG och INFO rekommenderas inte som standard, eftersom de  drastiskt kommer att sakta ner din router)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "Logga nivå åsidosättanden"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "Nytt åsidosättande"
 
@@ -6168,18 +6198,6 @@ msgstr "Klicka på en flagga för att välja ett språk. Klicka på \"konfigurer
 msgid "Search I2P"
 msgstr "Sök I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "Intressanta Eepsiter"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "Tunnelhanterare för I2P"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "Tunnelhanterare för I2P"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar-fil dump"
diff --git a/apps/routerconsole/locale/messages_tr.po b/apps/routerconsole/locale/messages_tr.po
index a70344034ae0807b07fc1bcf5b01a587e8c04458..39afdd5ae06cf898496118079b78b46d6dcad021 100644
--- a/apps/routerconsole/locale/messages_tr.po
+++ b/apps/routerconsole/locale/messages_tr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -41,7 +41,7 @@ msgstr[0] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -49,7 +49,7 @@ msgstr[0] "{0} sn"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -57,62 +57,62 @@ msgstr[0] "{0} dk"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} saat"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "kullanılamaz"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0} gün"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Yöneltici karmasıyla yasaklandı: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Yöneltici karmasıyla yasaklandı"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP blocklist.txt dosyasındaki {0} kayıdıyla engellendi"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Kimden"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Kime"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "yok"
 
@@ -122,91 +122,91 @@ msgstr "yok"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Tünelleme red ediliyor: Yüksek ileti gecikmesi"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Çoğu tünelleme red ediliyor: Çok sayıda istek"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Tünelleme red ediliyor: Sınıra ulaşıldı"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Tünelleme red ediliyor: Bant genişliği sınırı"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Çoğu tünelleme red ediliyor: Bant genişliği sınırı"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Çoğu tünelleme onaylanıyor"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Tünelleme onaylanıyor"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Tünelleme red ediliyor: Kapatılıyor"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Tünelleme red ediliyor"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Tekrar düğümleniyor"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Tekrar düğümleme sadece {0} yönlendirici aldı."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Tekrar düğümleme başarısız oldu."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Yardım için {0}'a bakınız."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "tekrar düğümleme düzenleşim sayfası"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Tekrar düğümleniyor: düğüm URL'sini alıyor."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -240,7 +240,7 @@ msgstr "Etkin olarak görüşülen eş sayısı"
 msgid "Known fast peers"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "NetDb girişi"
 
@@ -250,45 +250,54 @@ msgstr "NetDb girişi"
 msgid "No transports (hidden or starting up?)"
 msgstr "Taşıma yok (gizli mi, yeni mi başlıyor?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Hiçbir taşımada erişilebilir değil"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Yönlendirici Taşıma Adresleri"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} yalnızca giden bağlantılar içindir."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Yardım"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Taşıma bağlantı sınırlarınız ayarlı kuşak genişliğiniz taban alınarak otomatikman belirlenmiştir."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Bu sınırları geçersiz kılmak için i2np.ntcp.maxConnections=nnn ve i2np.udp.maxConnections=nnn ayarlarını gelişmiş ayarlar sayfasında ekleyin."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Tanımlar"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -297,251 +306,258 @@ msgstr "Tanımlar"
 msgid "Peer"
 msgstr "Eş"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Uzak eş, yönlendirici hash'i tarafından tespit edilmiş"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Dizin"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Gelen bağlantı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Giden bağlantı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Onlara tanıştırma önerdik (diğer eşlerin güvenlik duvarlarını aşmalarına yardımcı olma)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Bir paketin alınması / gönderilmesi üzerinden geçen zaman"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Boşta"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Girdi/Çıktı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Düzleştirilmiş gelen / giden aktarım oranı (saniyede KBayt)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Yukarı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Kayma"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Eşin ve sizin saatleriniz arasındaki ayrım"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Tıkanıklık penceresi, yani bir onay olmadan kaç bayt gönderilebileceği"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Onay bekleyen gönderilmiş ileti sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Tıkanıklık penceresini aşan ve gönderilmeyi bekleyen ileti sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Yavaş başlangıç eşiği"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Milisaniyelerle gidiş-dönüş"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Milisaniylerle yeniden iletim zaman aşımı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Mevcut azami gönderilen paket boyu / tahmini azami alınan paket boyu (bayt)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Eşe gönderilen toplam paket sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Eşten alınan toplam paket sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Dup TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Eşe yeniden iletilen paket sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Dup RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Eşten alınan çifte paket sayısı"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Hizmet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Durum"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "Çalışma süresi"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -550,279 +566,275 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "Aşırı saat sapması: {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP bağlantıları"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Sınır"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Çıkış Kuyruğu"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Biriken?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Gelen"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Giden"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP bağlantılari"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Eş hash'lerine göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Yönerge/Giriş"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Boşta gelenlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Boşta gidenlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Gelen oranına göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Giden oranına göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Bağlantı süresine göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Saat kaymasına göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Yavaş başlangıç eşiğine göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Gidiş-dönüş süresine göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Yeniden iletim zaman aşımına göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Giden azami iletim birimine göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Gönderilen paketlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Alınan paketlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Yeniden iletilen paketlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Bir kereden çok alınan paketlere göre sırala"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Onlara tanıştırma önerdik"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Bize tanıştırma önerildi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "Tıkalı"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 başarısızlık"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} başarısızlık"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Yasaklı"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Tünel istekleri atılıyor: Çok yavaş"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Tünel istekleri atılıyor: Aşırı yük"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Tüneller reddediliyor: İstek aşırı yükü"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Tüneller reddediliyor: Bağlantı sınırı"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Tünel istekleri atılıyor: Yüksek yük"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Tünel talepleri atılıyor: Kuyruk süresi"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Yeni eklenti sürümü {0} mevcut"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "{0} eklentisi için güncelleme denetimi başarısız"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "{0} eklentisi için yeni sürüm mevcut değil"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B iletildi"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "{0} üzerinden aktarılamadı"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Güncelleme indirildi"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Yeniden başlatılıyor"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Güncelleme doğrulandı"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "{0}'dan"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "{0} üzerinden alınan imzasız dosya bozuk"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "{0} üzerine kopyalanamadı"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1330,8 +1342,8 @@ msgid "Add Client"
 msgstr "İstemci Ekle"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "İstemci"
 
@@ -1362,9 +1374,9 @@ msgid "Plugin"
 msgstr "Eklenti"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Sürüm"
 
@@ -1386,7 +1398,7 @@ msgstr "Lisans"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Web sitesi"
 
@@ -1399,7 +1411,7 @@ msgid "Stop"
 msgstr "Durdur"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Güncellemeleri denetle"
@@ -1421,7 +1433,7 @@ msgstr "Sil"
 #: ../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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1431,7 +1443,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1450,6 +1462,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1530,7 +1543,7 @@ msgstr "Geçersiz hedef"
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "Kütük düzenleşimi kaydedildi"
 
@@ -1579,7 +1592,7 @@ msgstr "UYAR"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Sil"
 
@@ -1598,7 +1611,7 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Ağ"
 
@@ -1654,8 +1667,8 @@ msgid "UI"
 msgstr "Arayüz"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Tüneller"
@@ -1674,15 +1687,15 @@ msgid "Logging"
 msgstr "Kütük"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "Eşler"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "İstatistikler"
 
@@ -1695,7 +1708,7 @@ msgstr "Gelişmiş"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1805,16 +1818,16 @@ msgstr "Kuşak genişliği pay yüzdesi güncelleniyor"
 msgid "Updated bandwidth limits"
 msgstr "Kuşak genişliği sınırları güncellendi"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "saniye başına bit"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr "veya ay başına azami {0} bayt"
@@ -2377,7 +2390,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2386,86 +2399,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "Güncelleme mevcut, şimdi indirmeye çalışılıyor"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "Güncelleme mevcut, indirmek için soldaki düğmeye tıklayın"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "Güncelleme mevcut değil"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Asla"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "Güncelleme URLleri güncelleniyor."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "Güvenilen anahtarlar güncelleniyor."
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Hep"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "Yalnızca bildir"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "Yalnızca indir ve onayla"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "İndir, onayla ve yeniden başlat"
 
@@ -2623,7 +2636,7 @@ msgid "{0} for {1}"
 msgstr "{1} için {0}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "Bant genişliği kullanımı"
 
@@ -2737,12 +2750,12 @@ msgid "Graph settings saved"
 msgstr "Grafik ayarları kaydedildi"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "Adres defteri"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "I2P hosts dosyasını buradan yönetin (I2P etki alanı çözümlemesi)"
 
@@ -2773,17 +2786,17 @@ msgid "I2P Home Page Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "Anonim webposta istemcisi"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P Yöneltici Yardımı"
 
@@ -2793,17 +2806,17 @@ msgid "Router Console"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "İçsel Anonim BitTorrent İstemcisi"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "Torrentler"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
@@ -2889,10 +2902,8 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2975,7 +2986,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
@@ -3125,148 +3136,157 @@ msgid "Unpublished"
 msgstr "Yayınlanmamış"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "Hedef"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "{0} içinde bitecek"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "{0} önce bitti"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "Geçit"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "Tünel"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "Başlatılmadı"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "Ağ Veritabanı Yönlendirici İstatistikleri"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "Sayım"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "Taşımalar"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "Ülke"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "Bilgimiz"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "Tam girdi"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "Gizli"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "Güncellenme"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} önce"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "Yayınlanmış"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "Adres(ler)"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "tutar"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "Gizli veya yeniden başlıyor"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "Tanıştırıcı destekli SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP ve SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "Tanıştırıcı destekli NTCP ve SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3285,7 +3305,7 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
@@ -3362,7 +3382,7 @@ msgid "Failing"
 msgstr "Başasırız"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "Tümleştirilmiş"
 
@@ -3575,7 +3595,7 @@ msgid "Lifetime average frequency"
 msgstr "Ömür boyu ortalama sıklığı"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3624,282 +3644,282 @@ msgstr "Grafik Verisi"
 msgid "Graph Event Count"
 msgstr "Grafik Etkinliği Sayısı"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "Veriyi XML Olarak Verin"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "Ömür boyu ortalama değeri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P Yöneltici Yardımı ve SSS"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "Yardım ve SSS"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr "İstemcilerin ve webapp (hizmetlerin) başlatılmasını ayarlayın. Çalışmayan hizmetleri el ile başlatın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P Hizmetleri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "I2P Yöneltici Ayarları"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P Bilgileri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "Varolan tünel ve tünel yapım durumlarına bakın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "Tüm geçerli eş bağlantılarına bakın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "Geçenlerdeki eş başarım profillerine bakın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "Profiller"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "Tüm bilinen I2P yönelticilerinin listesi görüntülensin"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "NetDB"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "Sağlık Durumu"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "Günlükler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "Yöneltici başarım çizelgesi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "Çizelgeler"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "Metin bazlı yöneltici başarım istatistikleri"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "Yerel Hedefler"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2PTüneli"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "Genel"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "Yerel Kimlik"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "Eşsiz I2P yöneltici kimliğiniz"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "asla kimseye söyelemeyin"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "bakın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "Bu oturumun çalışma süresi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "Çalışma süresi"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "En iyi I2P başarımı için güvenlik duvarı ve yönelticinizi nasıl ayarlayacağınız hakkında yardım"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "Etkin"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "Hızlı"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "Yüksek kapasiteli"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "Bilinen"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "Yöneltici bant genişliği kullanımını ayarlayın"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "Bant genişliği gelen/giden"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "Toplam"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "Kullanılan"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "Keşif"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "Katılınan"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "Paylaşım oranı"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "Yönelticinin iş kuyruğunda bulunanlar"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "Sıkışıklık"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "İş gecikmesi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "İleti gecikmesi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "Tünel gecikmesi"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "Arka günlük"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3973,43 +3993,43 @@ msgstr "HATA-UDP devre dışı ve Gelen TCP sunucu/kapı ayarlanmamış"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "UYARI-Güvenlik duvarı engellemesi UDP devre dışı"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "İstemci ve sunucu tünellerini ekleyin/çıkarın/düzenleyin ve denetleyin"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "Sunucu"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "Tünellere bakın"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Süresi dolan kiralamalar"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "Yeniden yapılıyor"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "önce"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "Hazır"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "Yapılıyor"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "Tüneller yapılıyor"
 
@@ -4017,31 +4037,31 @@ msgstr "Tüneller yapılıyor"
 #. 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "paylaşılmış istemciler"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "Yüklemek için yeniden başlatın"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "Kapatın düğmesine tıklayıp yüklemek için yeniden başlatın"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "Sürüm {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4050,40 +4070,40 @@ msgstr ""
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "Güvenlik duvarı ayarlama yardımı"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "Tekrar düğümleme"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4356,6 +4376,10 @@ msgstr "Şifreleme"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2PTüneli"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNet Havuzu"
@@ -4673,7 +4697,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4761,11 +4785,11 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
@@ -4854,12 +4878,13 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4919,48 +4944,53 @@ msgstr ""
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6148,18 +6178,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_uk.po b/apps/routerconsole/locale/messages_uk.po
index 5213a4105448a0ada3bf957a1d3902abc251d060..8218b6a3e3cd01d0d5fc32b8d052fa5d4e93c9d4 100644
--- a/apps/routerconsole/locale/messages_uk.po
+++ b/apps/routerconsole/locale/messages_uk.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-30 10:10+0000\n"
-"Last-Translator: LinuxChata\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -46,7 +46,7 @@ msgstr[2] "{0,number,####} мс"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -56,7 +56,7 @@ msgstr[2] "{0} с."
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -66,7 +66,7 @@ msgstr[2] "{0} хв."
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -74,13 +74,13 @@ msgstr[0] "{0} година"
 msgstr[1] "{0} години"
 msgstr[2] "{0} годин"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "немає даних"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -88,44 +88,44 @@ msgstr[0] "{0} день"
 msgstr[1] "{0} днів"
 msgstr[2] "{0} днів"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Заблокований по хешу маршрутизатора: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Заблокований по хешу маршрутизатора"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP заблокований по запису в blocklist.txt: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP адреси заблоковані до перезапуску"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "Назавжди заблоковані IPs адреси"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Від"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Кому"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "немає"
 
@@ -135,66 +135,66 @@ msgstr "немає"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Не приймаємо тунелі: Запуск маршрутизатора"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Не приймаємо тунелі: Велика затримка повідомлень"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Не приймаємо більшу частину тунелів: Велика кількість запитів"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Не приймаємо тунелі: Досягнутий ліміт кількості тунелів"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Не приймаємо тунелі: Досягнутий ліміт пропускної спроможності"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Не приймаємо більшу частину тунелів: Досягнутий ліміт пропускної спроможності"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Приймаємо більшість тунелів"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Приймаємо тунелі"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Не приймаємо тунелі: Маршрутизатор завершає роботу"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Не приймаємо тунелі"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Початкове завантаження"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
@@ -202,24 +202,26 @@ msgstr[0] "При початковому завантаженні отриман
 msgstr[1] "При початковому завантаженні отримано дані лише про {0} маршрутизатори."
 msgstr[2] "При початковому завантаженні отримано дані лише про {0} маршрутизаторів."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Спроба початкового запуску провалилась."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Дивіться {0} для допомоги."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "Сторінка конфігурації початкового завантаження"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Проводиться початкове завантаження: Завантажуються URL каталогів маршрутизаторів"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -253,7 +255,7 @@ msgstr "Кількість пірів, з якими ми активно спі
 msgid "Known fast peers"
 msgstr "Відомі швидкісні піри"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "показати опис в NetDB"
 
@@ -263,298 +265,314 @@ msgstr "показати опис в NetDB"
 msgid "No transports (hidden or starting up?)"
 msgstr "Немає транспортних протоколів (в прихованому режимі чи запущений нещодавно?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Недосяжний через жодний транспортний протокол"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Адреса транспортів маршрутизатора"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} використовується тільки для вихідних з'єднань"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Допомога"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Ваш транспортний ліміт з'єднань автоматично виставлений на основі ваших настройок пропускної спроможності."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Для перевизначення цих лімітів додайте параметри i2np.ntcp.maxConnections=nnn і i2np.udp.maxConnections=nnn на сторінці розширених налаштувань."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Умовні позначення"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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/ProfileOrganizerRenderer.java:86
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
 msgid "Peer"
 msgstr "Пір"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Віддалений пір, ідентифікований хешем маршрутизатора"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Напрямок"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Вхідні з'єднання"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Вихідні з'єднання"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Вони пропонують представити нас (допомогти іншим пірам з'єднуватись з нами в обхід нашого фаєрволу)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Ми пропонуємо представити їх (допомогти іншим пірам з'єднуватись з ними в обхід їх фаєрволу)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Час який пройшов після отримання / відправлення останнього пакета"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Неактивний"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Прийом/Передача"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Приблизний вхідний / вихідний трафік (KBytes за секунду)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Час який пройшов після встановлення з'єднання"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:877
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Підключений"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Нахил"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Різниця годин між піром і нами"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Вікно перевантаження - це скільки байт може бути відправлено без підтвердження"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Кількість переданих повідомлень, які очікують підтвердження."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Максимальна кількість повідомлень, які будуть надіслані одночасно"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Кількість нерозглянутих посилок перевищує розмір вікна перезавантаження"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Поріг повільного старту"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Час між відправленням запиту й одержанням відповіді у мілісекундах"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "Час очікування підтвердження у мілісекундах перед повторним відправленням пакету"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Поточний максимальний розмір відправленого пакета / оціночний максимальний розмір отриманого пакета (в байтах)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "Передано"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Загальна кількість пакетів, відправлених до вузла"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "Прийнято"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Загальна кількість пакетів, отриманих від вузла"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "Повт. передано"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Загальна кількість пакетів, повторно відправлених до вузла"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "Повт. прийнято"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Загальна кількість пакетів, повторно отриманих від вузла"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Сервіс"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Загальна конфігурація WAN-інтерфейсів"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Статус"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Тип"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Висхідний канал"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Низхідний канал"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP-з'єднання"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "Зовнішній IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Layer 3 пересилка"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Служба з'єднання за замовчуванням"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP з'єднання"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Налаштування з'єднання WAN Ethernet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Знайдено пристрій"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Підпристрій"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Стан UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "Вимкнені UPnP пристрої"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr ""
@@ -563,67 +581,63 @@ msgstr ""
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr ""
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP підключення"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Обмеження"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Упущення часу бездіяльности"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Вихідна Черга"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Перевантажено?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "вхідно"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "вихідно"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
@@ -631,208 +645,213 @@ msgstr[0] "{0} пір"
 msgstr[1] "{0} пірів"
 msgstr[2] "{0} пірів"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "зв'язки UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Сортування по хешу вузла"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Порядком за вхідню бездіяльність"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Порядком за вихідню бездіяльність"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Порядком за вхідну ставку"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Порядком за вихідну ставку"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Порядком за тривалість зв'язку"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Порядком за нахилом такту"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 збій"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} збоїв"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Забороненo"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "перевантажений"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr ""
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
+msgid "Rejecting tunnels: Hidden mode"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:671
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "з {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:140
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:146
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:154
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:164
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -843,167 +862,175 @@ msgid "Checking for update of plugin {0}"
 msgstr ""
 
 #. set status before thread to ensure UI feedback
-#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:79
+#: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:81
 #: ../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:252
 msgid "Updating"
 msgstr "Оновлення"
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:86
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
 #, java-format
 msgid "No file specified {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92
+#: ../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:96
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:438
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:126
 msgid "Plugin downloaded"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:131
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:493
 #, java-format
 msgid "Cannot create plugin directory {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146
+#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
+#. + signer + "</b>");
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:192
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:201
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:305
 #, java-format
-msgid "Plugin from {0} is corrupt"
+msgid "Plugin from {0} contains an invalid key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:234
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:244
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:258
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:316
 #, java-format
-msgid "Plugin from {0} does not contain the required configuration file"
+msgid "Plugin signature verification of {0} failed"
 msgstr ""
 
-#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' '
-#. + signer + "</b>");
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170
+#. don't display signer, we're really checking the key not the signer name
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:267
+msgid "Plugin not installed - signer is untrusted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:332
 #, java-format
-msgid "Plugin from {0} contains an invalid key"
+msgid "Plugin from {0} is corrupt"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:218
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:342
 #, java-format
-msgid "Plugin signature verification of {0} failed"
+msgid "Plugin from {0} does not contain the required configuration file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:233
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:364
 #, java-format
 msgid "Plugin from {0} has invalid name or version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:238
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:369
 #, java-format
 msgid "Plugin {0} has mismatched versions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:380
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:388
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
 msgid ""
 "Downloaded plugin is for new installs only, but the plugin is already "
 "installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:407
 msgid "Installed plugin does not contain the required configuration file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:415
 msgid "Signature of downloaded plugin does not match installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:422
 #, java-format
 msgid "Downloaded plugin version {0} is not newer than installed plugin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436
 #, java-format
 msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:444
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:451
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:460
 #, java-format
 msgid "Cannot copy plugin to directory {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:340
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:470
 msgid "Plugin will be installed on next restart."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:358
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:488
 msgid "Plugin is for upgrades only, but the plugin is not installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:371
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501
 #, java-format
 msgid "Failed to install plugin in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:508
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:536
 #, java-format
 msgid "Plugin {0} installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:527
 #, java-format
 msgid "Plugin {0} installed and started"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:530
 #, java-format
 msgid "Plugin {0} installed but failed to start, check logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:532
 #, java-format
 msgid "Plugin {0} installed but failed to start"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544
 #, java-format
 msgid "Failed to download plugin from {0}"
 msgstr ""
@@ -1018,127 +1045,129 @@ msgstr ""
 msgid "No new version found at {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65
 #, java-format
 msgid "Temporary ban expiring in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67
 #, java-format
 msgid "Banned until restart or in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78
+#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79
 msgid "unban now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CSSHelper.java:146
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/CSSHelper.java:149
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
 #: ../java/strings/Strings.java:29
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:213
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:232
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:217
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:200
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:228
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:230
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:214
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:218
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:209
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:211
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237
 msgid "I2P Router Console"
 msgstr "Консоль роутера I2P"
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:51
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:54
 msgid "Error updating the configuration - please see the error logs"
 msgstr "Помилка при оновленні конфігурації. Будь ласка, подивіться журнали помилок."
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
 msgid "Configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374
+#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:506
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
@@ -1146,313 +1175,314 @@ msgid ""
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:40
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:486
 msgid "Save Client Configuration"
 msgstr "Зберегти конфігурацію клієнта"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:44
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:556
 msgid "Save Interface Configuration"
 msgstr "Зберегти конфігурацію інтерфейса"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572
 msgid "Save WebApp Configuration"
 msgstr "Зберегти конфігурацію веб-додатку"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:53
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
 msgid "Save Plugin Configuration"
 msgstr "Зберегти конфігурацію плагіна"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618
 msgid "Install Plugin"
 msgstr "Встановити плагін"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:60
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:595
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:69
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628
 msgid "Update All Installed Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:100
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:121
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:158
 #, java-format
 msgid "Error stopping plugin {0}"
 msgstr "Помилка при зупиненні плаґіна {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:126
 #, java-format
 msgid "Deleted plugin {0}"
 msgstr "Видалено плагін {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:128
 #, java-format
 msgid "Error deleting plugin {0}"
 msgstr "Помилка при видаленні плаґіна {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:153
 #, java-format
 msgid "Stopped plugin {0}"
 msgstr "Зупинено плагін {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:163
 #, java-format
 msgid "Stopped webapp {0}"
 msgstr ""
 
 #. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:312
 msgid "Start"
 msgstr "Старт"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:220
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
 msgid "New client added"
 msgstr "Додано новий клієнт"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:270
 msgid "Client configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:321
 msgid "Bad client index."
 msgstr "Неправильний індекс клієнта"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
 #, java-format
 msgid "Client {0} stopped"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
 #, java-format
 msgid "Client {0} started"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
 #, java-format
 msgid "Client {0} deleted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:342
 msgid "WebApp configuration saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:357
 msgid "Plugin configuration saved."
 msgstr "Конфігурацію плагіна збережено"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:162
 msgid "WebApp"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
 msgid "started"
 msgstr "почато"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:374
 msgid "Failed to start"
 msgstr "Помилка запуску"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:333
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
 msgid "Failed to find server."
 msgstr "Провал пошуку за сервер"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:385
 msgid "No plugin URL specified."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:349
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:397
 #, java-format
 msgid "No update URL specified for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:379
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:427
 msgid "Plugin or update download already in progress."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:409
 msgid "Updating all plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:434
 #, java-format
 msgid "Bad URL {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:454
 #, java-format
 msgid "Checking plugin {0} for updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:416
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464
 #, java-format
 msgid "Started plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:418
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:466
 #, java-format
 msgid "Error starting plugin {0}"
 msgstr "Помилка при запуску плаґіна {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:440
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93
 #, java-format
 msgid "Added user {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:503
 msgid "Interface configuration saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:504
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118
 msgid "Restart required to take effect"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:319
 msgid "Edit"
 msgstr "Редагування"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:474
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482
 msgid "Add Client"
 msgstr "Додати клієнт"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-msgid "Class and arguments"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:427
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "Клієнт"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:113
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
+msgid "Run at Startup?"
+msgstr "Запускати під час старту системи?"
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:164
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:193
 msgid "Control"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-msgid "Run at Startup?"
-msgstr "Запускати під час старту системи?"
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:115
+msgid "Class and arguments"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:165
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:244
 msgid "Description"
 msgstr "Опис"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
 msgid "Plugin"
 msgstr "Модуль"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "Версія"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:210
 msgid "Signed by"
 msgstr "Підписано"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:227
 msgid "Date"
 msgstr "Дата"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
 msgid "Author"
 msgstr "Автор"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:249
 msgid "License"
 msgstr "Ліцензія"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "Веб-сайт"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:261
 msgid "Update link"
 msgstr "Адреса оновлення"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:316
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "Перевірити оновлення"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:324
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Update"
 msgstr "Оновити"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr "Ви впевнені, що бажаєте видалити {0}?"
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:897
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454
 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:916
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518
 msgid "Add item"
 msgstr "Додати елемент"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516
 msgid "Restore defaults"
 msgstr "Відновити за замовчування"
 
 #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
 msgid "Save"
 msgstr "Зберегти"
 
@@ -1483,12 +1513,12 @@ msgid "Removed"
 msgstr "Видалено"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:485
 msgid "Add key"
 msgstr "Додати ключ"
 
 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483
 msgid "Delete key"
 msgstr "Видалити ключ"
 
@@ -1530,7 +1560,7 @@ msgstr ""
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr ""
 
@@ -1553,7 +1583,7 @@ msgstr ""
 #. 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:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:129
+#: ../java/src/net/i2p/router/web/LogsHelper.java:141
 msgid "CRIT"
 msgstr "CRIT"
 
@@ -1562,24 +1592,24 @@ msgid "DEBUG"
 msgstr "DEBUG"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/LogsHelper.java:143
 msgid "ERROR"
 msgstr "ERROR"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:135
+#: ../java/src/net/i2p/router/web/LogsHelper.java:147
 msgid "INFO"
 msgstr "INFO"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
-#: ../java/src/net/i2p/router/web/LogsHelper.java:133
+#: ../java/src/net/i2p/router/web/LogsHelper.java:145
 msgid "WARN"
 msgstr "WARN"
 
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145
-#: ../java/src/net/i2p/router/web/HomeHelper.java:195
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:851
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
+#: ../java/src/net/i2p/router/web/HomeHelper.java:198
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "Видалити"
 
@@ -1598,53 +1628,54 @@ msgid "Home Page"
 msgstr "Домашня сторінка"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "Мережа"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:314
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:310
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:284
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310
 msgid "Summary Bar"
 msgstr ""
 
@@ -1653,8 +1684,8 @@ msgid "UI"
 msgstr "Інтерфейс"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "Тунелі"
@@ -1664,7 +1695,7 @@ msgid "Clients"
 msgstr "Клієнти"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:457
 msgid "Keyring"
 msgstr ""
 
@@ -1673,15 +1704,15 @@ msgid "Logging"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr ""
 
@@ -1691,139 +1722,135 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:58
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:34
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:607
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:533
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491
 msgid "Save changes"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142
-msgid "Rechecking router reachability..."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207
 msgid "Updating IP address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229
 msgid "Updating IPv6 setting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246
 msgid "Disabling TCP completely"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
 msgid "Disabling inbound TCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260
 msgid "Updating inbound TCP address to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284
 msgid "Updating inbound TCP port to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
 msgid "Enabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336
 msgid "Disabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
 msgid "Enabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347
 msgid "Disabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
 msgid "Disabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356
 msgid "Enabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363
 msgid "Requiring SSU introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421
 msgid "Invalid address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452
 msgid "Updating bandwidth share percentage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480
+#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
 msgid "Ban peer until restart"
 msgstr ""
 
@@ -1843,7 +1870,7 @@ msgid "Invalid peer"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
 msgid "Unban peer"
 msgstr ""
 
@@ -1856,7 +1883,7 @@ msgid "is not currently banned"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504
 msgid "Adjust peer bonuses"
 msgstr ""
 
@@ -1873,7 +1900,7 @@ msgid "Unsupported"
 msgstr "Не підтримується"
 
 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:20
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
 msgid "Save changes and reseed now"
 msgstr ""
 
@@ -1892,9 +1919,9 @@ 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:176
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
 msgid "Shutdown immediately"
 msgstr ""
 
@@ -1950,118 +1977,118 @@ msgstr[2] ""
 msgid "Restart in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
 msgid "Shutdown gracefully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194
 msgid "Graceful shutdown initiated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
 msgid "Cancel graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202
 msgid "Graceful shutdown cancelled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
 msgid "Graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
 msgid "Graceful restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
 msgid "Hard restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214
 msgid "Hard restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
 msgid "Rekey and Restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
 msgid "Rekeying after graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
 msgid "Rekey and Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220
 msgid "Rekeying after graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
 msgid "Run I2P on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:497
 msgid "Don't run I2P on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
 msgid "Dump threads"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234
 #, java-format
 msgid "Threads dumped to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
 msgid "View console on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
 msgid "Console is to be shown on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
 msgid "Do not view console on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
 msgid "Console is not to be shown on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
 msgid "Force GC"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243
 msgid "Full garbage collection requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
 msgid "Service installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254
 msgid "Warning: unable to install the service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
 msgid "Service removed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
 msgid "Warning: unable to remove the service"
 msgstr ""
 
@@ -2102,7 +2129,7 @@ msgid "Refresh interval must be a number"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:474
 msgid "Restore full default"
 msgstr ""
 
@@ -2117,7 +2144,7 @@ msgid "Summary bar will refresh shortly."
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:476
 msgid "Restore minimal default"
 msgstr ""
 
@@ -2150,25 +2177,25 @@ 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:136
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:141
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:143
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:69
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:92
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114
 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/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
@@ -2176,7 +2203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
@@ -2184,85 +2211,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
 msgid "Exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:50
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:79
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:84
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:90
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:98
 msgid "Length"
 msgstr ""
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:115
 msgid "Randomization"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:140
 msgid "Quantity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:158
 msgid "Backup quantity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
 msgid "Inbound options"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:192
+#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:193
 msgid "Outbound options"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:458
 msgid "Add user"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63
 msgid "Theme change saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:66
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70
 msgid "Refresh the page to view."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:64
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68
 msgid "Mobile console option saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80
 msgid "No user name entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85
 msgid "No password entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107
+#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111
 #, java-format
 msgid "Removed user {0}"
 msgstr ""
@@ -2275,50 +2302,46 @@ msgstr ""
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
 msgid "Arabic"
 msgstr "العربية"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
 msgid "German"
 msgstr "Deutsch"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
 msgid "Greek"
 msgstr "Eλληνικά"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
 msgid "English"
 msgstr "English"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
 msgid "Spanish"
 msgstr "Español"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
 msgid "Finnish"
 msgstr "Suomalainen"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
 msgid "French"
 msgstr "Français"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85
-msgid "Hebrew"
-msgstr "עִבְרִית"
-
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86
 msgid "Hungarian"
 msgstr "Magyar"
@@ -2357,596 +2380,734 @@ msgid "Russian"
 msgstr "Русский"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96
+msgid "Slovak"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
 msgid "Turkish"
 msgstr "Türk"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
 msgid "Vietnamese"
 msgstr "Việt"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101
 msgid "Chinese"
 msgstr "中文"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165
 msgid "Add a user and password to enable."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171
 msgid "User Name"
 msgstr "Ім'я користувача"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:899
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
+#: ../java/src/net/i2p/router/web/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "Додати"
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534
+#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
 msgid "Password"
 msgstr "Пароль"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:52
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:58
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "внутрішній"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "Кожний"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:203
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+msgid "Aborted startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:205
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:158
-msgid "Combined bandwidth graph"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+msgid "Changed IP"
 msgstr ""
 
-#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:170
-#: ../java/src/net/i2p/router/web/GraphHelper.java:232
-#, java-format
-msgid "{0} for {1}"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+msgid "Changed port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:219
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
-msgid "Bandwidth usage"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+msgid "Clock shifted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:234
-#, java-format
-msgid "ending {0} ago"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:249
-msgid "Larger"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+msgid "Critical error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
-msgid "Smaller"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+msgid "Installed new version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:261
-msgid "Taller"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+msgid "Install failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:267
-msgid "Shorter"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+msgid "Network error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:273
-msgid "Wider"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+msgid "New router identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:279
-msgid "Narrower"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+msgid "Disabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:286
-msgid "Larger interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+msgid "Out of memory error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:292
-msgid "Smaller interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+msgid "Reseeded router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:299
-msgid "Previous interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+msgid "Soft restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:310
-msgid "Next interval"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+msgid "Started router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:357
-msgid "Plot averages"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+msgid "Stopped router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:317
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-msgid "plot events"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+msgid "Updated router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
-msgid "All times are UTC."
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+msgid "Watchdog warning"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
-msgid "Configure Graph Display"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:101
+msgid "Display Events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:352
-msgid "Select Stats"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:105
+msgid "Events since"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:356
-msgid "Periods"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:110
+msgid "Event type"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:358
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
-msgid "or"
-msgstr "або"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:116
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:147
+msgid "All events"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
-msgid "Image sizes"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:121
+msgid "Filter events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:359
-msgid "width"
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:169
+msgid "No events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#, java-format
+msgid "No events found in previous {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:173
+#, java-format
+msgid "No \"{0}\" events found"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#, java-format
+msgid "No \"{0}\" events found in previous {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:178
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+msgid "Time"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:181
+msgid "Event"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/EventLogHelper.java:183
+msgid "Details"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/FormHandler.java:227
+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:229
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:162
+msgid "Combined bandwidth graph"
+msgstr ""
+
+#. e.g. "statname for 60m"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
+#: ../java/src/net/i2p/router/web/GraphHelper.java:236
+#, java-format
+msgid "{0} for {1}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
+msgid "Bandwidth usage"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:238
+#, java-format
+msgid "ending {0} ago"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+msgid "Larger"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:259
+msgid "Smaller"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:265
+msgid "Taller"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:271
+msgid "Shorter"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:277
+msgid "Wider"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:283
+msgid "Narrower"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:290
+msgid "Larger interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:296
+msgid "Smaller interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:303
+msgid "Previous interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:314
+msgid "Next interval"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+msgid "Plot averages"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:321
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+msgid "plot events"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:324
+msgid "All times are UTC."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+msgid "Configure Graph Display"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:356
+msgid "Select Stats"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:360
+msgid "Periods"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+msgid "or"
+msgstr "або"
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
+msgid "Image sizes"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:363
+msgid "width"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
 msgid "height"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:360
-#: ../java/src/net/i2p/router/web/GraphHelper.java:361
+#: ../java/src/net/i2p/router/web/GraphHelper.java:364
+#: ../java/src/net/i2p/router/web/GraphHelper.java:365
 msgid "pixels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:362
+#: ../java/src/net/i2p/router/web/GraphHelper.java:366
 msgid "Refresh delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
+#: ../java/src/net/i2p/router/web/GraphHelper.java:381
 msgid "Store graph data on disk?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
+#: ../java/src/net/i2p/router/web/GraphHelper.java:387
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:438
+#: ../java/src/net/i2p/router/web/GraphHelper.java:443
 msgid "Graph settings saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
 msgid "Configure Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322
+#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330
 msgid "I2P Bandwidth Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Configure Language"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:29
+#: ../java/src/net/i2p/router/web/HomeHelper.java:30
 msgid "Console Language Selection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338
+#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/HomeHelper.java:32
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155
+#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161
 msgid "Router Console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/HomeHelper.java:36
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:40
+msgid "The Anoncoin project"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug Reports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/HomeHelper.java:41
 msgid "Bug tracker"
 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:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/HomeHelper.java:43
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Bittorrent tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/HomeHelper.java:44
 msgid "diftracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:43
+#: ../java/src/net/i2p/router/web/HomeHelper.java:45
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:44
+#: ../java/src/net/i2p/router/web/HomeHelper.java:46
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Community forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/HomeHelper.java:47
 msgid "Forum"
 msgstr "Форум"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 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:46
+#: ../java/src/net/i2p/router/web/HomeHelper.java:48
 msgid "Anonymous Git Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+msgid "HiddenGate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Microblog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/HomeHelper.java:50
 msgid "Your premier microblogging service on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
 msgid "Javadocs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:48
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
-msgid "Simple and fast microblogging website"
-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 +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#: ../java/src/net/i2p/router/web/HomeHelper.java:54
 msgid "Debian and Tahoe-LAFS repositories"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free Web Hosting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/HomeHelper.java:55
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/HomeHelper.java:56
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:54
+#: ../java/src/net/i2p/router/web/HomeHelper.java:57
 msgid "I2P News"
 msgstr "Новини I2P"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/HomeHelper.java:58
 msgid "Plugins"
 msgstr "Модулі"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:56
+#: ../java/src/net/i2p/router/web/HomeHelper.java:59
 msgid "Postman's Tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "I2P home page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/HomeHelper.java:60
 msgid "Project Website"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:59
+#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I +
+#. "salt_console.png" + S +
+#: ../java/src/net/i2p/router/web/HomeHelper.java:62
 msgid "I2P Network Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:60
+#: ../java/src/net/i2p/router/web/HomeHelper.java:63
 msgid "Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:61
+#: ../java/src/net/i2p/router/web/HomeHelper.java:64
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:62
+#: ../java/src/net/i2p/router/web/HomeHelper.java:65
 msgid "Ugha's Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Seedless and the Robert BitTorrent applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/HomeHelper.java:66
 msgid "Sponge's main site"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:104
+#: ../java/src/net/i2p/router/web/HomeHelper.java:107
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:106
+#: ../java/src/net/i2p/router/web/HomeHelper.java:109
 #, 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:197
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:853
+#: ../java/src/net/i2p/router/web/HomeHelper.java:200
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "Назва"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:199
+#: ../java/src/net/i2p/router/web/HomeHelper.java:202
 msgid "URL"
 msgstr "URL"
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
 msgid "I2P Job Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60
 #, java-format
 msgid "started {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90
 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:99
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114
 msgid "Total Job Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Job"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125
 msgid "Queued"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Avg"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142
-msgid "Time"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Max"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146
 msgid "Min"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145
 msgid "Pending"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193
+#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194
 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:37
-#: ../java/src/net/i2p/router/web/LogsHelper.java:91
+#: ../java/src/net/i2p/router/web/LogsHelper.java:49
+#: ../java/src/net/i2p/router/web/LogsHelper.java:103
 msgid "File location"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:88
+#: ../java/src/net/i2p/router/web/LogsHelper.java:100
 msgid "File not found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:106
+#: ../java/src/net/i2p/router/web/LogsHelper.java:118
 msgid "No log messages"
 msgstr ""
 
@@ -2976,170 +3137,179 @@ msgstr ""
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 #: ../java/strings/Strings.java:68
 msgid "Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96
 msgid "not found in network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141
 msgid "Local"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
 msgid "Unpublished"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr ""
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "SSU з посередниками"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP і SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "NTCP і SSU з посередниками"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 тільки SSU, посередники"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, посередники"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, посередники"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 тільки NTCP, SSU, посередники"
 
@@ -3158,15 +3328,15 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:133
+#: ../java/src/net/i2p/router/web/PluginStarter.java:139
 msgid "Checking for plugin updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
 #, java-format
 msgid "1 plugin updated"
 msgid_plural "{0} plugins updated"
@@ -3174,12 +3344,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/PluginStarter.java:183
 msgid "Plugin update check complete"
 msgstr ""
 
 #. buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
@@ -3187,7 +3357,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
@@ -3195,7 +3365,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
@@ -3203,188 +3373,188 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
 msgid "Groups (Caps)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496
 msgid "Speed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:500
 msgid "Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
 msgid "Integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
 msgid "Fast, High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
 msgid "High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
 msgid "Standard"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
 msgid "Failing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168
 msgid "Unreachable"
 msgstr ""
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182
 msgid "profile"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
 msgid "Last Heard From"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
 msgid "Last Good Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
 msgid "Last Bad Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
 msgid "10m Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
 msgid "1h Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
 msgid "1d Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
 msgid "Last Good Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
 msgid "Last Bad Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
 msgid "1h Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
 msgid "1d Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
 msgid "Thresholds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270
 msgid "fast peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272
 msgid "high capacity peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274
 msgid " well integrated peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "as determined by the profile organizer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
 msgid "groups"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
 #: ../java/strings/Strings.java:81
 msgid "caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 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:277
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
 msgid "speed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "how many new peers have they told us about lately?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
 msgid "integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
 msgid "status"
 msgstr ""
 
@@ -3456,7 +3626,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3509,282 +3679,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr ""
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3798,98 +3968,103 @@ msgid "ERR-Clock Skew of {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:196
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
 msgid "Testing"
 msgstr "Тестування"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:163
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:162
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:168
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
 msgid "OK"
 msgstr "OK"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:164
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:165
+msgid "ERR-Unresolved TCP Address"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
 msgid "ERR-Private TCP Address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:166
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
 msgid "ERR-SymmetricNAT"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:169
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:171
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
 msgid "WARN-Firewalled and Floodfill"
 msgstr ""
 
 #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0)
 #. return _("WARN-Firewalled and Fast");
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:174
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
 msgid "Firewalled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:176
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:181
 msgid "Disconnected - check network cable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:178
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:183
 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:184
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:187
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:192
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:189
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:194
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:414
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:425
-msgid "Server"
-msgstr "Сервер"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:429
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:440
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:441
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:444
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -3897,31 +4072,31 @@ 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:461
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:673
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:675
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:676
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:690
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:689
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:713
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -3930,40 +4105,40 @@ msgstr ""
 #. <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:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:745
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:747
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:766
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:872
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:890
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:902
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -3996,120 +4171,120 @@ msgstr ""
 msgid "now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415
 msgid "configure"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
 msgid "Client tunnels for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64
 msgid "dead"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
 msgid "Participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "Receive on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Expiration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "Send on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
 msgid "Role"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111
 msgid "grace period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121
 msgid "Outbound Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123
 msgid "Inbound Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168
 msgid "Participant"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
 msgid "Inactive participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
 msgid "Lifetime bandwidth usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Expiry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165
 msgid "Participants"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171
 msgid "Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "Build in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211
 msgid "inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
 msgid "outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223
 msgid "No tunnels; waiting for the grace period to end."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
 msgid "in"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
 msgid "out"
 msgstr ""
 
 #. wars for ConfigClientsHelper
 #: ../java/strings/Strings.java:12
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
 msgid "addressbook"
 msgstr ""
 
@@ -4236,6 +4411,10 @@ msgstr ""
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr ""
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4334,343 +4513,351 @@ msgstr "itag1"
 msgid "itag2"
 msgstr "itag2"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
 msgid "configure bandwidth"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:154
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:151
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167
 msgid "Router is down"
 msgstr ""
 
 #. We have intl defined when this is included, but not when compiled
 #. standalone.
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:316
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:302
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:323
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:297
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323
 msgid "Refresh (s)"
 msgstr ""
 
 #. ditto
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:309
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:306
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:319
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:301
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:418
 msgid "Bandwidth limiter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:420
 msgid ""
 "I2P will work best if you configure your rates to match the speed of your "
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:424
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453
 msgid "Share"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:418
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:455
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:462
 #, 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:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:466
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:467
 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:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472
 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:468
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476
 msgid "Advanced network configuration page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:506
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:531
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148
 msgid "config advanced"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330
 msgid "I2P Advanced Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:422
 msgid "Advanced I2P Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438
 msgid "Some changes may require a restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:441
+#, java-format
+msgid "To make changes, edit the file {0}."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150
 msgid "config clients"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362
 msgid "I2P Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:459
 msgid "Client Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
 msgid ""
 "The Java clients listed below are started by the router and run in the same "
 "JVM."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:463
 msgid ""
 "Be careful changing any settings here. The 'router console' and 'application"
 " tunnels' are required for most uses of I2P. Only advanced users should "
 "change these."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:469
 msgid "To change other client options, edit the file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
 msgid "All changes require restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:488
 msgid "Advanced Client Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:492
 msgid "External I2CP (I2P Client Protocol) Interface Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498
 msgid "Enabled without SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
 msgid "Enabled with SSL required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:510
 msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:504
-msgid "I2CP Port"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
 msgid "Require username and password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:463
 msgid "The default settings will work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:546
 msgid "Any changes made here must also be configured in the external client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548
 msgid "Many clients do not support SSL or authorization."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558
 msgid "WebApp Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560
 msgid ""
 "The Java web applications listed below are started by the webConsole client "
 "and run in the same JVM as the router. They are usually web applications "
@@ -4680,7 +4867,7 @@ msgid ""
 "all (e.g. addressbook)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562
 msgid ""
 "A web app may also be disabled by removing the .war file from the webapps "
 "directory; however the .war file and web app will reappear when you update "
@@ -4688,711 +4875,719 @@ msgid ""
 "preferred method."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579
 msgid "Plugin Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581
 msgid "The plugins listed below are started by the webConsole client."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:596
 msgid "Plugin Installation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:598
 #, java-format
 msgid "Look for available plugins on {0}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601
 msgid "To install a plugin, enter the download URL:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150
 msgid "config home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:454
 msgid "Default Home Page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
 msgid "Use old home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468
 msgid "Search Engines"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411
-msgid "Local Services"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
+msgid "Applications and Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346
 msgid "I2P Keyring Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:459
 msgid "The router keyring is used to decrypt encrypted leaseSets."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
 msgid ""
 "The keyring may contain keys for local or remote encrypted destinations."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:468
 msgid "Manual Keyring Addition"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:470
 msgid "Enter keys for encrypted remote destinations here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:473
 msgid "Keys for local destinations must be entered on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:475
 msgid "I2PTunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477
 msgid "Dest. name, hash, or full key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148
 msgid "config logging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330
 msgid "I2P Logging Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
 msgid "Configure I2P Logging Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:420
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150
 msgid "config networking"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359
 msgid "I2P Network Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:458
 msgid "IP and Transport Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
 msgid "There is help below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
 msgid "UPnP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:468
 msgid "Enable UPnP to open firewall ports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
 msgid "UPnP status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:472
 msgid "IP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560
 msgid "Externally reachable hostname or IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
 msgid "Use all auto-detect methods"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
 msgid "Disable UPnP IP address detection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
 msgid "Ignore local interface IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490
 msgid "Use SSU IP address detection only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494
 msgid "Hidden mode - do not publish IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
 msgid "(prevents participating traffic)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:578
 msgid "Specify hostname or IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
 msgid "Action when IP changes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
 msgid ""
 "Laptop mode - Change router identity and UDP port when IP changes for "
 "enhanced anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:534
 msgid "Experimental"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
 msgid "IPv6 Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
 msgid "Disable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
 msgid "Enable IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
 msgid "Prefer IPv4 over IPv6"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
 msgid "Prefer IPv6 over IPv4"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532
 msgid "Use IPv6 only (disable IPv4)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
 msgid "UDP Configuration:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
 msgid "UDP port:"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:580
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
 msgid "Completely disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546
 msgid "(select only if behind a firewall that blocks outbound UDP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
 msgid "TCP Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:556
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564
 msgid "Use auto-detected IP address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:598
 msgid "currently"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570
 msgid "if we are not firewalled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:574
 msgid "Always use auto-detected IP address (Not firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:576
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
 msgid "Disable inbound (Firewalled)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:582
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590
 msgid ""
 "(select only if behind a firewall that throttles or blocks outbound TCP)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592
 msgid "Externally reachable TCP port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
 msgid "Use the same port configured for UDP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604
 msgid "Specify Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:608
 msgid "Notes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
 msgid ""
 "a) Do not reveal your port numbers to anyone!   b) Changing these settings "
 "will restart your router."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
 msgid "Configuration Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668
 msgid ""
 "While I2P will work fine behind most firewalls, your speeds and network "
 "integration will generally improve if the I2P port is forwarded for both UDP"
 " and TCP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:621
 msgid ""
 "If you can, please poke a hole in your firewall to allow unsolicited UDP and"
 " TCP packets to reach you."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623
 msgid ""
 "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
 "punching with \"SSU introductions\" to relay traffic."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625
 msgid ""
 "Most of the options above are for special situations, for example where UPnP"
 " does not work correctly, or a firewall not under your control is doing "
 "harm."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:627
 msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
 msgid ""
 "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
 "the external IP address and forward ports."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
 msgid "UPnP support is beta, and may not work for any number of reasons"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
 msgid "No UPnP-compatible device present"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
 msgid "UPnP disabled on the device"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:636
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
 msgid "Software firewall interference with UPnP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
 msgid "Bugs in the device's UPnP implementation"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
 msgid "Multiple firewall/routers in the internet connection path"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
 msgid "UPnP device change, reset, or address change"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
 msgid "Review the UPnP status here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
 msgid ""
 "UPnP may be enabled or disabled above, but a change requires a router "
 "restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
 msgid "Hostnames entered above will be published in the network database."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
 msgid "They are <b>not private</b>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:660
 msgid ""
 "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or "
 "192.168.1.1."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662
 msgid ""
 "If you specify the wrong IP address or hostname, or do not properly "
 "configure your NAT or firewall, your network performance will degrade "
 "substantially."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664
 msgid "When in doubt, leave the settings at the defaults."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:658
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
 msgid "Reachability Help"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671
 msgid ""
 "If you think you have opened up your firewall and I2P still thinks you are "
 "firewalled, remember that you may have multiple firewalls, for example both "
 "software packages and external hardware routers."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
 msgid ""
 "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help "
 "diagnose the problem."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
 msgid "Your UDP port does not appear to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
 msgid "Your UDP port appears to be firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
 msgid ""
 "As the firewall detection methods are not 100% reliable, this may "
 "occasionally be displayed in error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
 msgid ""
 "However, if it appears consistently, you should check whether both your "
 "external and internal firewalls are open for your port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688
 msgid ""
 "I2P will work fine when firewalled, there is no reason for concern. When "
 "firewalled, the router uses \"introducers\" to relay inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
 msgid ""
 "However, you will get more participating traffic and help the network more "
 "if you can open your firewall(s)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692
 msgid ""
 "If you think you have already done so, remember that you may have both a "
 "hardware and a software firewall, or be behind an additional, institutional "
 "firewall you cannot control."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
 msgid ""
 "Also, some routers cannot correctly forward both TCP and UDP on a single "
 "port, or may have other limitations or bugs that prevent them from passing "
 "traffic through to I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
 msgid "The router is currently testing whether your UDP port is firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
 msgid ""
 "The router is not configured to publish its address, therefore it does not "
 "expect incoming connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
 msgid ""
 "Hidden mode is automatically enabled for added protection in certain "
 "countries."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
 msgid "WARN - Firewalled and Fast"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
 msgid ""
 "You have configured I2P to share more than 128KBps of bandwidth, but you are"
 " firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
 msgid ""
 "While I2P will work fine in this configuration, if you really have over "
 "128KBps of bandwidth to share, it will be much more helpful to the network "
 "if you open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
 msgid "WARN - Firewalled and Floodfill"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
 msgid ""
 "You have configured I2P to be a floodfill router, but you are firewalled."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
 msgid ""
 "For best participation as a floodfill router, you should open your firewall."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
 msgid "WARN - Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
 msgid ""
 "You have configured inbound TCP, however your UDP port is firewalled, and "
 "therefore it is likely that your TCP port is firewalled as well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
 msgid ""
 "If your TCP port is firewalled with inbound TCP enabled, routers will not be"
 " able to contact you via TCP, which will hurt the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
 msgid "Please open your firewall or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
 msgid "WARN - Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
 msgid "You have configured inbound TCP, however you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
 msgid ""
 "You appear to be firewalled on TCP, therefore your router cannot accept "
 "inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
 msgid "Please open your firewall or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
 msgid "ERR - Clock Skew"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
 msgid ""
 "Your system's clock is skewed, which will make it difficult to participate "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
 msgid "Correct your clock setting if this error persists."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
 msgid "ERR - Private TCP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
 msgid ""
 "You must never advertise an unroutable IP address such as 127.0.0.1 or "
 "192.168.1.1 as your external address."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
 msgid "Correct the address or disable inbound TCP above."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
 msgid "ERR - SymmetricNAT"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
 msgid "I2P detected that you are firewalled by a Symmetric NAT."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
 msgid ""
 "I2P does not work well behind this type of firewall. You will probably not "
 "be able to accept inbound connections, which will limit your participation "
 "in the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
 msgid ""
 "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
 "and restart"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746
-msgid "I2P was unable to bind to port 8887 or other configured port."
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+msgid ""
+"I2P was unable to bind to the configured port noted on the advanced network "
+"configuration page ."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
 msgid ""
 "Check to see if another program is using the configured port. If so, stop "
 "that program or configure I2P to use a different port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
 msgid ""
 "This may be a transient error, if the other program is no longer using the "
 "port."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
 msgid "However, a restart is always required after this error."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
 msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
 msgid ""
 "You have not configured inbound TCP with a hostname and port above, however "
 "you have disabled UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
 msgid "Therefore your router cannot accept inbound connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768
 msgid "Please configure a TCP host and port above or enable UDP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770
 msgid "ERR - Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772
 msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
 msgid "I2P Peer Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
 msgid "Manual Peer Controls"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:468
 msgid "Router Hash"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:472
 msgid "Manually Ban / Unban a Peer"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:474
 msgid ""
 "Banning will prevent the participation of this peer in tunnels you create."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:484
 msgid "Adjust Profile Bonuses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486
 msgid ""
 "Bonuses may be positive or negative, and affect the peer's inclusion in Fast"
 " and High Capacity tiers. Fast peers are used for client tunnels, and High "
@@ -5400,749 +5595,753 @@ msgid ""
 "displayed on the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488
 msgid "profiles page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506
 msgid "Banned Peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527
 msgid "Banned IPs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150
 msgid "config reseeding"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359
 msgid "I2P Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
 msgid ""
 "Reseeding is the bootstrapping process used to find other routers when you "
 "first install I2P, or when your router has too few router references "
 "remaining."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
 msgid ""
 "If reseeding has failed, you should first check your network connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
 msgid ""
 "Change these only if HTTP is blocked by a restrictive firewall, reseed has "
 "failed, and you have access to an HTTP proxy."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:467
 msgid "the FAQ"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:481
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
 msgid "Enable HTTP Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
 msgid "HTTP Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
 msgid "HTTP Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
 msgid "Use HTTP Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
 msgid "HTTP Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
 msgid "HTTP Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
 msgid "Enable HTTPS Proxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:527
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:531
 msgid "HTTPS Proxy Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150
 msgid "config service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
 msgid "I2P Service Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445
 msgid "Shutdown the router"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447
 msgid ""
 "Graceful shutdown lets the router satisfy the agreements it has already made"
 " before shutting down, but may take a few minutes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:449
 msgid ""
 "If you need to kill the router immediately, that option is available as "
 "well."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459
 msgid ""
 "If you want the router to restart itself after shutting down, you can choose"
 " one of the following."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461
 msgid ""
 "This is useful in some situations - for example, if you changed some "
 "settings that client applications only read at startup, such as the "
 "routerconsole password or the interface it listens on."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:463
 msgid ""
 "A graceful restart will take a few minutes (but your peers will appreciate "
 "your patience), while a hard restart does so immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465
 msgid ""
 "After tearing down the router, it will wait 1 minute before starting back up"
 " again."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
 msgid "Systray integration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
 msgid ""
 "On the windows platform, there is a small application to sit in the system "
 "tray, allowing you to view the router's status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
 msgid ""
 "(later on, I2P client applications will be able to integrate their own "
 "functionality into the system tray as well)."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
 msgid ""
 "If you are on windows, you can either enable or disable that icon here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
 msgid "Show systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485
 msgid "Hide systray icon"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487
 msgid "Run on startup"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489
 msgid ""
 "You can control whether I2P is run on startup or not by selecting one of the"
 " following options - I2P will install (or remove) a service accordingly."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
 msgid "If you prefer the command line, you can also run the "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
 msgid "Note"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
 msgid ""
 "If you are running I2P as service right now, removing it will shut down your"
 " router immediately."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503
 msgid ""
 "You may want to consider shutting down gracefully, as above, then running "
 "uninstall_i2p_service_winnt.bat."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507
 msgid "Debugging"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509
 msgid "View the job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513
 msgid ""
 "At times, it may be helpful to debug I2P by getting a thread dump. To do so,"
 " please select the following option and review the thread dumped to <a "
 "href=\"logs.jsp#servicelogs\">wrapper.log</a>."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
 "I2P's main configuration interface is this web console, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150
 msgid "config summary bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346
 msgid "I2P Summary Bar Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458
 msgid "Refresh Interval"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:464
 msgid "seconds"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468
 msgid "Customize Summary Bar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148
 msgid "config stats"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320
 msgid "I2P Stats Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:418
 msgid "Configure I2P Stat Collection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:428
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:436
 msgid "Stat file"
 msgstr ""
 
 #. shouldShowLog
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:445
 msgid "Filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
 msgid "toggle all"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
 msgid "Log"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:474
 msgid "Graph"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:521
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:529
 msgid "Advanced filter"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:147
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150
 msgid "config tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359
 msgid "I2P Tunnel Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:457
 msgid "The default settings work for most people."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:461
 msgid "There is a fundamental tradeoff between anonymity and performance."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:464
 msgid ""
 "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 "
 "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely"
 " reduce performance or reliability."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:467
 msgid "High CPU and/or high outbound bandwidth usage may result."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:470
 msgid "Change these settings with care, and adjust them if you have problems."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:480
 msgid ""
 "Exploratory tunnel setting changes are stored in the router.config file."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:483
 msgid "Client tunnel changes are temporary and are not saved."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485
 msgid "To make permanent client tunnel changes see the"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487
 msgid "i2ptunnel page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148
 msgid "config UI"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330
 msgid "I2P UI Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:416
 msgid "Router Console Theme"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:428
 msgid "Theme selection disabled for Internet Explorer, sorry."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:430
 msgid ""
 "If you're not using IE, it's likely that your browser is pretending to be "
 "IE; please configure your browser (or proxy) to use a different User Agent "
 "string if you'd like to access the console themes."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:434
 msgid "Router Console Language"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:440
 msgid ""
 "Please contribute to the router console translation project! Contact the "
 "developers in #i2p-dev on IRC to help."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444
 msgid "Apply"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:446
 msgid "Router Console Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148
 msgid "config update"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
 msgid "I2P Update Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
 msgid "Check for I2P and news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:426
 msgid "News &amp; I2P Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:430
 msgid "Check for news updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
 msgid "News Updates"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
 msgid "Update In Progress"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:448
 msgid "News URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
 msgid "Refresh frequency"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:462
 msgid "Update policy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468
 msgid "Fetch news through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:466
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:470
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
 msgid "eepProxy port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:490
 msgid "Update URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:494
 msgid "Trusted keys"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509
 msgid "Updates will be dispatched via your package manager."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:382
 msgid "Welcome to I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
 msgid "I2P Addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338
 msgid "Open in new tab"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342
 msgid "Your browser does not support iFrames."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344
 msgid "Click here to continue."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
 msgid "Internal Error"
 msgstr "Внутрішня помилка"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165
 msgid "Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173
 msgid "Sorry! There has been an internal error."
 msgstr ""
 
 #. note to translators - both parameters are URLs
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350
 #, java-format
 msgid "Please report bugs on {0} or {1}."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354
 msgid ""
 "You may use the username \"guest\" and password \"guest\" if you do not wish"
 " to register."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356
 msgid "Please include this information in bug reports"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185
 msgid "Error Details"
 msgstr "Подробиці помилки"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187
 #, java-format
 msgid "Error {0}"
 msgstr "Помилка {0}"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346
 msgid "I2P Version and Running Environment"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407
 msgid ""
 "Note that system information, log timestamps, and log messages may provide "
 "clues to your location; please review everything you include in a bug "
 "report."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161
 msgid "Page Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337
 msgid ""
 "Sorry! You appear to be requesting a non-existent Router Console page or "
 "resource."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:339
 msgid "Error 404"
 msgstr "Помилка 404"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344
 msgid "not found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146
+msgid "events"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334
+msgid "I2P Event Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146
 msgid "graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339
 msgid "I2P Performance Graphs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:325
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328
 msgid ""
 "Click a flag to select a language. Click 'configure language' below to "
 "change it later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:390
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:407
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329
-msgid "I2P Tunnel Manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146
 msgid "job queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318
 msgid "I2P Router Job Queue"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148
 msgid "logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344
 msgid "I2P Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:399
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
 msgid "Critical Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413
 msgid "Router Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419
+msgid "Event Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421
+msgid "View event logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423
 msgid "Service (Wrapper) Logs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146
 msgid "network database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318
 msgid "I2P Network Database"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152
 msgid "WebApp Not Found"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348
 msgid "Web Application Not Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350
 msgid "The requested web application is not running."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352
 msgid ""
 "Please visit the <a href=\"/configclients.jsp#webapp\">config clients "
 "page</a> to start it."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146
 msgid "peer connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318
 msgid "I2P Network Peers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146
 msgid "peer profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318
 msgid "I2P Network Peer Profiles"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148
 msgid "Proof"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146
 msgid "statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331
 msgid "I2P Router Statistics"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312
 #, java-format
 msgid "Disable {0} Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164
 msgid "torrents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336
 msgid "I2P Torrent Downloader"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146
 msgid "tunnel summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318
 msgid "I2P Tunnel Summary"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:143
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318
 msgid "Peer Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342
 #, java-format
 msgid "Profile for peer {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164
 msgid "webmail"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336
 msgid "I2P Webmail"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_vi.po b/apps/routerconsole/locale/messages_vi.po
index f2c64794b19ea8cc8026f7a7f176cce211fc063c..3a95e11630e3b2fb463d9afebdee4b75d2b3caa5 100644
--- a/apps/routerconsole/locale/messages_vi.po
+++ b/apps/routerconsole/locale/messages_vi.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:06+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -40,7 +40,7 @@ msgstr[0] "{0,number,####} phần nghìn giây"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -48,7 +48,7 @@ msgstr[0] "{0} giây"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -56,62 +56,62 @@ msgstr[0] "{0} phút"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} giờ"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "chưa rõ"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0} ngày"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "Bị cấm bởi định tuyến hash: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "Bị cấm bởi định tuyến hash"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "IP  bị cấm bởi mục thông tin {0} trong blocklist.txt"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP bị cấm cho đến khi khởi động lại"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP bị cấm vĩnh viễn"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "Từ"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "Đến"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "không có"
 
@@ -121,91 +121,91 @@ msgstr "không có"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "Từ chối đường ống riêng: Đang khởi động"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "Từ chối đường ống riêng: Độ trễ tin nhắn cao"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "Từ chối hầu hết đường ống riêng: Số lượng yêu cầu cao"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "Từ chối đường ống riêng: Đạt tới hạn"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "Từ chối đường ống riêng: Giới hạn băng thông"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "Từ chối hầu hết đường ống riêng: Giới hạn băng thông"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "Chấp nhận hầu hết đường ống riêng"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "Chấp nhận đường ống riêng"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "Từ chối đường ống riêng: Đang tắt"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "Chấp nhận đường ống riêng"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "Giữ chỗ tải trở lại"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "Giữ chỗ tải lại chỉ có {0} định tuyến."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "Giữ chỗ tải trở lại thất bại."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "Xem {0} để được giúp đỡ."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "trang cấu hình giữ chỗ tải trở lại"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "Giữ chỗ tải trở lại: đang lấy phần đường dẫn giữ chỗ tải."
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -239,7 +239,7 @@ msgstr "Số mạng ngang hàng hiện đang tương tác với"
 msgid "Known fast peers"
 msgstr "Các mạng ngang hàng kết nối nhanh đã biết"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "Mục thông tin NetDb"
 
@@ -249,45 +249,54 @@ msgstr "Mục thông tin NetDb"
 msgid "No transports (hidden or starting up?)"
 msgstr "Không có truyền tải (bị ẩn hoặc đang khởi động?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "Không thể kết bằng bất kỳ phương thức truyền tải nào"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "Địa chỉ truyền tải định tuyến"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} đã được dùng cho các kết nối với bên ngoài"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP hiện bị vô hiệu hóa"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "Giới hạn về kết nối truyền tải của bạn được tự động điều chỉnh dựa trên phần băng thông mà bạn đã cấu hình."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "Để ghi đè thông tin lên các giới hạn này, thêm vào phần thiết lập i2np.ntcp.maxConnections=nnn và i2np.udp.maxConnections=nnn trong trang thiết lập nâng cao."
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "Định nghĩa"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -296,251 +305,258 @@ msgstr "Định nghĩa"
 msgid "Peer"
 msgstr "Mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "Mạng ngang hàng từ xa, được xác định bởi phần hash của định tuyến"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "Thư mục"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "Đường nối vào"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "Đường nối ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "Phần này giới thiệu cho chúng ta (trợ giúp các mạng ngang hàng khác vượt qua tường lửa từ phía chúng ta)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "Chúng tôi đề nghị giới thiệu các phần mạng (giúp đỡ các mạng ngang hàng khác vượt qua tường lửa của họ)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "Khoảng thời gian kể từ khi một gói tin được nhận / gửi"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "Trạng thái nghỉ"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "Vào/Ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "Tỉ lệ truyền tải đã được tinh chỉnh đối với kết nối đến bên trong / ra ngoài (KByte mỗi giây)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "Đường nối này được bao lâu"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "Lên"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "Lệch"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "Sự khác biệt giữa thời gian phía mạng ngang hàng và bạn"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "Cửa sổ nghẽn, là số lượng byte có thể được gửi mà không cần sự tường minh"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "Số lượng các tin nhắn đang đợi xác nhận"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "Số lượng tố đa các tin nhắn được gửi đi"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "Số lượng các phần gửi đi đang đợi xử lý vượt quá hạn định của cửa sổ nghẽn"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "Ngưỡng giới hạn chậm"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "Thời gian chu trình vòng tính bằng phần nghìn giây"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "Kích thước tối đa của gói tin gửi đi hiện tại / kích thước tối đa của gói tin nhận được theo dự kiến (byte)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "TX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "Tổng số gói tin được gửi đến mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "RX"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "Tổng số gói tin nhận được từ mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "TX Trùng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "Tổng số gói tin được truyền tải lại đến mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "RX Trùng"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "Tổng số gói tin trùng lặp nhận được từ mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "Dịch vụ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "Cấu hình giao diện chung cho WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "Loại"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "Dòng dữ liệu phía trên"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "Dòng dữ liệu phía dưới"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "Kết nối WAN PPP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "IP bổ sung"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "Lớp chuyển tiếp 3"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "Dịch vụ kết nối mặc định"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "Kết nối IP dạng WAN"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "Cấu hình liên kết WAN Ethernet"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "Đã tìm thấy thiết bị"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "Thiết bị phụ trợ"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "Trạng thái UPnP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP đã bị vô hiệu hóa; Bạn có muốn có nhiều hơn thiết bị cổng chuyển tiếp internet dạng UPnP trên mạng LAN?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP không tìm thấy bất kỳ thiết bị UPnP liên quan nào, tương thích với thiết bị của bạn trên mạng LAN."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "Địa chỉ IP bổ sung hiện tại được báo cáo bởi UPnP là {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "Địa chỉ IP bổ sung hiện tại hiện không sẵn có."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP gửi báo cáo về tỉ lệ bit tối đa của luồng dữ liệu phía dưới là {0}bits/giây"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
 msgstr "UPnP gửi báo cáo về tỉ lệ bit tối đa của luồng dữ liệu phía trên là {0}bits/giây"
@@ -549,279 +565,275 @@ msgstr "UPnP gửi báo cáo về tỉ lệ bit tối đa của luồng dữ li
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} cổng {1,number,#####} đã được chuyển tiếp thành công bằng UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} cổng {1,number,#####} chưa được chuyển tiếp bằng UPnP."
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP hiện bị vô hiệu hóa"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "Kết nối NTCP"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "Giới hạn"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "Hết thời hạn"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "Bên ngoài hàng đợi"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "Đăng nhập trở lại?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "Luồng dữ liệu vào"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "Luồng dữ liệu ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "Kết nối UDP"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "Sắp xếp theo mã hash của mạng ngang hàng"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "Hướng/Giới thiệu"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "Sắp xếp theo trạng thái nhàn rỗi của luồng tín hiệu vào"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "Sắp xếp theo trạng thái nhàn rỗi của luồng tín hiệu ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "Sắp xếp theo tỷ lệ của luồng tín hiệu vào"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "Sắp xếp theo tỷ lệ của luồng tín hiệu ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "Sắp xếp theo thời gian hoạt động kết nối"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "Sắp xếp theo đồng hồ nghiêng"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "Sắp xếp theo cửa sổ nghẽn"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "Sắp xếp theo ngưỡng giới hạn chậm"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "Sắp xếp theo thời gian hành trình vòng"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "Sắp xếp theo thời gian giới hạn truyền tải trở lại"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "Sắp xếp theo đơn vị truyền tải tối đa của luồng tín hiệu ra"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "Sắp xếp theo gói tin đã gửi"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "Sắp xếp theo gói tin đã nhận"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "Sắp xếp theo gói tin bị truyền tải trở lại"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "Sắp xếp theo gói tin nhận được nhiều hơn một lần"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "Chúng tôi cung cấp phần giới thiệu"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "Họ cung cấp phần giới thiệu với chúng ta"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "1 thất bại"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "{0} thất bại"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "Bị Cấm"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "đăng nhập trở lại"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "Bỏ yêu cầu đường ống riêng: Quá chậm"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "Bỏ yêu cầu đường ống riêng: Quá tải"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "Từ chối đường ống riêng: Quá tải yêu cầu kết nối"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "Từ chối đường ống riêng: vượt giới hạn kết nối"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "Bỏ yêu cầu đường ống riêng: Độ tải quá cao"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "Bỏ yêu cầu đường ống riêng: Hàng đợi thời gian"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "Hiện đã phát hành tiện ích mới phiên bản {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "Cập nhật không thành công đối với tiện ích {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "Không có phiên bản mới dành cho tiện ích {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "{0}B đã truyền"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "Truyền thất bại từ phía {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "Đã tải về bản cập nhật"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "Đang khởi động lại"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "Đã xác nhận phần cập nhật"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "từ {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "Chưa xác nhận tập tin cập nhật từ {0} bị lỗi"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "Xảy ra lỗi khi sao chép sang {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr ""
@@ -1329,8 +1341,8 @@ msgid "Add Client"
 msgstr "Add Client"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr ""
 
@@ -1361,9 +1373,9 @@ msgid "Plugin"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr ""
 
@@ -1385,7 +1397,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr ""
 
@@ -1398,7 +1410,7 @@ msgid "Stop"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr ""
@@ -1420,7 +1432,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1430,7 +1442,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1449,6 +1461,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1529,7 +1542,7 @@ msgstr ""
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr ""
 
@@ -1578,7 +1591,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr ""
 
@@ -1597,7 +1610,7 @@ msgid "Home Page"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr ""
 
@@ -1653,8 +1666,8 @@ msgid "UI"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr ""
@@ -1673,15 +1686,15 @@ msgid "Logging"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr ""
 
@@ -1694,7 +1707,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1804,16 +1817,16 @@ msgstr ""
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
@@ -2376,7 +2389,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr ""
 
@@ -2385,86 +2398,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr ""
 
@@ -2622,7 +2635,7 @@ msgid "{0} for {1}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr ""
 
@@ -2736,12 +2749,12 @@ msgid "Graph settings saved"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
@@ -2772,17 +2785,17 @@ msgid "I2P Home Page Configuration"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr ""
 
@@ -2792,17 +2805,17 @@ msgid "Router Console"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr ""
 
@@ -2888,10 +2901,8 @@ msgstr ""
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2974,7 +2985,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr ""
 
@@ -3124,148 +3135,157 @@ msgid "Unpublished"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr ""
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
@@ -3284,7 +3304,7 @@ msgid "Hide news"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr ""
 
@@ -3361,7 +3381,7 @@ msgid "Failing"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr ""
 
@@ -3574,7 +3594,7 @@ msgid "Lifetime average frequency"
 msgstr ""
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3623,282 +3643,282 @@ msgstr ""
 msgid "Graph Event Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr ""
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr ""
 
@@ -3972,43 +3992,43 @@ msgstr ""
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr ""
 
@@ -4016,31 +4036,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4049,40 +4069,40 @@ msgstr ""
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr ""
 
@@ -4355,6 +4375,10 @@ msgstr ""
 msgid "i2cp"
 msgstr ""
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr ""
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr ""
@@ -4672,7 +4696,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4760,11 +4784,11 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
+msgid "I2CP Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
-msgid "I2CP Interface"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
@@ -4853,12 +4877,13 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
+msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
@@ -4918,48 +4943,53 @@ msgstr ""
 msgid "Log file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
-msgid "(the symbol '@' will be replaced during log rotation)"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr ""
 
@@ -6147,18 +6177,6 @@ msgstr ""
 msgid "Search I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr ""
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr ""
diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po
index 4ffea5ef0b60ac68237e132ff67b78cd569d2730..a7046d51c69715b63ac8115d54c928dbe945571d 100644
--- a/apps/routerconsole/locale/messages_zh.po
+++ b/apps/routerconsole/locale/messages_zh.po
@@ -13,15 +13,15 @@
 # walking <walking@i2pmail.org>, 2011
 # wwj402 <wwj402@gmail.com>, 2013
 # xtoaster <zhazhenzhong@gmail.com>, 2012
-# YF <yfdyh000@gmail.com>, 2014
+# YF <yfdyh000@gmail.com>, 2014-2015
 # xtoaster <zhazhenzhong@gmail.com>, 2012
 # xtoaster <zhazhenzhong@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-14 11:57+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 03:55+0000\n"
 "Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
 #. locale.
 #. If you want the digit separator in your locale, translate as {0}.
 #. alternates: msec, msecs
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1525
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -49,7 +49,7 @@ msgstr[0] "{0,number,####} ms"
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1514
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -57,7 +57,7 @@ msgstr[0] "{0} 秒"
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -65,62 +65,62 @@ msgstr[0] "{0} 分钟"
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 小时"
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
 msgid "n/a"
 msgstr "不可用"
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
 msgstr[0] "{0} 天"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:144
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:201
 #, java-format
 msgid "Banned by router hash: {0}"
 msgstr "按路由器 HASH 封杀: {0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:146
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:203
 msgid "Banned by router hash"
 msgstr "已按路由 HASH 封杀"
 
 #. Temporary reason, until the job finishes
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:712
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:785
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:795
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:881
 #, java-format
 msgid "IP banned by blocklist.txt entry {0}"
 msgstr "按IP黑名单blocklist.txt封杀的节点{0}"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:824
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:920
 msgid "IPs Banned Until Restart"
 msgstr "IP 已封锁直到重启"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:861
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:957
 msgid "IPs Permanently Banned"
 msgstr "IP 永久封锁"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:863
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:959
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
 msgid "From"
 msgstr "从"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:865
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:961
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
 msgid "To"
 msgstr "至"
 
-#: ../../../router/java/src/net/i2p/router/Blocklist.java:901
+#: ../../../router/java/src/net/i2p/router/Blocklist.java:997
 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:458
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:643
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:461
 msgid "none"
 msgstr "无"
 
@@ -130,91 +130,91 @@ msgstr "无"
 #. low");
 #. else
 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:75
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:120
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:497
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:128
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:505
 msgid "Rejecting tunnels: Starting up"
 msgstr "拒绝共享:正在启动"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:167
 msgid "Rejecting tunnels: High message delay"
 msgstr "拒绝共享:高消息延迟"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of
 #. tunnels: High number of requests");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:204
 msgid "Rejecting most tunnels: High number of requests"
 msgstr "收紧共享:高请求量"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:255
 msgid "Rejecting tunnels: Limit reached"
 msgstr "拒绝共享:隧道数限额"
 
 #. .067KBps
 #. * also limited to 90% - see below
 #. always leave at least 4KBps free when allowing
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:318
 msgid "Rejecting tunnels: Bandwidth limit"
 msgstr "拒绝共享:带宽限额"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels:
 #. Bandwidth limit");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:388
 msgid "Rejecting most tunnels: Bandwidth limit"
 msgstr "收紧共享:带宽限额"
 
 #. hard to do {0} from here
 #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of
 #. tunnels");
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:384
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:392
 msgid "Accepting most tunnels"
 msgstr "接受多数隧道"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:386
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:513
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:394
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:521
 msgid "Accepting tunnels"
 msgstr "接受共享隧道"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:502
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:510
 msgid "Rejecting tunnels: Shutting down"
 msgstr "拒绝共享:准备退出"
 
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:515
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523
 msgid "Rejecting tunnels"
 msgstr "拒绝参与共享隧道"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:177
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22
 msgid "Reseeding"
 msgstr "网络引导"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] "网络引导只发现了 {0} 个节点。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
 msgid "Reseed failed."
 msgstr "网络引导失败。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
 #, java-format
 msgid "See {0} for help."
 msgstr "帮助参见 {0}。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:198
 msgid "reseed configuration page"
 msgstr "网络引导设置页面"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:382
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:487
 msgid "Reseeding: fetching seed URL."
 msgstr "正在补种:从网址补种。"
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:439
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:582
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -248,7 +248,7 @@ msgstr "正在通讯的活动节点数"
 msgid "Known fast peers"
 msgstr "已知快速节点"
 
-#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
+#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:458
 msgid "NetDb entry"
 msgstr "网络库项目"
 
@@ -258,45 +258,54 @@ msgstr "网络库项目"
 msgid "No transports (hidden or starting up?)"
 msgstr "无数据传输(隐身或正在启动?)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
+msgid "Unsupported signature type"
+msgstr "不支持的签名类型"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
 msgid "Unreachable on any transport"
 msgstr "各传输方式均不可达"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:629
 msgid "Router Transport Addresses"
 msgstr "路由传输地址"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:637
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr "{0} 仅被用作出站连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:648
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:276
+msgid "UPnP is not enabled"
+msgstr "UPnP 未启用"
+
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:657
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
 msgid "Help"
 msgstr "帮助"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr "最大传输连接数会根据您的带宽设置自动调整。"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr "要自定义连接数限制,您可以在高级配置页面中添加参数 i2np.ntcp.maxConnections=nnn 及 i2np.udp.maxConnections=nnn 。"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
 msgid "Definitions"
 msgstr "定义"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1207
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2351
 #: ../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
@@ -305,532 +314,535 @@ msgstr "定义"
 msgid "Peer"
 msgstr "节点"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
 msgid "The remote peer, identified by router hash"
 msgstr "以路由Hash区分的远程节点"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1208
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Dir"
 msgstr "类别"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
 msgid "Inbound connection"
 msgstr "入站连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
 msgid "Outbound connection"
 msgstr "出站连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr "对方向我提供(帮助其他节点穿越防火墙)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:671
 msgid ""
 "We offered to introduce them (help other peers traverse their firewall)"
 msgstr "我方向它提供(帮助其他节点穿越防火墙)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
 msgid "How long since a packet has been received / sent"
 msgstr "最近一次数据传输距现在的时间"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1210
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2357
 msgid "Idle"
 msgstr "空闲"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2362
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "In/Out"
 msgstr "入/出"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr "进/出站平滑传输率(Kbyte/s)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
 msgid "How long ago this connection was established"
 msgstr "此连接已建立多久"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1212
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2367
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:888
 msgid "Up"
 msgstr "寿命"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1213
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2369
 msgid "Skew"
 msgstr "时滞"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
 msgid "The difference between the peer's clock and your own"
 msgstr "该节点的时钟与本地时钟间的差异"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr "拥塞窗口,即每次确认前可发送的字节量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr "等待ACK确认的已发送数据包数量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:678
 msgid "The maximum number of concurrent messages to send"
 msgstr "并发消息的最大发送量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:679
 msgid "The number of pending sends which exceed congestion window"
 msgstr "超过拥塞窗口的待发送数量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:680
 msgid "The slow start threshold"
 msgstr "慢启动门槛"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:681
 msgid "The round trip time in milliseconds"
 msgstr "往返时间(毫秒)"
 
 #. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The
 #. standard deviation of the round trip time in
 #. milliseconds")).append("<br>\n" +
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:683
 msgid "The retransmit timeout in milliseconds"
 msgstr "重传输超时值(毫秒)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:684
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr "当前发送数据包的最大大小/预计接收数据包的最大大小(字节)"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1214
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2386
 msgid "TX"
 msgstr "发包"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:685
 msgid "The total number of packets sent to the peer"
 msgstr "向节点发送的数据包总量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1215
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2388
 msgid "RX"
 msgstr "接包"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:686
 msgid "The total number of packets received from the peer"
 msgstr "从节点接收到数据包总量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2391
 msgid "Dup TX"
 msgstr "重发包"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687
 msgid "The total number of packets retransmitted to the peer"
 msgstr "向节点重发送的数据包总量"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2393
 msgid "Dup RX"
 msgstr "重接包"
 
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:688
 msgid "The total number of duplicate packets received from the peer"
 msgstr "从节点接收到的重复数据包总量"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
 msgid "Service"
 msgstr "服务"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:527
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
 msgid "WAN Common Interface Configuration"
 msgstr "WAN 通用接口设置"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:528
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
 msgid "Status"
 msgstr "状态"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614
 msgid "Type"
 msgstr "类型"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589
 msgid "Upstream"
 msgstr "上行"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:534
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:545
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 msgid "Downstream"
 msgstr "下行"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:538
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
 msgid "WAN PPP Connection"
 msgstr "WAN PPP连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:547
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:559
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Uptime"
+msgstr "运行时间"
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616
 msgid "External IP"
 msgstr "外部IP"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:551
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597
 msgid "Layer 3 Forwarding"
 msgstr "第三层(网络层)转发"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:552
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 msgid "Default Connection Service"
 msgstr "默认连接服务"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:556
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602
 msgid "WAN IP Connection"
 msgstr "WAN IP 连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:563
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620
 msgid "WAN Ethernet Link Configuration"
 msgstr "WAN 以太网(Ethernet)连接设置"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
 msgid "Found Device"
 msgstr "发现设备"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:585
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
 msgid "Subdevice"
 msgstr "子设备"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664
 msgid "UPnP Status"
 msgstr "UPnP状态"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668
 msgid "Disabled UPnP Devices"
 msgstr "禁用UPnP设备"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682
 msgid ""
 "UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
 "Device on your LAN ?"
 msgstr "UPnP 已经禁用;您的局域网中一个以上的UPnP Internet 网关设备吗?"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:627
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685
 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
 msgstr "UPnP 支持在您的局域网中没有发现任何支持UPnP的设备。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:635
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693
 #, java-format
 msgid "The current external IP address reported by UPnP is {0}"
 msgstr "UPnP报告的当前外部IP为 {0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:637
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695
 msgid "The current external IP address is not available."
 msgstr "无法获取当前的外部IP地址。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699
 #, java-format
 msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
 msgstr "UPnP 报告的最大下行比特率为 {0}bit/s"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701
 #, java-format
 msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
-msgstr "UPnP 报告的最大上行比特率为 {0}bit/s"
+msgstr "UPnP 报告的最大上行比特率为 {0}bit/秒"
 
 #. {0} is TCP or UDP
 #. {1,number,#####} prevents 12345 from being output as 12,345 in the English
 #. locale.
 #. If you want the digit separator in your locale, translate as {1}.
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:651
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709
 #, java-format
 msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
 msgstr "{0} 端口 {1,number,#####} 已经通过 UPnP 成功转发。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:653
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711
 #, java-format
 msgid "{0} port {1,number,#####} was not forwarded by UPnP."
 msgstr "{0} 端口 {1,number,#####} 通过 UPnP 转发失败。"
 
-#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:197
-msgid "UPnP is not enabled"
-msgstr "UPnP 未启用"
-
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
 #, java-format
 msgid "Excessive clock skew: {0}"
 msgstr "严重时滞:{0}"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1202
 msgid "NTCP connections"
 msgstr "NTCP连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1203
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2347
 msgid "Limit"
 msgstr "限制"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1204
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2348
 msgid "Timeout"
 msgstr "超时"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2356
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1216
 msgid "Out Queue"
 msgstr "出队"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1217
 msgid "Backlogged?"
 msgstr "积压?"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1230
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2410
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Inbound"
 msgstr "入站"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1232
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2412
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
 msgid "Outbound"
 msgstr "出站"
 
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1287
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] "{0} 个节点"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2346
 msgid "UDP connections"
 msgstr "UDP连接"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2353
 msgid "Sort by peer hash"
 msgstr "按节点Hash"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2355
 msgid "Direction/Introduction"
 msgstr "按方向"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2358
 msgid "Sort by idle inbound"
 msgstr "按出站空闲"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2360
 msgid "Sort by idle outbound"
 msgstr "按入站空闲"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2363
 msgid "Sort by inbound rate"
 msgstr "按入站速度"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2365
 msgid "Sort by outbound rate"
 msgstr "按出站速度"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2368
 msgid "Sort by connection uptime"
 msgstr "按连接时间"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2370
 msgid "Sort by clock skew"
 msgstr "按时滞"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2373
 msgid "Sort by congestion window"
 msgstr "按拥塞窗口"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2375
 msgid "Sort by slow start threshold"
 msgstr "按慢启动门槛"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2378
 msgid "Sort by round trip time"
 msgstr "按往返时间"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2382
 msgid "Sort by retransmission timeout"
 msgstr "按重传输超时时间"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2385
 msgid "Sort by outbound maximum transmit unit"
 msgstr "按出站最大传输单元"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2387
 msgid "Sort by packets sent"
 msgstr "按已发送数据包"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2389
 msgid "Sort by packets received"
 msgstr "按已接收数据包"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2392
 msgid "Sort by packets retransmitted"
 msgstr "按重传数据包"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2394
 msgid "Sort by packets received more than once"
 msgstr "按重复数据包"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2414
 msgid "We offered to introduce them"
 msgstr "我们提供给它们"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2416
 msgid "They offered to introduce us"
 msgstr "它们提供给我们"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2420
 msgid "Choked"
 msgstr "阻塞"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2428
 msgid "1 fail"
 msgstr "失败 1 次"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2430
 #, java-format
 msgid "{0} fails"
 msgstr "失败 {0} 次"
 
 #. 1
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2436
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166
 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
 msgid "Banned"
 msgstr "已封锁"
 
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495
 msgid "backlogged"
 msgstr "积压"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:248
 msgid "Dropping tunnel requests: Too slow"
 msgstr "忽略共享请求:速度太慢"
 
 #. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:438
 msgid "Dropping tunnel requests: Overloaded"
 msgstr "忽略共享请求:路由过载"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:678
 msgid "Rejecting tunnels: Hidden mode"
 msgstr "拒绝隧道:隐身模式"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:706
 msgid "Rejecting tunnels: Request overload"
 msgstr "拒绝共享:请求过多"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:737
 msgid "Rejecting tunnels: Connection limit"
 msgstr "拒绝共享:连接受限"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:949
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:982
 msgid "Dropping tunnel requests: High load"
 msgstr "忽略共享请求:高负载"
 
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1061
 msgid "Dropping tunnel requests: Queue time"
 msgstr "忽略共享请求:队列积压"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:836
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:835
 #, java-format
 msgid "New plugin version {0} is available"
 msgstr "新插件版本 {0} 可用"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:915
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:914
 #, java-format
 msgid "Update check failed for plugin {0}"
 msgstr "{0} 插件更新检查失败"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:917
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:916
 #, java-format
 msgid "No new version is available for plugin {0}"
 msgstr "插件 {0} 没有更新可用"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:940
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:939
 #, java-format
 msgid "{0}B transferred"
 msgstr "已传输 {0}B"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:993
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288
 #, java-format
 msgid "Transfer failed from {0}"
 msgstr "传输 {0} 的数据失败"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1232
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1296
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:679
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1231
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1295
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:682
 msgid "Update downloaded"
 msgstr "更新已下载"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1320
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1319
 msgid "Restarting"
 msgstr "正在重启"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1276
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1275
 msgid "Update verified"
 msgstr "更新已验证"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1285
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1284
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:176
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:293
 #, java-format
 msgid "from {0}"
 msgstr "自 {0}"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1300
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1299
 #, java-format
 msgid "Unsigned update file from {0} is corrupt"
 msgstr "来自 {0} 的未签名更新包已损坏"
 
-#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1329
+#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328
 #, java-format
 msgid "Failed copy to {0}"
 msgstr "无法复制到 {0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:144
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:162
 msgid "In-network updates disabled. Check package manager."
 msgstr "网络更新被禁用。请检查软件包管理。"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:150
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
 msgid "No write permission for I2P install directory."
 msgstr "没有对I2P安装目录的写权限。"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:158
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:176
 #, java-format
 msgid "You must first update to version {0}"
 msgstr "你必须先更新到版本{0}"
 
-#: ../java/src/net/i2p/router/update/NewsFetcher.java:168
+#: ../java/src/net/i2p/router/update/NewsFetcher.java:186
 #, java-format
 msgid "Requires Java version {0} but installed Java version is {1}"
 msgstr "需要版本为 {0} 的 Java,但你安装的版本是 {1}"
@@ -1338,8 +1350,8 @@ msgid "Add Client"
 msgstr "添加客户端"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:112
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:432
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:435
 msgid "Client"
 msgstr "客户"
 
@@ -1370,9 +1382,9 @@ msgid "Plugin"
 msgstr "插件"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299
 msgid "Version"
 msgstr "版本"
 
@@ -1394,7 +1406,7 @@ msgstr "许可证"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:254
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
 msgid "Website"
 msgstr "网站"
 
@@ -1407,7 +1419,7 @@ msgid "Stop"
 msgstr "停止"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:322
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:142
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:145
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444
 msgid "Check for updates"
 msgstr "检查更新"
@@ -1420,7 +1432,7 @@ msgstr "更新"
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:329
 #, java-format
 msgid "Are you sure you want to delete {0}?"
-msgstr "您确定要删除 {0} ?"
+msgstr "您确定要删除 {0} 吗?"
 
 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:331
 msgid "Delete"
@@ -1429,7 +1441,7 @@ 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:19
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:905
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:908
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:512
@@ -1439,7 +1451,7 @@ 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:924
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:927
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494
@@ -1458,6 +1470,7 @@ 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:173
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:462
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:515
@@ -1538,7 +1551,7 @@ msgstr "目标无效"
 msgid "Log overrides updated"
 msgstr "日志参数已更新"
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:161
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163
 msgid "Log configuration saved"
 msgstr "日志设置已保存"
 
@@ -1587,7 +1600,7 @@ msgstr "警告"
 #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169
 #: ../java/src/net/i2p/router/web/HomeHelper.java:198
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:859
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:862
 msgid "Remove"
 msgstr "删除"
 
@@ -1606,7 +1619,7 @@ msgid "Home Page"
 msgstr "主页"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
 msgid "Network"
 msgstr "网络"
 
@@ -1662,8 +1675,8 @@ msgid "UI"
 msgstr "界面"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:493
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
 #: ../java/strings/Strings.java:72
 msgid "Tunnels"
 msgstr "隧道"
@@ -1682,15 +1695,15 @@ msgid "Logging"
 msgstr "日志"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367
 #: ../java/strings/Strings.java:67
 msgid "Peers"
 msgstr "节点"
 
 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:454
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
 msgid "Stats"
 msgstr "统计"
 
@@ -1703,7 +1716,7 @@ msgstr "高级"
 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:541
@@ -1813,16 +1826,16 @@ msgstr "正在更新共享带宽比例"
 msgid "Updated bandwidth limits"
 msgstr "带宽限制更新完毕"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49
 msgid "unknown"
 msgstr "未知"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:240
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:247
 msgid "bits per second"
 msgstr "Bit/s"
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:241
+#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ",每月最多 {0} 字节(如果 24 小时 x 31 天不间断全速运转)"
@@ -2385,7 +2398,7 @@ msgstr "用户名"
 
 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182
 #: ../java/src/net/i2p/router/web/HomeHelper.java:220
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:907
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
 msgid "Add"
 msgstr "添加"
 
@@ -2394,86 +2407,86 @@ msgstr "添加"
 msgid "Password"
 msgstr "密码"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:149
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:152
 msgid "Update or check already in progress"
 msgstr "更新或检查已在进行"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:161
 msgid "Update available, attempting to download now"
 msgstr "有更新可用,正在尝试下载"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
 msgid "Update available, click button on left to download"
 msgstr "有更新可用,点左侧按钮下载"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:166
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:169
 msgid "No update available"
 msgstr "无更新可用"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:181
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187
 #, java-format
 msgid "Updating news URL to {0}"
 msgstr "正在更新新闻链接至 {0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:194
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53
 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59
 msgid "internal"
 msgstr "内部"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
 #, java-format
 msgid "Updating proxy host to {0}"
 msgstr "正在更新代理主机至{0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:206
 #, java-format
 msgid "Updating proxy port to {0}"
 msgstr "正在更新代理端口至{0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:220
 #, java-format
 msgid "Updating refresh frequency to {0}"
 msgstr "正在更新刷新频率至{0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:215
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:119
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
 #: ../java/src/net/i2p/router/web/GraphHelper.java:377
 msgid "Never"
 msgstr "从不"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:222
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:228
 #, java-format
 msgid "Updating update policy to {0}"
 msgstr "正在更新策略至{0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:237
 msgid "Updating update URLs."
 msgstr "正在更新更新链接。"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:243
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249
 msgid "Updating trusted keys."
 msgstr "正在更新可信公钥。"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:255
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:261
 #, java-format
 msgid "Updating unsigned update URL to {0}"
 msgstr "正在更新未签名更新链接至{0}"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:121
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
 msgid "Every"
 msgstr "每"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:139
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:141
 msgid "Notify only"
 msgstr "只提示"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:148
 msgid "Download and verify only"
 msgstr "仅下载和验证"
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:154
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156
 msgid "Download, verify, and restart"
 msgstr "仅下载、验证并重启"
 
@@ -2631,7 +2644,7 @@ msgid "{0} for {1}"
 msgstr "过去 {1} 统计 {0}"
 
 #: ../java/src/net/i2p/router/web/GraphHelper.java:223
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
 msgid "Bandwidth usage"
 msgstr "带宽占用"
 
@@ -2745,12 +2758,12 @@ msgid "Graph settings saved"
 msgstr "图表设置已保存"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224
 msgid "Addressbook"
 msgstr "地址簿"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr "管理您的 I2P hosts 文件(I2P域名解析表)"
 
@@ -2781,17 +2794,17 @@ msgid "I2P Home Page Configuration"
 msgstr "I2P 主页设置"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
 msgid "Anonymous webmail client"
 msgstr "匿名Web邮件客户端"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:32
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
 msgid "Email"
 msgstr "匿名邮箱"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:33
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
 msgid "I2P Router Help"
 msgstr "I2P路由帮助"
 
@@ -2801,17 +2814,17 @@ msgid "Router Console"
 msgstr "路由控制台"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
 msgid "Built-in anonymous BitTorrent Client"
 msgstr "内置的匿名BT客户端"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:35
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
 msgid "Torrents"
 msgstr "匿名BT"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
 msgid "Local web server"
 msgstr "本地Web服务器"
 
@@ -2897,10 +2910,8 @@ msgstr "Javadocs"
 msgid "Technical documentation"
 msgstr "技术文档"
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
-msgid "Simple and fast microblogging website"
-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 +
 #: ../java/src/net/i2p/router/web/HomeHelper.java:54
@@ -2983,7 +2994,7 @@ msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr "您的浏览器尚未配置使用HTTP代理{0}"
 
 #: ../java/src/net/i2p/router/web/HomeHelper.java:200
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:861
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:864
 msgid "Name"
 msgstr "名称"
 
@@ -3133,148 +3144,157 @@ msgid "Unpublished"
 msgstr "未发布"
 
 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159
 msgid "Destination"
 msgstr "目标"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
+msgid "Add to local addressbook"
+msgstr "添加到本地地址簿"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200
 #, java-format
 msgid "Expires in {0}"
 msgstr "{0} 后过期"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202
 #, java-format
 msgid "Expired {0} ago"
 msgstr "{0} 前过期"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
 msgid "Gateway"
 msgstr "网关"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194
 msgid "Lease"
 msgstr "租赁"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196
 msgid "Tunnel"
 msgstr "隧道"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
 msgid "Not initialized"
 msgstr "未初始化"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
 msgid "Network Database Router Statistics"
 msgstr "网络数据库路由统计"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Count"
 msgstr "计数"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333
 msgid "Transports"
 msgstr "传输"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
 msgid "Country"
 msgstr "国家"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
 msgid "Our info"
 msgstr "我方信息"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
 msgid "Peer info for"
 msgstr "节点信息"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
 msgid "Full entry"
 msgstr "完整项"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 msgid "Hidden"
 msgstr "隐身"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
 msgid "Updated"
 msgstr "已更新"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
 #, java-format
 msgid "{0} ago"
 msgstr "{0} 前"
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:424
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:428
 msgid "Published"
 msgstr "发布"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+msgid "Signing Key"
+msgstr "签名密钥"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:432
 msgid "Address(es)"
 msgstr "地址"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444
 msgid "cost"
 msgstr "开销"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "Hidden or starting up"
 msgstr "隐身或正在启动"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU"
 msgstr "SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:470
 msgid "SSU with introducers"
 msgstr "使用中介的SSU连接"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP"
 msgstr "NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU"
 msgstr "NTCP 与 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471
 msgid "NTCP and SSU with introducers"
 msgstr "使用中介的 NTCP 和 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 Only SSU, introducers"
 msgstr "IPv6 仅 SSU, 中介"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU"
 msgstr "IPv6 SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472
 msgid "IPv6 SSU, introducers"
 msgstr "IPv6 SSU, 中介"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP"
 msgstr "IPv6 NTCP"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU"
 msgstr "IPv6 NTCP, SSU"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr "IPv6 NTCP, SSU, 中介"
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr "IPv6 仅 NTCP, SSU, 中介"
 
@@ -3293,7 +3313,7 @@ msgid "Hide news"
 msgstr "隐藏新闻"
 
 #: ../java/src/net/i2p/router/web/NewsHelper.java:270
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
 msgid "Show news"
 msgstr "显示新闻"
 
@@ -3370,7 +3390,7 @@ msgid "Failing"
 msgstr "失败"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
 msgid "Integrated"
 msgstr "已整合"
 
@@ -3393,7 +3413,7 @@ msgstr "容量"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
 msgid "Integ. Value"
-msgstr "整数值"
+msgstr "整合值"
 
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203
 msgid "Last Heard About"
@@ -3583,7 +3603,7 @@ msgid "Lifetime average frequency"
 msgstr "全程平均频率"
 
 #: ../java/src/net/i2p/router/web/StatsGenerator.java:143
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:233
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:234
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
@@ -3632,282 +3652,282 @@ msgstr "图表数据"
 msgid "Graph Event Count"
 msgstr "图表事件计数"
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
-msgid "Export Data as XML"
-msgstr "导出数据为XML"
-
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:230
+#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
 msgid "Lifetime average value"
 msgstr "全程均值"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120
 msgid "I2P Router Help &amp; FAQ"
 msgstr "I2P 使用帮助与常见问答"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
 msgid "Help &amp; FAQ"
 msgstr "帮助与常见问答"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
-msgstr "设置客户端及Web应用((服务)的启动;手动启动重要服务"
+msgstr "设置客户端及Web应用(服务)的启动;手动启动重要服务"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132
 msgid "I2P Services"
 msgstr "I2P 服务"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
 msgid "Configure I2P Router"
 msgstr "设置 I2P 路由器"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
 msgid "I2P Internals"
 msgstr "I2P内部设置"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479
 msgid "View existing tunnels and tunnel build status"
 msgstr "查看现存隧道及隧道的建立状态"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:200
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
 msgid "Show all current peer connections"
 msgstr "显示当前所有的节点连接"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184
 msgid "Show recent peer performance profiles"
 msgstr "显示当前节点的性能记录"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:208
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
 msgid "Profiles"
 msgstr "摘要"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
 msgid "Show list of all known I2P routers"
 msgstr "包含所有已知I2P路由器的列表"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
 msgid "NetDB"
 msgstr "网络库"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196
 msgid "Health Report"
 msgstr "路由器健康状况报告"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198
 msgid "Logs"
 msgstr "日志"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:231
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209
 msgid "Graph router performance"
 msgstr "路由性能统计图"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211
 msgid "Graphs"
 msgstr "图表"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:238
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216
 msgid "Textual router performance statistics"
 msgstr "路由性能文字统计"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
-msgid "Local Destinations"
-msgstr "本地目标"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:421
+msgid "Local Tunnels"
+msgstr "本地隧道"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246
-#: ../java/strings/Strings.java:62
-msgid "I2PTunnel"
-msgstr "I2P隧道"
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
+msgid "Hidden Services Manager"
+msgstr "隐藏服务管理器"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248
 msgid "General"
 msgstr "功能概况"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
 msgid ""
 "Your Local Identity is your unique I2P router identity, similar to an ip "
 "address but tailored to I2P. "
 msgstr "您的本地身份即您的I2P路由唯一身份,相当于您在I2P网络中的IP地址。"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254
 msgid "Never disclose this to anyone, as it can reveal your real world ip."
 msgstr "不要将其透露给他人,因为它可能被用来探测和确定您的真实IP。"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256
 msgid "Local Identity"
 msgstr "本地身份"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260
 msgid "Your unique I2P router identity is"
 msgstr "您的I2P路由的唯一身份为"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:286
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
 msgid "never reveal it to anyone"
 msgstr "切勿将其告诉任何人"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
 msgid "show"
 msgstr "显示"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:318
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
 msgid "The version of the I2P software we are running"
 msgstr "当前运行的I2P软件版本"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306
 msgid "How long we've been running for this session"
 msgstr "本次路由运行时间"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:331
-msgid "Uptime"
-msgstr "运行时间"
-
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr "如何正确配置您的防火墙和物理路由器以优化 I2P 工作性能的帮助"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:358
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332
+msgid "See more information on the wiki"
+msgstr "在 wiki 查看更多信息"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334
+msgid "Warning: ECDSA is not available. Update your Java or OS"
+msgstr "警告:ECDSA 不可用。请更新您的 Java 或操作系统"
+
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
 msgid "Configure I2P Updates"
 msgstr "设置I2P更新"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348
 msgid "I2P Update"
 msgstr "I2P更新"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr "过去数分钟/小时中路由连接过的节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376
 msgid "Active"
 msgstr "活动节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385
 msgid "The number of peers available for building client tunnels"
 msgstr "可用来建立客户端隧道的节点数量"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
 msgid "Fast"
 msgstr "快速节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
 msgid "The number of peers available for building exploratory tunnels"
 msgstr "可用来建立探测隧道的节点数量"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397
 msgid "High capacity"
 msgstr "高容量节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
 msgid "The number of peers available for network database inquiries"
 msgstr "可用来查询网络数据库的节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
 msgid "The total number of peers in our network database"
 msgstr "我方网络数据库中记录的节点总数量"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415
 msgid "Known"
 msgstr "已知节点"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
 msgid "Configure router bandwidth allocation"
 msgstr "设置路由的带宽配额"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:449
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
 msgid "Bandwidth in/out"
 msgstr "带宽(进/出站)"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457
 msgid "Total"
 msgstr "总计"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:476
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464
 msgid "Used"
 msgstr "已用"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill "
 "peers"
 msgstr "用来建立或测试隧道,与 FloodFill 节点通信"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489
 msgid "Exploratory"
 msgstr "探测"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr "用来提供服务或访问他人服务的隧道。"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504
 msgid ""
 "Tunnels we are participating in, directly contributing bandwith to the "
 "network"
 msgstr "我方参与的隧道,直接为I2P网络贡献带宽。"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:519
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507
 msgid "Participating"
 msgstr "共享"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:525
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513
 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 "我方提供与使用的隧道比例 - 大于 1.00 表示对网络作出了积极贡献"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516
 msgid "Share ratio"
 msgstr "共享/占用比率"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529
 msgid "What's in the router's job queue?"
 msgstr "查看路由的作业队列"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:543
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531
 msgid "Congestion"
 msgstr "拥堵"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536
 msgid "Indicates router performance"
 msgstr "表示路由器性能"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539
 msgid "Job lag"
 msgstr "作业延迟"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr "表示出站消息发往其他I2P路由的速度"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548
 msgid "Message delay"
 msgstr "消息延迟"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555
 msgid "Round trip time for a tunnel test"
 msgstr "隧道测试的往返时间"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558
 msgid "Tunnel lag"
 msgstr "隧道延迟"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:577
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr "请求队列中来自其他路由的加入隧道请求"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:580
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568
 msgid "Backlog"
 msgstr "积压"
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603
 msgid "News &amp; Updates"
 msgstr "新闻和更新"
 
@@ -3981,43 +4001,43 @@ msgstr "错误-UDP已禁用且TCP入站主机与端口未设置"
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr "警告-因防火墙受限且UDP被禁用"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:419
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:420
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr "添加、删除、编辑或控制客户端隧道和服务器隧道"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:430
-msgid "Server"
-msgstr "服务"
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:433
+msgid "Hidden Service"
+msgstr "隐藏服务"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:434
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:437
 msgid "Show tunnels"
 msgstr "显示隧道"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
 msgid "Leases expired"
 msgstr "Lease已过期"
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:445
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:448
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "Rebuilding"
 msgstr "正在重建"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:446
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
 msgid "ago"
 msgstr "前"
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:449
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:452
 msgid "Ready"
 msgstr "就绪"
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building"
 msgstr "创建中"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:453
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:456
 msgid "Building tunnels"
 msgstr "隧道创建中"
 
@@ -4025,31 +4045,31 @@ 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:469
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:472
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr "共享客户端"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:681
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
 msgid "Click Restart to install"
 msgstr "点击【重启】完成安装"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:683
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:686
 msgid "Click Shutdown and restart to install"
 msgstr "点击【关闭】并重新启动I2P即可完成安装。"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:684
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:698
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:687
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:701
 #, java-format
 msgid "Version {0}"
 msgstr "版本 {0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:697
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:700
 msgid "Update available"
 msgstr "有可用更新"
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:724
 #, java-format
 msgid "Download {0} Update"
 msgstr "下载 {0} 更新"
@@ -4058,40 +4078,40 @@ msgstr "下载 {0} 更新"
 #. <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:729
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:732
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr "下载未签名<br>更新{0}"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:753
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:756
 msgid "Help with firewall configuration"
 msgstr "如何配置防火墙"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:755
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:758
 msgid "Check network connection and NAT/firewall"
 msgstr "检查网络连接和NAT/防火墙"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:774
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:777
 msgid "Reseed"
 msgstr "补种"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:866
 msgid "Order"
 msgstr "顺序"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:880
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:883
 msgid "Top"
 msgstr "顶部"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:893
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:896
 msgid "Down"
 msgstr "向下"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:898
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:901
 msgid "Bottom"
 msgstr "底部"
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:910
+#: ../java/src/net/i2p/router/web/SummaryHelper.java:913
 msgid "Select a section to add"
 msgstr "选择要添加的部分"
 
@@ -4364,6 +4384,10 @@ msgstr "加密"
 msgid "i2cp"
 msgstr "i2cp"
 
+#: ../java/strings/Strings.java:62
+msgid "I2PTunnel"
+msgstr "I2P隧道"
+
 #: ../java/strings/Strings.java:63
 msgid "InNetPool"
 msgstr "InNetPool"
@@ -4681,7 +4705,7 @@ msgstr "高级网络配置页面"
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:481
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:613
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:539
@@ -4769,13 +4793,13 @@ msgid "Disabled - Clients outside this Java process may not connect"
 msgstr "禁用 - 如果客户端与I2P不运行与同一Java虚拟机中则禁止其连接"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512
-msgid "I2CP Port"
-msgstr "I2CP 端口"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:516
 msgid "I2CP Interface"
 msgstr "I2CP 接口"
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:528
+msgid "I2CP Port"
+msgstr "I2CP 端口"
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532
 msgid "Authorization"
 msgstr "认证"
@@ -4862,13 +4886,14 @@ msgid "Search Engines"
 msgstr "搜索引擎"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488
-msgid "Recommended Eepsites"
-msgstr "推荐的匿名网站"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
+msgid "Hidden Services of Interest"
+msgstr "互联网隐藏服务"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414
-msgid "Local Services"
-msgstr "本地服务"
+msgid "Applications and Configuration"
+msgstr "应用程序和配置"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150
 msgid "config keyring"
@@ -4927,48 +4952,53 @@ msgstr "设置 I2P 记录选项"
 msgid "Log file"
 msgstr "日志文件名称"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:422
+#, java-format
+msgid "Edit {0} to change"
+msgstr "编辑  {0} 以更改"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
 msgid "(the symbol '@' will be replaced during log rotation)"
 msgstr "(日志轮转时符号'@'将被替换)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:428
 msgid "Log record format"
 msgstr "日志记录格式"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
 msgid ""
 "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
 msgstr "( 'd' = 日期, 'c' = 类, 't' = 线程, 'p' = 优先级, 'm' = 消息)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:434
 msgid "Log date format"
 msgstr "日志日期格式"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
 msgid ""
 "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
 "= millisecond)"
 msgstr "('MM' = 月, 'dd' = 天, 'HH' = 小时, 'mm' = 分钟, 'ss' = 秒, 'SSS' = 毫秒)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440
 msgid "Max log file size"
 msgstr "日志最大体积"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:444
 msgid "Default log level"
 msgstr "默认日志等级"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
 msgid ""
 "(DEBUG and INFO are not recommended defaults, as they will drastically slow "
 "down your router)"
 msgstr "(不建议使用 DEBUG 或 INFO 作为默认等级,它们会明显降低你的路由性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:450
 msgid "Log level overrides"
 msgstr "覆盖日志等级"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454
 msgid "New override"
 msgstr "新建参数"
 
@@ -5499,7 +5529,7 @@ msgstr "这通常为7654端口冲突所致,请查看日志确认原因。"
 msgid ""
 "Do you have another I2P instance running? Stop the conflicting program and "
 "restart I2P."
-msgstr "您是否已经运行了另一个I2P实例?请关掉冲突的程序并重启I2P。"
+msgstr "您是否已经运行了另一个 I2P 实例?请关掉冲突的程序然后重启 I2P。"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150
 msgid "config peers"
@@ -5783,7 +5813,7 @@ msgstr "I2P调试有时需要用到线程转储,利用此处的选项可以将
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525
 msgid "Launch browser on router startup?"
-msgstr "路由器启动时运行浏览器?"
+msgstr "路由器启动时启动浏览器?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527
 msgid ""
@@ -5825,7 +5855,7 @@ msgstr "设置 I2P 统计项"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:420
 msgid "Enable full stats?"
-msgstr "启用完整统计?"
+msgstr "启用完整统计?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:427
 msgid "change requires restart to take effect"
@@ -5992,7 +6022,7 @@ msgstr "通过I2P代理获取新闻?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:472
 msgid "Update through the eepProxy?"
-msgstr "通过I2P代理更新?"
+msgstr "通过 I2P 代理更新?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:478
 msgid "eepProxy host"
@@ -6012,7 +6042,7 @@ msgstr "可信公钥"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498
 msgid "Update with unsigned development builds?"
-msgstr "更新包括未签名的开发版?"
+msgstr "更新包括未签名的开发版?"
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502
 msgid "Unsigned Build URL"
@@ -6156,18 +6186,6 @@ msgstr "点击国旗选择语言。点击下面的 '设置语言' 稍候更改
 msgid "Search I2P"
 msgstr "搜索I2P"
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:410
-msgid "Eepsites of Interest"
-msgstr "感兴趣的匿名站点"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164
-msgid "i2p tunnel manager"
-msgstr "I2P 隧道管理器"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337
-msgid "I2P Tunnel Manager"
-msgstr "I2P 隧道管理器"
-
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148
 msgid "Jar File Dump"
 msgstr "Jar 文件转储"
diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
index 40629bf83967f92ea14840f1c16be82e65d6734d..a0d82d777e60a7d81943f58f5a04645b652cbd75 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
@@ -174,8 +174,9 @@ public class SAMStreamSend {
         }
         
         public boolean openConnection() {
+            FileInputStream fin = null;
             try {
-                FileInputStream fin = new FileInputStream(_destFile);
+                fin = new FileInputStream(_destFile);
                 byte dest[] = new byte[1024];
                 int read = DataHelper.read(fin, dest);
 
@@ -200,6 +201,12 @@ public class SAMStreamSend {
             } catch (IOException ioe) {
                 _log.error("Unable to connect", ioe);
                 return false;
+            } finally {
+                if(fin != null) {
+                    try {
+                        fin.close();
+                    } catch(IOException ioe) {}
+                }
             }
         }
         
diff --git a/apps/sam/java/src/net/i2p/sam/package.html b/apps/sam/java/src/net/i2p/sam/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc5bbd3c1fc66c808d7358755df387b82f1b8d65
--- /dev/null
+++ b/apps/sam/java/src/net/i2p/sam/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+The SAM client API.
+</p>
+</body>
+</html>
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 8cec3cad8c36ac15bcfecf39f6b843edf6c7ec33..72f1022335f056b3695f5fa3957d70052ec49005 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -12,6 +12,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
+import net.i2p.client.streaming.I2PSocketException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
@@ -85,7 +86,7 @@ class Connection {
     private long _lifetimeDupMessageReceived;
     
     public static final long MAX_RESEND_DELAY = 45*1000;
-    public static final long MIN_RESEND_DELAY = 2*1000;
+    public static final long MIN_RESEND_DELAY = 750;
 
     /**
      *  Wait up to 5 minutes after disconnection so we can ack/close packets.
@@ -606,7 +607,7 @@ class Connection {
     public void resetReceived() {
         if (!_resetReceived.compareAndSet(false, true))
             return;
-        IOException ioe = new IOException("Reset received");
+        IOException ioe = new I2PSocketException(I2PSocketException.STATUS_CONNECTION_RESET);
         _outputStream.streamErrorOccurred(ioe);
         _inputStream.streamErrorOccurred(ioe);
         _connectionError = "Connection reset";
@@ -978,7 +979,7 @@ class Connection {
     
     public int getLastCongestionSeenAt() { return _lastCongestionSeenAt; }
 
-    void congestionOccurred() {
+    private void congestionOccurred() {
         // if we hit congestion and e.g. 5 packets are resent,
         // dont set the size to (winSize >> 4).  only set the
         if (_ackSinceCongestion.compareAndSet(true,false)) {
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
index b14447f91d23468fafeb4403e43c1b7e302cfb93..03486cc63cb38eea3bea5cf10a70ae386d3191c0 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
@@ -47,9 +47,9 @@ class ConnectionHandler {
     
     public synchronized void setActive(boolean active) { 
         // FIXME active=false this only kills for one thread in accept()
-        // if they are more, they won't ket a poison packet.
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("setActive(" + active + ") called");
+        // if there are more, they won't get a poison packet.
+        if (_log.shouldLog(Log.WARN))
+            _log.warn("setActive(" + active + ") called, previously " + _active, new Exception("I did it"));
         // if starting, clear any old poison
         // if stopping, the accept() loop will clear any pending sockets
         if (active && !_active)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
index de2eb86e25e4346c46b2218a1d7889b3a3d1b422..8347a974cf15c9625d9c1d2944838cc477749da5 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
@@ -11,6 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PSession;
+import net.i2p.data.ByteArray;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
@@ -58,6 +59,8 @@ class ConnectionManager {
     
     /** @since 0.9.3 */
     public static final String PROP_BLACKLIST = "i2p.streaming.blacklist";
+    private static final long MAX_PING_TIMEOUT = 5*60*1000;
+    private static final int MAX_PONG_PAYLOAD = 32;
 
     /**
      *  Manage all conns for this session
@@ -259,9 +262,12 @@ class ConnectionManager {
                     // Ditto for blacklist / whitelist
                     // This is a tradeoff, because it will keep retransmitting the SYN for a while,
                     // thus more inbound, but let's not spend several KB on the outbound.
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Dropping RST to " + h);
-                    return null;
+                    if (!Boolean.valueOf(_context.getProperty("i2p.streaming.sendResetOnBlock"))) {
+                        // this is the default. Set property to send reset for debugging.
+                        if (_log.shouldLog(Log.INFO))
+                            _log.info("Dropping RST to " + h);
+                        return null;
+                    }
                 }
             }
             PacketLocal reply = new PacketLocal(_context, from);
@@ -328,6 +334,13 @@ class ConnectionManager {
         pong.setReceiveStreamId(ping.getSendStreamId());
         pong.setLocalPort(ping.getLocalPort());
         pong.setRemotePort(ping.getRemotePort());
+        // as of 0.9.18, return the payload
+        ByteArray payload = ping.getPayload();
+        if (payload != null) {
+            if (payload.getValid() > MAX_PONG_PAYLOAD)
+                payload.setValid(MAX_PONG_PAYLOAD);
+            pong.setPayload(payload);
+        }
         _outboundQueue.enqueue(pong);
         return true;
     }
@@ -728,16 +741,13 @@ class ConnectionManager {
         packet.setOptionalFrom(_session.getMyDestination());
         packet.setLocalPort(fromPort);
         packet.setRemotePort(toPort);
-        //if ( (keyToUse != null) && (tagsToSend != null) ) {
-        //    packet.setKeyUsed(keyToUse);
-        //    packet.setTagsSent(tagsToSend);
-        //}
+        if (timeoutMs > MAX_PING_TIMEOUT)
+            timeoutMs = MAX_PING_TIMEOUT;
         if (_log.shouldLog(Log.INFO)) {
             _log.info(String.format("about to ping %s port %d from port %d timeout=%d blocking=%b",
                       peer.calculateHash().toString(), toPort, fromPort, timeoutMs, blocking));
         }
             
-        
         _outboundQueue.enqueue(packet);
         packet.releasePayload();
         
@@ -756,7 +766,63 @@ class ConnectionManager {
         return ok;
     }
 
+    /**
+     *  blocking
+     *
+     *  @param timeoutMs greater than zero
+     *  @param payload non-null, include in packet, up to 32 bytes may be returned in pong
+     *                 not copied, do not modify
+     *  @return the payload received in the pong, zero-length if none, null on failure or timeout
+     *  @since 0.9.18
+     */
+    public byte[] ping(Destination peer, int fromPort, int toPort, long timeoutMs,
+                        byte[] payload) {
+        PingRequest req = new PingRequest(null);
+        long id = assignPingId(req);
+        PacketLocal packet = new PacketLocal(_context, peer);
+        packet.setSendStreamId(id);
+        packet.setFlag(Packet.FLAG_ECHO |
+                       Packet.FLAG_NO_ACK |
+                       Packet.FLAG_SIGNATURE_INCLUDED);
+        packet.setOptionalFrom(_session.getMyDestination());
+        packet.setLocalPort(fromPort);
+        packet.setRemotePort(toPort);
+        packet.setPayload(new ByteArray(payload));
+        if (timeoutMs > MAX_PING_TIMEOUT)
+            timeoutMs = MAX_PING_TIMEOUT;
+        if (_log.shouldLog(Log.INFO)) {
+            _log.info(String.format("about to ping %s port %d from port %d timeout=%d payload=%d",
+                      peer.calculateHash().toString(), toPort, fromPort, timeoutMs, payload.length));
+        }
+        
+        _outboundQueue.enqueue(packet);
+        packet.releasePayload();
+        
+        synchronized (req) {
+            if (!req.pongReceived())
+                try { req.wait(timeoutMs); } catch (InterruptedException ie) {}
+        }
+        _pendingPings.remove(id);
+        
+        boolean ok = req.pongReceived();
+        if (!ok)
+            return null;
+        ByteArray ba = req.getPayload();
+        if (ba == null)
+            return new byte[0];
+        byte[] rv = new byte[ba.getValid()];
+        System.arraycopy(ba, ba.getOffset(), rv, 0, ba.getValid());
+        return rv;
+    }
+
+    /**
+     *  The callback interface for a pong.
+     *  Unused? Not part of the public streaming API.
+     */
     public interface PingNotifier {
+        /**
+         *  @param ok true if pong received; false if timed out
+         */
         public void pingComplete(boolean ok);
     }
     
@@ -783,6 +849,7 @@ class ConnectionManager {
     
     private static class PingRequest {
         private boolean _ponged;
+        private ByteArray _payload;
         private final PingNotifier _notifier;
 
         /** @param notifier may be null */
@@ -790,23 +857,37 @@ class ConnectionManager {
             _notifier = notifier;
         }
 
-        public void pong() { 
+        /**
+         *  @param payload may be null
+         */
+        public void pong(ByteArray payload) { 
             // static, no log
             //_log.debug("Ping successful");
             //_context.sessionKeyManager().tagsDelivered(_peer.getPublicKey(), _packet.getKeyUsed(), _packet.getTagsSent());
             synchronized (this) {
                 _ponged = true; 
+                _payload = payload;
                 notifyAll();
             }
             if (_notifier != null)
                 _notifier.pingComplete(true);
         }
+
         public synchronized boolean pongReceived() { return _ponged; }
+
+        /**
+         *  @return null if no payload or no pong received
+         *  @since 0.9.18
+         */
+        public synchronized ByteArray getPayload() { return _payload; }
     }
     
-    void receivePong(long pingId) {
+    /**
+     *  @param payload may be null
+     */
+    void receivePong(long pingId, ByteArray payload) {
         PingRequest req = _pendingPings.remove(Long.valueOf(pingId));
         if (req != null) 
-            req.pong();
+            req.pong(payload);
     }
 }
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
index fe4c5d0c3f0ac2a650a70d5cfdf71e5237782e49..51e8b5312c4fd65fd44345b815d44117f829f417 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
@@ -264,6 +264,9 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
     /**
      *  Sets max buffer size, connect timeout, read timeout, and write timeout
      *  from properties. Does not set local port or remote port.
+     *
+     *  As of 0.9.19, defaults in opts are honored.
+     *
      *  @param opts may be null
      */
     public ConnectionOptions(Properties opts) {
@@ -388,66 +391,68 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
     
     /**
      *  Note: NOT part of the interface
+     *
+     *  As of 0.9.19, defaults in opts are honored.
      */
     @Override
     public void setProperties(Properties opts) {
         super.setProperties(opts);
         if (opts == null) return;
-        if (opts.containsKey(PROP_MAX_WINDOW_SIZE))
+        if (opts.getProperty(PROP_MAX_WINDOW_SIZE) != null)
             setMaxWindowSize(getInt(opts, PROP_MAX_WINDOW_SIZE, Connection.MAX_WINDOW_SIZE));
-        if (opts.containsKey(PROP_CONNECT_DELAY))
+        if (opts.getProperty(PROP_CONNECT_DELAY) != null)
             setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
-        if (opts.containsKey(PROP_PROFILE))
+        if (opts.getProperty(PROP_PROFILE) != null)
             setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
-        if (opts.containsKey(PROP_MAX_MESSAGE_SIZE))
+        if (opts.getProperty(PROP_MAX_MESSAGE_SIZE) != null)
             setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, Packet.MAX_PAYLOAD_SIZE));
-        if (opts.containsKey(PROP_INITIAL_RECEIVE_WINDOW))
+        if (opts.getProperty(PROP_INITIAL_RECEIVE_WINDOW) != null)
             setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
-        if (opts.containsKey(PROP_INITIAL_RESEND_DELAY))
+        if (opts.getProperty(PROP_INITIAL_RESEND_DELAY) != null)
             setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000));
-        if (opts.containsKey(PROP_INITIAL_ACK_DELAY))
+        if (opts.getProperty(PROP_INITIAL_ACK_DELAY) != null)
             setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, DEFAULT_INITIAL_ACK_DELAY));
-        if (opts.containsKey(PROP_INITIAL_WINDOW_SIZE))
+        if (opts.getProperty(PROP_INITIAL_WINDOW_SIZE) != null)
             setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, INITIAL_WINDOW_SIZE));
-        if (opts.containsKey(PROP_MAX_RESENDS))
+        if (opts.getProperty(PROP_MAX_RESENDS) != null)
             setMaxResends(getInt(opts, PROP_MAX_RESENDS, DEFAULT_MAX_SENDS));
         // handled in super()
-        //if (opts.containsKey(PROP_WRITE_TIMEOUT))
+        //if (opts.getProperty(PROP_WRITE_TIMEOUT))
         //    setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1));
-        if (opts.containsKey(PROP_INACTIVITY_TIMEOUT))
+        if (opts.getProperty(PROP_INACTIVITY_TIMEOUT) != null)
             setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, DEFAULT_INACTIVITY_TIMEOUT));
-        if (opts.containsKey(PROP_INACTIVITY_ACTION))
+        if (opts.getProperty(PROP_INACTIVITY_ACTION) != null)
             setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, DEFAULT_INACTIVITY_ACTION));
         setInboundBufferSize(getMaxMessageSize() * (Connection.MAX_WINDOW_SIZE + 2));
-        if (opts.contains(PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR))
+        if (opts.getProperty(PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR) != null)
             setCongestionAvoidanceGrowthRateFactor(getInt(opts, PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR,
                                                           DEFAULT_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR));
-        if (opts.contains(PROP_SLOW_START_GROWTH_RATE_FACTOR))
+        if (opts.getProperty(PROP_SLOW_START_GROWTH_RATE_FACTOR) != null)
             setSlowStartGrowthRateFactor(getInt(opts, PROP_SLOW_START_GROWTH_RATE_FACTOR,
                                                 DEFAULT_SLOW_START_GROWTH_RATE_FACTOR));
-        if (opts.containsKey(PROP_CONNECT_TIMEOUT))
+        if (opts.getProperty(PROP_CONNECT_TIMEOUT) != null)
             // overrides default in super()
             setConnectTimeout(getInt(opts, PROP_CONNECT_TIMEOUT, Connection.DEFAULT_CONNECT_TIMEOUT));
-        if (opts.containsKey(PROP_ANSWER_PINGS))
+        if (opts.getProperty(PROP_ANSWER_PINGS) != null)
             setAnswerPings(getBool(opts, PROP_ANSWER_PINGS, DEFAULT_ANSWER_PINGS));
-        if (opts.containsKey(PROP_ENFORCE_PROTO))
+        if (opts.getProperty(PROP_ENFORCE_PROTO) != null)
             setEnforceProtocol(getBool(opts, PROP_ENFORCE_PROTO, DEFAULT_ENFORCE_PROTO));
-        if (opts.containsKey(PROP_DISABLE_REJ_LOG))
+        if (opts.getProperty(PROP_DISABLE_REJ_LOG) != null)
             setDisableRejectLogging(getBool(opts, PROP_DISABLE_REJ_LOG, false));
         initLists(opts);
-        if (opts.containsKey(PROP_MAX_CONNS_MIN))
+        if (opts.getProperty(PROP_MAX_CONNS_MIN) != null)
             _maxConnsPerMinute = getInt(opts, PROP_MAX_CONNS_MIN, 0);
-        if (opts.containsKey(PROP_MAX_CONNS_HOUR))
+        if (opts.getProperty(PROP_MAX_CONNS_HOUR) != null)
             _maxConnsPerHour = getInt(opts, PROP_MAX_CONNS_HOUR, 0);
-        if (opts.containsKey(PROP_MAX_CONNS_DAY))
+        if (opts.getProperty(PROP_MAX_CONNS_DAY) != null)
             _maxConnsPerDay = getInt(opts, PROP_MAX_CONNS_DAY, 0);
-        if (opts.containsKey(PROP_MAX_TOTAL_CONNS_MIN))
+        if (opts.getProperty(PROP_MAX_TOTAL_CONNS_MIN) != null)
             _maxTotalConnsPerMinute = getInt(opts, PROP_MAX_TOTAL_CONNS_MIN, 0);
-        if (opts.containsKey(PROP_MAX_TOTAL_CONNS_HOUR))
+        if (opts.getProperty(PROP_MAX_TOTAL_CONNS_HOUR) != null)
             _maxTotalConnsPerHour = getInt(opts, PROP_MAX_TOTAL_CONNS_HOUR, 0);
-        if (opts.containsKey(PROP_MAX_TOTAL_CONNS_DAY))
+        if (opts.getProperty(PROP_MAX_TOTAL_CONNS_DAY) != null)
             _maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0);
-        if (opts.containsKey(PROP_MAX_STREAMS))
+        if (opts.getProperty(PROP_MAX_STREAMS) != null)
             _maxConns = getInt(opts, PROP_MAX_STREAMS, 0);
         
         _rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO);
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 6d948141a37be588f3a6d30de01a2ef6295f029d..630b1f0b6a4d668ee8cbcb0d03fe51c26dc8dca6 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -102,6 +102,9 @@ public class I2PSocketManagerFull implements I2PSocketManager {
 
     /**
      *  Create a modified copy of the current options, to be used in a setDefaultOptions() call.
+     *
+     *  As of 0.9.19, defaults in opts are honored.
+     *
      *  @param opts The new options, may be null
      */
     public I2PSocketOptions buildOptions(Properties opts) {
@@ -178,6 +181,30 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         return _connectionManager.ping(peer, localPort, remotePort, timeoutMs);
     }
 
+    /**
+     * Ping the specified peer, returning true if they replied to the ping within 
+     * the timeout specified, false otherwise.  This call blocks.
+     *
+     * Uses the ports specified.
+     *
+     * @param peer Destination to ping
+     * @param localPort 0 - 65535
+     * @param remotePort 0 - 65535
+     * @param timeoutMs timeout in ms, greater than zero
+     * @param payload to include in the ping
+     * @return the payload received in the pong, zero-length if none, null on failure or timeout
+     * @throws IllegalArgumentException
+     * @since 0.9.18
+     */
+    public byte[] ping(Destination peer, int localPort, int remotePort, long timeoutMs, byte[] payload) {
+        if (localPort < 0 || localPort > 65535 ||
+            remotePort < 0 || remotePort > 65535)
+            throw new IllegalArgumentException("bad port");
+        if (timeoutMs <= 0)
+            throw new IllegalArgumentException("bad timeout");
+        return _connectionManager.ping(peer, localPort, remotePort, timeoutMs, payload);
+    }
+
     /**
      * How long should we wait for the client to .accept() a socket before
      * sending back a NACK/Close?  
@@ -192,6 +219,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
      *  Parameters in the I2PSocketOptions interface may be changed directly
      *  with the setters; no need to use this method for those.
      *  This does NOT update the underlying I2CP or tunnel options; use getSession().updateOptions() for that.
+     *
      *  @param options as created from a call to buildOptions(properties), non-null
      */
     public void setDefaultOptions(I2PSocketOptions options) {
@@ -394,7 +422,14 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         return rv;
     }
 
+    /**
+     *  For logging / diagnostics only
+     */
     public String getName() { return _name; }
+
+    /**
+     *  For logging / diagnostics only
+     */
     public void setName(String name) { _name = name; }
     
     
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java
index 0c077cccd97737e7315f669c9d370b299df641ca..5516451a052444a98a2cd194fd9097152327fdf1 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketOptionsImpl.java
@@ -47,6 +47,9 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
     /**
      *  Sets max buffer size, connect timeout, read timeout, and write timeout
      *  from properties. Does not set local port or remote port.
+     *
+     *  As of 0.9.19, defaults in opts are honored.
+     *
      *  @param opts may be null
      */
     public I2PSocketOptionsImpl(Properties opts) {
@@ -56,17 +59,20 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
     /**
      *  Sets max buffer size, connect timeout, read timeout, and write timeout
      *  from properties. Does not set local port or remote port.
+     *
+     *  As of 0.9.19, defaults in opts are honored.
+     *
      *  @param opts may be null
      */
     public void setProperties(Properties opts) {
         if (opts == null) return;
-        if (opts.containsKey(PROP_BUFFER_SIZE))
+        if (opts.getProperty(PROP_BUFFER_SIZE) != null)
             _maxBufferSize = getInt(opts, PROP_BUFFER_SIZE, DEFAULT_BUFFER_SIZE);
-        if (opts.containsKey(PROP_CONNECT_TIMEOUT))
+        if (opts.getProperty(PROP_CONNECT_TIMEOUT) != null)
             _connectTimeout = getInt(opts, PROP_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);
-        if (opts.containsKey(PROP_READ_TIMEOUT))
+        if (opts.getProperty(PROP_READ_TIMEOUT) != null)
             _readTimeout = getInt(opts, PROP_READ_TIMEOUT, -1);
-        if (opts.containsKey(PROP_WRITE_TIMEOUT))
+        if (opts.getProperty(PROP_WRITE_TIMEOUT) != null)
             _writeTimeout = getInt(opts, PROP_WRITE_TIMEOUT, DEFAULT_WRITE_TIMEOUT);
     }
     
@@ -95,6 +101,9 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
         }
     }
     
+    /**
+     *  Not part of the API, not for external use.
+     */
     public static double getDouble(Properties opts, String name, double defaultVal) {
         if (opts == null) return defaultVal;
         String val = opts.getProperty(name);
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
index 681c77b7f78c4ccd849796e1f139ed46b51337a3..c675812a6ee36e554b16a5f05b2c68062705c480 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
@@ -50,7 +50,7 @@ class MessageOutputStream extends OutputStream {
      *  Since this is less than i2ptunnel's i2p.streaming.connectDelay default of 1000,
      *  we only wait 250 at the start. Guess that's ok, 1000 is too long anyway.
      */
-    private static final int DEFAULT_PASSIVE_FLUSH_DELAY = 250;
+    private static final int DEFAULT_PASSIVE_FLUSH_DELAY = 175;
 
 /****
     public MessageOutputStream(I2PAppContext ctx, DataReceiver receiver) {
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
index b2983114fb94156f362c9aa9196f1b3fd9c8500f..af1a0839f6671d3074e2b796fcda9e43461a45ee 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
@@ -361,7 +361,7 @@ class PacketHandler {
     }
     
     private void receivePong(Packet packet) {
-        _manager.receivePong(packet.getReceiveStreamId());
+        _manager.receivePong(packet.getReceiveStreamId(), packet.getPayload());
     }
     
     private static final boolean isValidMatch(long conStreamId, long packetStreamId) {
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
index 13b93ce7c1d25c0db017212bbc07350e1bb1daaa..754ebf28a5ef970288fd89142aa584a820f336a0 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
@@ -232,7 +232,7 @@ public class PcapWriter {
         // wireshark wants the seq # in a SYN packet to be one less than the first data packet,
         // so let's set it to 0. ???????????
         if (pkt.isFlagSet(Packet.FLAG_SYNCHRONIZE))
-            seq = 0xffffffff;
+            seq = 0xffffffffL;
         else
             seq = pkt.getSequenceNum();
         DataHelper.writeLong(_fos, 4, seq);
diff --git a/apps/susidns/locale/messages_fr.po b/apps/susidns/locale/messages_fr.po
index 74f83a8a12b6afbb53958c73ab1c8de794bdc9d8..7161f8adcb0c980ea36c012cbf2253eadf21652a 100644
--- a/apps/susidns/locale/messages_fr.po
+++ b/apps/susidns/locale/messages_fr.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-18 16:04+0000\n"
+"PO-Revision-Date: 2014-11-26 22:11+0000\n"
 "Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -499,7 +499,7 @@ msgstr "Options"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:176
 msgid "File containing the list of subscriptions URLs (no need to change)"
-msgstr "fichier contenant la liste des URLs de souscriptions (inutile de modifier)"
+msgstr "Fichier contenant la liste des URLs de souscription (inutile de le modifier)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:178
 msgid "Update interval in hours"
@@ -517,29 +517,29 @@ msgstr "Votre hosts.txt (ne pas modifier)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:184
 msgid "Your personal addressbook, these hosts will be published"
-msgstr "Votre carnet d'adresses personnel: ces hôtes peuvent être publiés"
+msgstr "Votre carnet d'adresses personnel, ces hôtes seront publiés"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:186
 msgid "Your private addressbook, it is never published"
-msgstr "Votre carnet d'adresses privé n'est jamais publié"
+msgstr "Votre carnet d'adresses privé, il n'est jamais publié"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:188
 msgid "Port for your eepProxy (no need to change)"
-msgstr "Port de votre proxy eep (inutile de modifier)"
+msgstr "Port de votre proxy eep (inutile de le modifier)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190
 msgid "Hostname for your eepProxy (no need to change)"
-msgstr "nom d'hôte de votre proxy eep (inutile de modifier)"
+msgstr "Nom d'hôte de votre proxy eep (inutile de le modifier)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:192
 msgid "Whether to update the published addressbook"
-msgstr "S'il faut actualiser le carnet d'adresses publié"
+msgstr "Faut-il actualiser le carnet d'adresses publié"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:194
 msgid ""
 "File containing the etags header from the fetched subscription URLs (no need"
 " to change)"
-msgstr "Fichier contenant les en-têtes etag des URLs de souscription (inutile de changer)"
+msgstr "Fichier contenant les en-têtes \"etag\" issues des URLs de souscription (inutile de le changer)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:196
 msgid ""
@@ -549,11 +549,11 @@ msgstr "Fichier contenant les tampons horaires de modification de chaque URL de
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:198
 msgid "File to log activity to (change to /dev/null if you like)"
-msgstr "Fichier d'historiques (modifiez en /dev/null si ça vous chante) "
+msgstr "Fichier d'historique (modifiez-le en /dev/null si cela vous chante)"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200
 msgid "Name of the theme to use (defaults to 'light')"
-msgstr "Nom du thème à utiliser ('light' par défaut)"
+msgstr "Nom du thème à utiliser (par défaut c'est 'light')"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112
 msgid "addressbook"
diff --git a/apps/susidns/locale/messages_ja.po b/apps/susidns/locale/messages_ja.po
index d930af1a466f323e9be8f361b092d20fb9a1da33..65d16172f6d9109fa65ddb65a4eb02bff8e89d50 100644
--- a/apps/susidns/locale/messages_ja.po
+++ b/apps/susidns/locale/messages_ja.po
@@ -5,13 +5,14 @@
 # 
 # Translators:
 # タカハシ <gomidori@live.jp>, 2013-2014
+# rafe <rafe.kun@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:07+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"PO-Revision-Date: 2015-01-14 15:57+0000\n"
+"Last-Translator: rafe <rafe.kun@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +68,7 @@ msgstr "署名済み"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:233
 msgid "Key"
-msgstr ""
+msgstr "鍵"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:235
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260
@@ -621,7 +622,7 @@ msgstr "定期的に配布されているソース、あるいは「購読」か
 #, java-format
 msgid ""
 "In the default configuration, the address book is only subscribed to {0}."
-msgstr ""
+msgstr "初期設定では、アドレスブックは{0}に設定されています。"
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145
 msgid ""
@@ -698,7 +699,7 @@ msgstr "これらのURL は公開されている hosts.txt ファイルを参照
 msgid ""
 "The default subscription is the hosts.txt from {0}, which is updated "
 "infrequently."
-msgstr ""
+msgstr "初期購読には{0}と設定されているhosts.txtしか存在しません。加えてこの状態ではアップデートはほとんど行われません。"
 
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161
 msgid ""
diff --git a/apps/susidns/locale/messages_nl.po b/apps/susidns/locale/messages_nl.po
index fcf3e42c7ed7d059427945a79b3c0f547c4b0e1a..9af2fa2897b86149209a28bc693bd06b4aa68ab0 100644
--- a/apps/susidns/locale/messages_nl.po
+++ b/apps/susidns/locale/messages_nl.po
@@ -6,13 +6,14 @@
 # Translators:
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
+# Nathan Follens, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-09-17 22:07+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"PO-Revision-Date: 2015-01-18 16:18+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,92 +24,92 @@ msgstr ""
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:131
 #, java-format
 msgid "Host name \"{0}\" contains illegal character {1}"
-msgstr ""
+msgstr "Hostnaam \"{0}\" bevat illegaal karakter {1}"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:144
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:146
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:153
 #, java-format
 msgid "Host name cannot start with \"{0}\""
-msgstr ""
+msgstr "Hostnaam kan niet beginnen met \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:148
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:150
 #, java-format
 msgid "Host name cannot end with \"{0}\""
-msgstr ""
+msgstr "Hostnaam kan niet eindigen op \"{0}\""
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:155
 #, java-format
 msgid "Host name cannot contain \"{0}\""
-msgstr ""
+msgstr "Hostnaam kan \"{0}\" niet bevatten"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:158
 #, java-format
 msgid ""
 "Host name \"{0}\" requires conversion to ASCII but the conversion library is"
 " unavailable in this JVM"
-msgstr ""
+msgstr "Hostnaam \"{0}\" vereist conversie naar ASCII, maar de conversiebibliotheek is niet beschikbaar in deze JVM"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:219
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:227
 msgid "Hashcash"
-msgstr ""
+msgstr "Hashcash"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:229
 msgid "Hidden"
-msgstr ""
+msgstr "Verborgen"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:231
 msgid "Signed"
-msgstr ""
+msgstr "Ondertekend"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:233
 msgid "Key"
-msgstr ""
+msgstr "Sleutel"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:235
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260
 #, java-format
 msgid "Type {0}"
-msgstr ""
+msgstr "Type {0}"
 
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:247
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:254
 #: ../src/java/src/i2p/susi/dns/AddressBean.java:257
 msgid "DSA 1024 bit"
-msgstr ""
+msgstr "DSA 1024-bits"
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:188
 #, java-format
 msgid "One result for search within filtered list."
 msgid_plural "{0} results for search within filtered list."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Een resultaat voor zoekopdracht binnen gefilterde lijst."
+msgstr[1] "{0} resultaten voor zoekopdracht binnen gefilterde lijst."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:192
 #, java-format
 msgid "Filtered list contains 1 entry."
 msgid_plural "Filtered list contains {0} entries."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gefilterde lijst bevat 1 item."
+msgstr[1] "Gefilterde lijst bevat {0} items."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:197
 #, java-format
 msgid "One result for search."
 msgid_plural "{0} results for search."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Een resultaat voor zoekopdracht."
+msgstr[1] "{0} resultaten voor zoekopdracht."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206
 #, java-format
 msgid "Address book contains 1 entry."
 msgid_plural "Address book contains {0} entries."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Adresboek bevat 1 item."
+msgstr[1] "Adresboek bevat {0} items."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222
 #, java-format
@@ -133,7 +134,7 @@ msgstr "Vervang"
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239
 #, java-format
 msgid "Host name {0} is already in address book, unchanged."
-msgstr ""
+msgstr "Hostnaam {0} is al in het adresboek, ongewijzigd."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:241
@@ -141,7 +142,7 @@ msgstr ""
 msgid ""
 "Host name {0} is already in address book with a different destination. Click"
 " \"Replace\" to overwrite."
-msgstr ""
+msgstr "Hostnaam {0} is al in het adresboek met een andere bestemming. Klik op \"Vervangen\" om te overschrijven."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:254
@@ -158,7 +159,7 @@ msgstr "Destination gewijzigd voor {0}."
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:258
 msgid "Warning - host name does not end with \".i2p\""
-msgstr ""
+msgstr "Waarschuwing - hostnaam eindigt niet op \".i2p\""
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:266
@@ -169,7 +170,7 @@ msgstr "Ongeldige Base 64 destination."
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:272
 #, java-format
 msgid "Invalid host name \"{0}\"."
-msgstr ""
+msgstr "Ongeldige hostnaam \"{0}\"."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:275
@@ -183,7 +184,7 @@ msgstr "Voer een host naam en destination in"
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:304
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:270
 msgid "Delete Entry"
-msgstr ""
+msgstr "Item verwijderen"
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:279
@@ -204,18 +205,18 @@ msgstr "Destination {0} verwijderd."
 #, java-format
 msgid "1 destination deleted."
 msgid_plural "{0} destinations deleted."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 bestemming verwijderd."
+msgstr[1] "{0} bestemmingen verwijderd."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:301
 msgid "No entries selected to delete."
-msgstr ""
+msgstr "Geen items geselecteerd om te verwijderen."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:308
 msgid "Address book saved."
-msgstr ""
+msgstr "Adresboek opgeslagen."
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321
 msgid "ERROR: Could not write addressbook file."
@@ -237,7 +238,7 @@ msgstr "Ongeldig formulier verzonden, waarschijnlijk omdat je de \"terug\" or \"
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
-msgstr ""
+msgstr "Als het probleem zich blijft voordoen, controleer dan dat je cookies in je browser hebt aangezet."
 
 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99
 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:126
@@ -264,21 +265,21 @@ msgstr "Configuratie herladen."
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:101
 #, java-format
 msgid "{0} address book in {1} database"
-msgstr ""
+msgstr "{0} adresboek in {1} database"
 
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:249
 msgid "Manually added via SusiDNS"
-msgstr ""
+msgstr "Handmatig toegevoegd via SusiDNS"
 
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:263
 #, java-format
 msgid "Failed to add Destination for {0} to naming service {1}"
-msgstr ""
+msgstr "Toevoegen van Bestemming voor {0} naar naamdienst {1} mislukt"
 
 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:287
 #, java-format
 msgid "Failed to delete Destination for {0} from naming service {1}"
-msgstr ""
+msgstr "Verwijderen van Bestemming voor {0} van naamdienst {1} mislukt"
 
 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138
 msgid ""
@@ -295,7 +296,7 @@ msgstr "Subscriptions herladen."
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:127
 msgid "address book"
-msgstr ""
+msgstr "adresboek"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:133
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149
@@ -307,7 +308,7 @@ msgstr ""
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:139
 msgid "Overview"
-msgstr ""
+msgstr "Overzicht"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:134
@@ -315,7 +316,7 @@ msgstr ""
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:121
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125
 msgid "Address books"
-msgstr ""
+msgstr "Adresboeken"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:137
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136
@@ -355,7 +356,7 @@ msgstr "gepubliceerd"
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:131
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:135
 msgid "Subscriptions"
-msgstr ""
+msgstr "Abonnementen"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146
@@ -363,17 +364,17 @@ msgstr ""
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:137
 msgid "Configuration"
-msgstr ""
+msgstr "Configuratie"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:136
 msgid "Address book"
-msgstr ""
+msgstr "Adresboek"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:156
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141
 msgid "Storage"
-msgstr ""
+msgstr "Opslag"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:174
 msgid "Filter"
@@ -381,7 +382,7 @@ msgstr "Filter"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:177
 msgid "other"
-msgstr ""
+msgstr "andere"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:179
 msgid "all"
@@ -406,7 +407,7 @@ msgstr "Naam"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:250
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:252
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:404
@@ -420,15 +421,15 @@ msgstr "Markeer voor verwijdering"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:307
 msgid "Base 32 address"
-msgstr ""
+msgstr "Base-32 adres"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:311
 msgid "More information on this entry"
-msgstr ""
+msgstr "Meer informatie over dit item"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:314
 msgid "details"
-msgstr ""
+msgstr "details"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408
@@ -437,7 +438,7 @@ msgstr "Annuleer"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:383
 msgid "This address book is empty."
-msgstr ""
+msgstr "Dit adresboek is leeg."
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:398
 msgid "Add new destination"
@@ -446,7 +447,7 @@ msgstr "Nieuwe destination toevoegen"
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:400
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:168
 msgid "Host Name"
-msgstr ""
+msgstr "Hostnaam"
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:126
 msgid "configuration"
@@ -547,7 +548,7 @@ msgstr "Bestand om activiteit naar te loggen (wijzig naar /dev/null indien gewen
 
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200
 msgid "Name of the theme to use (defaults to 'light')"
-msgstr ""
+msgstr "Naam van het te gebruiken thema (standaard: 'light')"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112
 msgid "addressbook"
@@ -555,55 +556,55 @@ msgstr "adresboek"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:182
 msgid "Encoded Name"
-msgstr ""
+msgstr "Gecodeerde naam"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:196
 msgid "Base 32 Address"
-msgstr ""
+msgstr "Base-32 adres"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:204
 msgid "Base 64 Hash"
-msgstr ""
+msgstr "Base-64 hash"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:210
 msgid "Address Helper"
-msgstr ""
+msgstr "Adreshelper"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:216
 msgid "link"
-msgstr ""
+msgstr "link"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:220
 msgid "Public Key"
-msgstr ""
+msgstr "Publieke sleutel"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:222
 msgid "ElGamal 2048 bit"
-msgstr ""
+msgstr "ElGamal 2048-bits"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:226
 msgid "Signing Key"
-msgstr ""
+msgstr "Ondertekeningssleutel"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:232
 msgid "Certificate"
-msgstr ""
+msgstr "Certificaat"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:238
 msgid "Added Date"
-msgstr ""
+msgstr "Datum toegevoegd"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:244
 msgid "Source"
-msgstr ""
+msgstr "Bron"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:250
 msgid "Last Modified"
-msgstr ""
+msgstr "Laatst gewijzigd"
 
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:256
 msgid "Notes"
-msgstr ""
+msgstr "Opmerkingen"
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115
 msgid "Introduction"
@@ -615,7 +616,7 @@ msgstr "Wat is het adresboek?"
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:139
 msgid "The addressbook application is part of your I2P installation."
-msgstr ""
+msgstr "De adresboek-applicatie is een onderdeel van je I2P-installatie."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:141
 msgid ""
@@ -627,60 +628,60 @@ msgstr "Het update je hosts.txt bestand regelmatig vanaf gedistribueerde bronnen
 #, java-format
 msgid ""
 "In the default configuration, the address book is only subscribed to {0}."
-msgstr ""
+msgstr "In de standaardconfiguratie is het adresboek enkel geabonneerd op {0}."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145
 msgid ""
 "Subscribing to additional sites is easy, just add them to your <a "
 "href=\"subscriptions\">subscriptions</a> file."
-msgstr ""
+msgstr "Abonneren op andere sites is makkelijk, je hoeft ze gewoon toe te voegen aan je <a href=\"subscriptions\">subscriptions</a>-bestand."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:147
 msgid ""
 "For more information on naming in I2P, see <a href=\"http://i2p-"
 "projekt.i2p/naming.html\" target=\"_top\">the overview</a>."
-msgstr ""
+msgstr "Voor meer informatie over namen in I2P, zie <a href=\"http://i2p-projekt.i2p/naming.html\" target=\"_top\">het overzicht</a>."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149
 msgid "How does the addressbook application work?"
-msgstr ""
+msgstr "Hoe werkt de adresboek-applicatie?"
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:151
 msgid ""
 "The addressbook application regularly polls your subscriptions and merges "
 "their content into your \"router\" address book."
-msgstr ""
+msgstr "De adresboek-applicatie polst je abonnementen regelmatig en voegt hun inhoud bij je \"router\"-adresboek."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:153
 msgid ""
 "Then it merges your \"master\" address book into the router address book as "
 "well."
-msgstr ""
+msgstr "Daarna voegt het ook je \"master\"-adresboek bij je router-adresboek."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:155
 msgid ""
 "If configured, the router address book is now written to the \"published\" "
 "address book, which will be publicly available if you are running an "
 "eepsite."
-msgstr ""
+msgstr "Indien ingesteld wordt het router-adresboek nu geschreven naar het \"uitgegeven\" adresboek, dat publiek beschikbaar is als je een eepsite hebt."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:157
 msgid ""
 "The router also uses a private address book (not shown in the picture), "
 "which is not merged or published."
-msgstr ""
+msgstr "De router gebruikt ook een privé adresboek (niet weergegeven in de afbeelding) dat niet wordt samengevoegd of uitgegeven."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:159
 msgid ""
 "Hosts in the private address book can be accessed by you but their addresses"
 " are never distributed to others."
-msgstr ""
+msgstr "Hosts in het privé adresboek kunnen door jou benaderd worden, maar hun adressen worden nooit gedistribueerd naar anderen."
 
 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:161
 msgid ""
 "The private address book can also be used for aliases of hosts in your other"
 " address books."
-msgstr ""
+msgstr "Het privé adresboek kan ook gebruikt worden voor aliassen van hosts in je andere adresboeken."
 
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:117
 msgid "subscriptions"
@@ -704,7 +705,7 @@ msgstr "Deze URLs verwijzen naar gepubliceerde hosts.txt bestanden."
 msgid ""
 "The default subscription is the hosts.txt from {0}, which is updated "
 "infrequently."
-msgstr ""
+msgstr "Het standaardabonnement is hosts.txt van {0}, dat zelden bijgewerkt wordt."
 
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161
 msgid ""
diff --git a/apps/susidns/locale/messages_uk.po b/apps/susidns/locale/messages_uk.po
index 06f4ad58e22f773032fc2c6d08238febd6b4c0d5..dfafafd509ea928ae23cf8986ce5a10d7c7da5b7 100644
--- a/apps/susidns/locale/messages_uk.po
+++ b/apps/susidns/locale/messages_uk.po
@@ -5,16 +5,20 @@
 # 
 # Translators:
 # 007 <Andrik007d@rambler.ru>, 2014
+# 007 <Andrik007d@rambler.ru>, 2014
+# Denis Blank <gribua@gmail.com>, 2011-2012
 # Denis Blank <gribua@gmail.com>, 2011
 # Denis Blank <gribua@gmail.com>, 2011
+# LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 # Denis Blank <gribua@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 18:27+0000\n"
-"PO-Revision-Date: 2014-08-12 23:08+0000\n"
-"Last-Translator: 007 <Andrik007d@rambler.ru>\n"
+"POT-Creation-Date: 2014-09-17 21:49+0000\n"
+"PO-Revision-Date: 2014-12-25 14:03+0000\n"
+"Last-Translator: madjong <madjong@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,58 +26,69 @@ msgstr ""
 "Language: uk_UA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:130
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:131
 #, java-format
 msgid "Host name \"{0}\" contains illegal character {1}"
 msgstr "Назва хоста \"{0}\" містить недопустимий символ {1}"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:143
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:145
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:152
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:144
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:146
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:153
 #, java-format
 msgid "Host name cannot start with \"{0}\""
 msgstr "Назва хоста не може починатись з \"{0}\""
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:147
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:149
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:148
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:150
 #, java-format
 msgid "Host name cannot end with \"{0}\""
 msgstr "Назва хоста не може закінчуватись на \"{0}\""
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:154
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:155
 #, java-format
 msgid "Host name cannot contain \"{0}\""
 msgstr "Назва хоста не може містити \"{0}\""
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:157
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:158
 #, java-format
 msgid ""
 "Host name \"{0}\" requires conversion to ASCII but the conversion library is"
 " unavailable in this JVM"
 msgstr "Назва хосту  \"{0}\" потребує коверсію у ASCII але конверсаційна бібліотека недоступна у цьому JVM"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:218
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:219
 msgid "None"
-msgstr "Нема"
+msgstr "Немає"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:226
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:227
 msgid "Hashcash"
 msgstr "Hashcash"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:228
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:229
 msgid "Hidden"
 msgstr "Прихований"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:230
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:231
 msgid "Signed"
 msgstr "Залогінений"
 
-#: ../src/java/src/i2p/susi/dns/AddressBean.java:232
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:233
+msgid "Key"
+msgstr "Ключ"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:235
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:260
 #, java-format
 msgid "Type {0}"
 msgstr "Тип {0}"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:201
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:247
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:254
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:257
+msgid "DSA 1024 bit"
+msgstr "DSA 1024 біт"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:188
 #, java-format
 msgid "One result for search within filtered list."
 msgid_plural "{0} results for search within filtered list."
@@ -81,23 +96,23 @@ msgstr[0] "{0} результат для пошуку у відфільтров
 msgstr[1] "{0} результати для пошуку у відфільтрованому списку."
 msgstr[2] "{0} результатів для пошуку у відфільтрованому списку."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:205
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:192
 #, java-format
 msgid "Filtered list contains 1 entry."
 msgid_plural "Filtered list contains {0} entries."
 msgstr[0] "Фільтрований список містить {0} запис."
-msgstr[1] "Фільтрований список містить {0} записа."
+msgstr[1] "Фільтрований список містить {0} записи."
 msgstr[2] "Фільтрований список містить {0} записів."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:210
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:197
 #, java-format
 msgid "One result for search."
 msgid_plural "{0} results for search."
-msgstr[0] "{0} дин результат  пошуку."
-msgstr[1] "{0} результату пошуку."
+msgstr[0] "{0} результат пошуку."
+msgstr[1] "{0} результатів пошуку."
 msgstr[2] "{0} результатів пошуку."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:219
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206
 #, java-format
 msgid "Address book contains 1 entry."
 msgid_plural "Address book contains {0} entries."
@@ -105,97 +120,97 @@ msgstr[0] "Адресна книга містить {0} запис"
 msgstr[1] "Адресна книга містить {0} запису"
 msgstr[2] "Адресна книга містить {0} записів."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:235
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222
 #, java-format
 msgid "Showing {0} of {1}"
 msgstr "Показано {0} з {1}"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:228
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:412
 msgid "Add"
 msgstr "Додати"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:268
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:255
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:228
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:240
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410
 msgid "Replace"
 msgstr "Перемістити"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:267
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:238
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:254
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239
 #, java-format
 msgid "Host name {0} is already in address book, unchanged."
 msgstr "Назва хосту {0} уже є в адресній книзі, не змінено."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:240
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:241
 #, java-format
 msgid ""
 "Host name {0} is already in address book with a different destination. Click"
 " \"Replace\" to overwrite."
 msgstr "Назва хосту {0} уже є в адресній книзі з іншим призначенням. Клікніть \"Замінити\" для перезапису."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:282
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:253
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:254
 #, java-format
 msgid "Destination added for {0}."
 msgstr "Доданий адрес для {0}."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:255
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:271
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:256
 #, java-format
 msgid "Destination changed for {0}."
 msgstr "Змінений адрес для {0}."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:286
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:257
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:258
 msgid "Warning - host name does not end with \".i2p\""
 msgstr "Попередження - назва хосту не закінчується на \".i2p\""
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:265
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:266
 msgid "Invalid Base 64 destination."
 msgstr "Неправильна Base 64 адреса."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:297
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:271
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:272
 #, java-format
 msgid "Invalid host name \"{0}\"."
 msgstr "Неправильна назва хосту \"{0}\"."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:300
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:274
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:275
 msgid "Please enter a host name and destination"
 msgstr "Будь ласка, введіть ім'я хоста і призначення"
 
 #. clear search when deleting
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:325
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:267
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:312
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:279
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:304
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:270
 msgid "Delete Entry"
 msgstr "Видалити запис"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:279
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:351
 msgid "Delete Selected"
-msgstr "Видалити Вибрані"
+msgstr "Видалити вибрані"
 
 #. parameter is a host name
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:295
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:296
 #, java-format
 msgid "Destination {0} deleted."
-msgstr "Призначення {0} видалено.Піл"
+msgstr "Призначення {0} видалено."
 
 #. parameter will always be >= 2
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:298
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:308
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:299
 #, java-format
 msgid "1 destination deleted."
 msgid_plural "{0} destinations deleted."
@@ -203,514 +218,511 @@ msgstr[0] "{0} призначення видалено."
 msgstr[1] "{0}  призначення видалено."
 msgstr[2] "{0} призначень видалено."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:323
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:300
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:301
 msgid "No entries selected to delete."
 msgstr "Не виділено записів для видалення"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:331
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:308
 msgid "Address book saved."
 msgstr "Адресна книга збережена"
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:334
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321
 msgid "ERROR: Could not write addressbook file."
 msgstr "ПОМИЛКА: Не вдалось зберегти файл адресної книги."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:339
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:139
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:141
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:108
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:312
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151
 msgid ""
 "Invalid form submission, probably because you used the \"back\" or "
 "\"reload\" button on your browser. Please resubmit."
 msgstr "Форма не прийнята, скоріше всього це відбулося через те, що Ви натискали кнопку \"Назад\" або \"Оновити\" в браузері. Будь-ласка заповніть форму знову."
 
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:341
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:141
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:110
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:314
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr "Якщо проблема не усунена, то перевірте, чи у вашому браузері увімкнено куки (cookies)."
 
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:130
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:116
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:99
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:126
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:132
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:101
 msgid "Configuration saved."
-msgstr "Настройки збережені."
+msgstr "Налаштування збережені."
 
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:133
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:135
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:102
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149
 msgid "Reload"
 msgstr "Перезавантажити"
 
-#: ../src/java/src/i2p/susi/dns/ConfigBean.java:135
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:104
 msgid "Configuration reloaded."
-msgstr "Настройки перезавантажені."
+msgstr "Налаштування перезавантажені."
 
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:100
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:101
 #, java-format
 msgid "{0} address book in {1} database"
 msgstr "{0} адресна книга у  {1} базі даних"
 
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:248
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:249
 msgid "Manually added via SusiDNS"
 msgstr "Додано вручну через SusiDNS"
 
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:262
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:263
 #, java-format
 msgid "Failed to add Destination for {0} to naming service {1}"
 msgstr "Не вдалося додати адресу призначення для {0} до служби імен {1}"
 
-#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:286
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:287
 #, java-format
 msgid "Failed to delete Destination for {0} from naming service {1}"
 msgstr "Не вдалося видалити адресу призначення для {0} із служби імен {1}"
 
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138
 msgid ""
 "Subscriptions saved, updating addressbook from subscription sources now."
 msgstr "Підписки збережені, запущено завантаження підписок і оновлення адресної книги."
 
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:133
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143
 msgid "Subscriptions saved."
 msgstr "Підписки збережені."
 
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:137
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147
 msgid "Subscriptions reloaded."
 msgstr "Підписки перезавантаженні."
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:125
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:127
 msgid "address book"
 msgstr "адресна книга"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:131
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:125
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:141
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:116
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:132
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:130
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:117
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:133
-msgid "Overview"
-msgstr "Перегляд"
-
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:133
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:127
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:132
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:148
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:118
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:116
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:119
-msgid "Address books"
-msgstr "Адресні книги"
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:134
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:135
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:139
+msgid "Overview"
+msgstr "Перегляд"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:129
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:134
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:120
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:118
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:121
-msgid "private"
-msgstr "приватна"
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:121
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125
+msgid "Address books"
+msgstr "Адресні книги"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:137
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:122
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:120
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123
-msgid "master"
-msgstr "основна"
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:123
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:127
+msgid "private"
+msgstr "приватна"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:139
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:133
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:138
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:124
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:122
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125
-msgid "router"
-msgstr "маршрутизатор"
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:125
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:129
+msgid "master"
+msgstr "основна"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:135
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:140
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:126
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:124
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:127
-msgid "published"
-msgstr "публічна"
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:127
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:131
+msgid "router"
+msgstr "маршрутизатор"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:137
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:142
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:128
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:126
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:129
-msgid "Subscriptions"
-msgstr "Підписки"
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:129
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:133
+msgid "published"
+msgstr "опубліковано"
 
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:139
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:144
 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:130
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:128
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:135
+msgid "Subscriptions"
+msgstr "Підписки"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:132
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:137
 msgid "Configuration"
-msgstr "Настройки"
+msgstr "Налаштування"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:134
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:136
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:154
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:139
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:156
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141
 msgid "Storage"
 msgstr "Зберігання"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:172
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:174
 msgid "Filter"
 msgstr "Фільтр"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:175
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:177
 msgid "other"
 msgstr "інше"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:177
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:179
 msgid "all"
 msgstr "всі (без фільтра)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:191
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:193
 msgid "Current filter"
 msgstr "Теперішній фільтр"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:196
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:198
 msgid "clear filter"
 msgstr "очистити фільтр"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:209
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:213
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:211
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:215
 msgid "Search"
 msgstr "Шукати"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:246
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:248
 msgid "Name"
-msgstr "Імя"
+msgstr "Ім'я"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:248
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:250
 msgid "Links"
 msgstr "Посилання"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:250
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:402
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:259
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:252
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:404
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:262
 msgid "Destination"
 msgstr "Адрес призначення"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:286
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:288
 msgid "Mark for deletion"
 msgstr "Позначити для видалення"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:305
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:307
 msgid "Base 32 address"
 msgstr "Base 32 адреса"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:309
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:311
 msgid "More information on this entry"
 msgstr "Більше інформації про цей запис"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:312
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:314
 msgid "details"
 msgstr "деталі"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:347
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:406
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:381
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:383
 msgid "This address book is empty."
 msgstr "Ця адресна книга пуста."
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:398
 msgid "Add new destination"
 msgstr "Додати нову адресу"
 
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:398
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:165
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:400
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:168
 msgid "Host Name"
 msgstr "Адреса хоста"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:119
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:126
 msgid "configuration"
-msgstr "настройки"
+msgstr "налаштування"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:155
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162
 msgid "Hints"
 msgstr "Примітки"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:157
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164
 msgid ""
 "File and directory paths here are relative to the addressbook's working "
 "directory, which is normally ~/.i2p/addressbook/ (Linux) or "
 "%APPDATA%\\I2P\\addressbook\\ (Windows)."
 msgstr "Шляхи вказуються відносно домашньої директорії адресної книги, яка зазвичай розташована в ~/.i2p/addressbook/ (в системі Linux) або в %APPDATA%\\I2P\\addressbook\\ (в системі Windows)."
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:159
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:166
 msgid ""
 "If you want to manually add lines to an addressbook, add them to the private"
 " or master addressbooks."
 msgstr "Якщо ви хочете вручну додавати записи в адресну книгу, то додавайте їх в «приватну» або «основну» книги адрес."
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:168
 msgid ""
 "The router addressbook and the published addressbook are updated by the "
 "addressbook application."
 msgstr "Адресні книги «маршрутизатор» та «публікована» створюються/перезаписуються автоматично."
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:170
 msgid ""
 "When you publish your addressbook, ALL destinations from the master and "
 "router addressbooks appear there."
 msgstr "Коли ви публікуєте свою адресну книгу, то публікуються УСІ записи з адресних книг «основна» та «маршрутизатор»."
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:163
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:172
 msgid ""
 "Use the private addressbook for private destinations, these are not "
 "published."
 msgstr "Використовуйте «приватну» адресну книгу для адрес, які Ви не хочете публікувати."
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:165
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:174
 msgid "Options"
 msgstr "Опції"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:167
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:176
 msgid "File containing the list of subscriptions URLs (no need to change)"
 msgstr "Файл який містить список підписок URLs (не має потреби змінювати)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:169
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:178
 msgid "Update interval in hours"
 msgstr "Період оновлень в годинах"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:171
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:180
 msgid ""
 "Your public hosts.txt file (choose a path within your webserver document "
 "root)"
 msgstr "Ваш публічний hosts.txt файл (виберіть директорію у корені документів вебсерверу)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:173
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:182
 msgid "Your hosts.txt (don't change)"
 msgstr "Ваш hosts.txt (не змінювати)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:175
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:184
 msgid "Your personal addressbook, these hosts will be published"
 msgstr "Ваша персональна адресна книга, ці хости будуть опубліковані"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:177
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:186
 msgid "Your private addressbook, it is never published"
 msgstr "Ваша персональна адресна книга, вона не буде опублікована"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:179
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:188
 msgid "Port for your eepProxy (no need to change)"
 msgstr "Порт для вашого eepProxy (немає необхідності змінювати)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:181
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190
 msgid "Hostname for your eepProxy (no need to change)"
 msgstr "Ім'я хоста для вашого eepProxy (немає необхідності змінювати)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:183
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:192
 msgid "Whether to update the published addressbook"
 msgstr "Чи оновити опубліковану адресну книгу"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:185
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:194
 msgid ""
 "File containing the etags header from the fetched subscription URLs (no need"
 " to change)"
 msgstr "Файл для зберігання etags-заголовків от завантажених URL адрес підписок (немає необхідності вносити зміни)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:187
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:196
 msgid ""
 "File containing the modification timestamp for each fetched subscription URL"
 " (no need to change)"
 msgstr "Файл для зберігання дати/часу модифікації кожної завантаженої URL адреси підписки (немає необхідності вносити зміни)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:189
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:198
 msgid "File to log activity to (change to /dev/null if you like)"
 msgstr "Файл для запису журналу дій (логів)"
 
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200
 msgid "Name of the theme to use (defaults to 'light')"
 msgstr "Назва використовуваної теми (за замовчуванням 'light')"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:110
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112
 msgid "addressbook"
 msgstr "адресна книга"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:179
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:182
 msgid "Encoded Name"
 msgstr "Кодоване ім’я"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:193
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:196
 msgid "Base 32 Address"
 msgstr "Base 32 Адреса"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:201
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:204
 msgid "Base 64 Hash"
 msgstr "Base 64 Hash"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:207
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:210
 msgid "Address Helper"
 msgstr "Address Helper"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:216
 msgid "link"
 msgstr "посилання"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:217
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:220
 msgid "Public Key"
-msgstr "Публічний Ключ"
+msgstr "Публічний ключ"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:219
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:222
 msgid "ElGamal 2048 bit"
 msgstr "2048-бітне шифрування Ель-Гамаля"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:223
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:226
 msgid "Signing Key"
-msgstr "Підписуючий Ключ"
+msgstr "Підписуючий ключ"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:225
-msgid "DSA 1024 bit"
-msgstr "DSA 1024 bit"
-
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:232
 msgid "Certificate"
 msgstr "Сертифікат"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:235
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:238
 msgid "Added Date"
 msgstr "Дата додавання"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:241
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:244
 msgid "Source"
 msgstr "Джерело"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:247
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:250
 msgid "Last Modified"
 msgstr "Останній раз оновлено"
 
-#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:253
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:256
 msgid "Notes"
-msgstr "Записи"
+msgstr "Нотатки"
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:110
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115
 msgid "Introduction"
 msgstr "Введення"
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:132
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137
 msgid "What is the addressbook?"
 msgstr "Що таке адресна книга?"
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:134
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:139
 msgid "The addressbook application is part of your I2P installation."
-msgstr "Адресна книга - це додаток в складі вашої інсталяції I2P."
+msgstr "Адресна книга - це додаток у складі вашої інсталяції I2P."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:135
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:141
 msgid ""
 "It regularly updates your hosts.txt file from distributed sources or "
 "\"subscriptions\"."
 msgstr "Його завдання полягає у регулярному поповненні вашого hosts.txt адресами з налаштованих джерел (\"підписок\")."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:143
+#, java-format
 msgid ""
-"In the default configuration, the address book is only subscribed to "
-"www.i2p2.i2p."
-msgstr "За замовчуванням в адресній книзі є лише одна підписка - на www.i2p2.i2p."
+"In the default configuration, the address book is only subscribed to {0}."
+msgstr "За замовчуванням адресна книга налаштована тільки на {0}."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145
 msgid ""
 "Subscribing to additional sites is easy, just add them to your <a "
 "href=\"subscriptions\">subscriptions</a> file."
 msgstr "Для того, щоб підписатися на додаткові сайти, додайте їх в ваш <a href=\"subscriptions\">файл</a> підписок."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:147
 msgid ""
 "For more information on naming in I2P, see <a href=\"http://i2p-"
 "projekt.i2p/naming.html\" target=\"_top\">the overview</a>."
 msgstr "Більш детальну інформацію про іменування в I2P, див. у <a href=\"http://i2p-projekt.i2p/naming.html\" target=\"_top\">введенні</a>."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149
 msgid "How does the addressbook application work?"
 msgstr "Як працює адресна книга?"
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:144
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:151
 msgid ""
 "The addressbook application regularly polls your subscriptions and merges "
 "their content into your \"router\" address book."
 msgstr "Адресна книга періодично опитує ваші підписки і додає їх зміст у вашу \"маршрутизаторну\" (\"router\") адресну книгу."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:153
 msgid ""
 "Then it merges your \"master\" address book into the router address book as "
 "well."
 msgstr "Тоді вона додає зміст вашої \"основної\" (\"master\") адресної книги."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:146
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:155
 msgid ""
 "If configured, the router address book is now written to the \"published\" "
 "address book, which will be publicly available if you are running an "
 "eepsite."
 msgstr "Якщо публікацію налаштовано, то \"маршрутизаторна\" адресна книга копіюється в \"публіковану\" адресну книгу, яка буде доступна публічно, якщо у вас налаштована робота eep-сайту через вбудований веб-сервер jetty."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:148
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:157
 msgid ""
 "The router also uses a private address book (not shown in the picture), "
 "which is not merged or published."
 msgstr "Маршрутизатор також використовує приватну адресну книгу (не показано на картинці), яка нікуди не копіюється і не публікується."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:159
 msgid ""
 "Hosts in the private address book can be accessed by you but their addresses"
 " are never distributed to others."
-msgstr "Хости в приватній адресній книзі можуть бути доступні вам, але їх адреси ніколи не будуть опубліковані для інших."
+msgstr "Хости у приватній адресній книзі можуть бути доступні вам, але їх адреси ніколи не будуть опубліковані для інших."
 
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:150
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:161
 msgid ""
 "The private address book can also be used for aliases of hosts in your other"
 " address books."
 msgstr "Приватна адресна книга також може бути використана для зберігання альтернативних (alias) та/або коротких адрес."
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:111
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:117
 msgid "subscriptions"
 msgstr "підписки"
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:147
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153
 msgid "The subscription file contains a list of i2p URLs."
 msgstr "Файл підписок містить список i2p URL адрес."
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:148
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:155
 msgid ""
 "The addressbook application regularly checks this list for new eepsites."
 msgstr "Адресна книга періодично перевіряє цей список на наявність нових адрес I2P-сайтів."
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:157
 msgid "Those URLs refer to published hosts.txt files."
-msgstr "Ці URLs указують на опубліковані hosts.txt файли"
+msgstr "Ці URLs вказують на опубліковані hosts.txt файли"
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:150
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:159
+#, java-format
 msgid ""
-"The default subscription is the hosts.txt from www.i2p2.i2p, which is "
-"updated infrequently."
-msgstr "За замовчуванням в списку задане тільки посилання на hosts.txt із www.i2p2.i2p, який оновлюється дуже рідко."
+"The default subscription is the hosts.txt from {0}, which is updated "
+"infrequently."
+msgstr "Підписка за умовчанням - hosts.txt від {0}, який оновлюється рідко."
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161
 msgid ""
 "So it is a good idea to add additional subscriptions to sites that have the "
 "latest addresses."
-msgstr "Тому не завадить додатково підписатися на hosts.txt із частіше оновлюваних сайтів."
+msgstr "Тому не завадить додатково підписатися на hosts.txt із сайтів, що частіше оновлюються."
 
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:163
 msgid "See the FAQ for a list of subscription URLs."
-msgstr "Дивіться FAQ для списку підписок посилань (URL)."
+msgstr "У FAQ ви знайдете список таких адрес URL."
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/package.html b/apps/susidns/src/java/src/i2p/susi/dns/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..065a70ea20bdf8150514032382a83c2d466f128b
--- /dev/null
+++ b/apps/susidns/src/java/src/i2p/susi/dns/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+The SusiDNS webapp, which is the user interface for the addressbook application
+and the local naming service (hosts database) implemented in net.i2p.client.naming.
+This is the webapp named 'addressbook' in the console.
+</p>
+</body>
+</html>
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index c4016a600e78c17461f0191857bd9df4b6acacad..192a90ca393a7a278c2c7688ce38ceb17cf383af 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -24,6 +24,8 @@
             <!-- Depend on classes instead of jars where available -->
             <classpath>
                 <pathelement location="../../core/java/build/obj" />
+                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
             </classpath>
         </depend>
     </target>
@@ -38,6 +40,7 @@
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../core/java/build/i2p.jar" />
             </classpath>
         </javac>
diff --git a/apps/susimail/locale/messages_cs.po b/apps/susimail/locale/messages_cs.po
index 135d26a8acd744ea471818e97afe99bf461c8cfa..a7b3c6b21db6a73a5b14e7b556f5121720f28de7 100644
--- a/apps/susimail/locale/messages_cs.po
+++ b/apps/susimail/locale/messages_cs.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 21:49+0000\n"
-"PO-Revision-Date: 2014-10-09 21:25+0000\n"
-"Last-Translator: A5h8d0wf0x <littleslyfoxie28@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,152 +25,158 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nebyl nalezen žádný enkodér pro kódování \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:323
-#: src/src/i2p/susi/webmail/WebMail.java:337
-#: src/src/i2p/susi/webmail/WebMail.java:989
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Odpovědět:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:327
-#: src/src/i2p/susi/webmail/WebMail.java:341
-#: src/src/i2p/susi/webmail/WebMail.java:1027
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Přeposlat:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:578
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/src/i2p/susi/webmail/WebMail.java:599
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Upozornění: nebyla nalezena žádná znaková sada, použiji US-ASCII"
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Znaková sada \\''{0}\\'' není podporována."
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Část ({0}) nemohla být zobrazena, protože {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:653
-#: src/src/i2p/susi/webmail/WebMail.java:656
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Stáhnou přílohu {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:657
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Soubor je z bezpečnostních důvodů zazipován."
 
-#: src/src/i2p/susi/webmail/WebMail.java:662
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Příloha ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:713
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "K autentizaci je nutno zadat uživatelské jméno (username)."
 
-#: src/src/i2p/susi/webmail/WebMail.java:717
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "K autentizaci je nutno zadat uživatelské jméno (password)."
 
-#: src/src/i2p/susi/webmail/WebMail.java:721
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Pro připojení je nutno zadat jméno hosta (hostname)."
 
-#: src/src/i2p/susi/webmail/WebMail.java:726
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Zadejte číslo portu pro POP3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Číslo portu pro POP3 musí být v rozmezí 0 až 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:739
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Číslo POP3 portu je neplatné."
 
-#: src/src/i2p/susi/webmail/WebMail.java:745
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Zadejte číslo portup pro smtm."
 
-#: src/src/i2p/susi/webmail/WebMail.java:752
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Číslo portu pro SMTP musí být v rozmezí 0 až 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:758
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Číslo SMTP portu je neplatné."
 
-#: src/src/i2p/susi/webmail/WebMail.java:832
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Uživatel se odhlásil."
 
-#: src/src/i2p/susi/webmail/WebMail.java:835
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Nastala vnitřní chyba, spojení bylo ztraceno."
 
-#: src/src/i2p/susi/webmail/WebMail.java:992
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "K {0} {1} napsal:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1039
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "začátek přeposlaného mailu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1061
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "konec přeposlaného mailu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1068
-#: src/src/i2p/susi/webmail/WebMail.java:2286
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Nepodařilo se načíst obsah mailu."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1098
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Identifikátor zprávy není platný."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1136
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Konfigurace byla načtena"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1197
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nebylo nalezeno kódování pro {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1201
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Nezdařilo se překódovat data: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1206
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Chyba při čtení nahraného souboru: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1291
-#: src/src/i2p/susi/webmail/WebMail.java:1294
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Příloha nenalezena"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1341
-#: src/src/i2p/susi/webmail/WebMail.java:1469
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Neplatné hodnota velikosti stránky, použiji výchozí hodnotu."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1365
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Žádné zprávy nebyly označeny k smazání."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
@@ -178,12 +184,12 @@ msgstr[0] "Počet smazaných zpráv: 1"
 msgstr[1] "Počet smazaných zpráv: {0}"
 msgstr[2] "Počet smazaných zpráv: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1448
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Konfigurace uložena"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1664
-#: src/src/i2p/susi/webmail/WebMail.java:2077
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Login"
 
@@ -192,7 +198,7 @@ msgstr "Login"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1669
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
@@ -200,147 +206,147 @@ msgstr[0] "zpráv: 1"
 msgstr[1] "zpráv: {0}"
 msgstr[2] "zpráv: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Ukázat zprávu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1677
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Konfigurace"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1690
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1703
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Zpráva nebyla odeslána. Přejete si ji vyhodit?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1765
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Chyba při dekódování obsahu: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1825
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "žádný předmět"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1842
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Nebyla nalezena platná adresa odesílatele."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1848
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "V \\''{0}\\'' nebyla nalezena platná adresa odesílatele."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1869
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Nebyli nalezeni žádní příjemci."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1933
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Zpráva odeslána."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1977
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1978
-#: src/src/i2p/susi/webmail/WebMail.java:2193
-#: src/src/i2p/susi/webmail/WebMail.java:2326
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2021
-#: src/src/i2p/susi/webmail/WebMail.java:2120
-#: src/src/i2p/susi/webmail/WebMail.java:2274
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "Od"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2022
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "Do"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2023
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2024
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2025
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc sobě"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2026
-#: src/src/i2p/susi/webmail/WebMail.java:2121
-#: src/src/i2p/susi/webmail/WebMail.java:2276
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Předmět"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Přidat přílohu"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Přidat další přílohu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2046
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Smazat vybrané přílohy"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2065
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Uživatel"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2066
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Heslo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2071
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2072
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "POP3 Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "SMTP Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2078
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Číst emaily offline"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2082
-#: src/src/i2p/susi/webmail/WebMail.java:2211
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Nastavení"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Více o I2P mailu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Vytvořit účet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2099
-#: src/src/i2p/susi/webmail/WebMail.java:2255
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nová"
 
@@ -350,135 +356,139 @@ msgstr "Nová"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Zkontrolovat mail"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2109
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2122
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Datum"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2125
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Velikost"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2166
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Zpráva je nová"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2169
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Zpráva obsahuje přílohu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2171
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Zpráva je spam"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Žádné zprávy"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2191
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "Opravdu vymazat označené zprávy?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2192
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Ano, chci je opravdu vymazat!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2195
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Smazat vybrané"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Označit vše"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2199
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Smazat vše"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2224
-#: src/src/i2p/susi/webmail/WebMail.java:2225
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "První"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2224
-#: src/src/i2p/susi/webmail/WebMail.java:2225
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2227
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Stránka {0}/{1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2230
-#: src/src/i2p/susi/webmail/WebMail.java:2231
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Poslední"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2230
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Další"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2243
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Opravdu chcete smazat tuto zprávu?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2243
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Ano, opravdu ji chci smazat!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2256
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2257
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Odpovědět všem"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2258
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Přeposlat"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2260
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Zpět do složky"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Nepodařilo se stáhnout mail."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2308
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Velikost stránky složky"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Nastavit"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2314
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Pokročilá konfigurace"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2325
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr "Uložit konfiguraci"
 
diff --git a/apps/susimail/locale/messages_da.po b/apps/susimail/locale/messages_da.po
index ec198d424caf129335a34463d12c3c4154b8d5dd..efec2fa73a1b293ccf150bc142c381b3a187163b 100644
--- a/apps/susimail/locale/messages_da.po
+++ b/apps/susimail/locale/messages_da.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-01 12:00+0000\n"
-"Last-Translator: zzzi2p\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/I2P/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,164 +24,170 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Ingen encoder funden for kodning \\\"{0}\\\"."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Advarsel, ingen tegnsæt fundet, bruger US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Tegnsæt \\\"{0}\\\" ikke understøttet."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Del ({0}) er ikke vist på grund af {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Filen er pakket ind i en zip-fil af sikkerhedsmæssige årsager."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Vedhæftet fil ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Behøver brugernavn til godkendelse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Behøver adgangskode til godkendelse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Behøver værtsnavn til forbindelse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Behøver portnummer til POP3 forbindelse."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 nummer er ikke inden for rækkevidde 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3 portnummer er ugyldigt."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Behøver port nummer til smtp forbindelse."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP nummer er ikke inden for rækkevidde 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP  portnummer er ugyldigt."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Bruger logget ud"
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr ""
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr ""
 
@@ -190,154 +196,154 @@ msgstr ""
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr ""
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Vært"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr ""
 
@@ -347,155 +353,159 @@ msgstr ""
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr ""
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr ""
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr ""
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Slet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 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:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: 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:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr ""
diff --git a/apps/susimail/locale/messages_de.po b/apps/susimail/locale/messages_de.po
index 9393742747b41a3a0d463ce95e85128d04880355..461230f0002f3b7485325917d1ca1806a2c9f6cd 100644
--- a/apps/susimail/locale/messages_de.po
+++ b/apps/susimail/locale/messages_de.po
@@ -10,15 +10,15 @@
 # D.A. Loader, 2012
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
-# Lars Schimmer <echelon@i2pmail.org>, 2014
+# Lars Schimmer <echelon@i2pmail.org>, 2014-2015
 # mixxy, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-21 18:05+0000\n"
-"Last-Translator: blabla <blabla@trash-mail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-10 14:06+0000\n"
+"Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,164 +31,170 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "kein Kodierer für Kodierung \\''{0}\\'' gefunden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Aw:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Weitergeleitet:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Warnung: kein Zeichensatz gefunden; Rückgriff auf US-ASCII"
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Zeichensatz \\''{0}\\'' nicht unterstützt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Teil ({0}) aufgrund von {1} nicht angezeigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Anhang herunterladen {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Die Datei wurde aus Sicherheitsgründen in ein Zip-Archiv gepackt."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Anhang ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Benutzername zur Authentifizierung benötigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Passwort zur Authentifizierung benötigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Host-Name für die Verbindung benötigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "POP3-Port für die Verbindung benötigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Der POP3-Port liegt nicht im Bereich 0-65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "ungültiger POP3-Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Port für die SMTP-Verbindung benötigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Der SMTP-Port liegt nicht im Bereich 0-65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "ungültiger SMTP-Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Benutzer wurde abgemeldet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "interner Fehler; Verbindung unterbrochen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Am {0} schrieb {1}:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "Anfang weitergeleiteter Nachricht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "Ende weitergeleiteter Nachricht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Konnte den Körper der Nachricht nicht holen."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ungültige Nachrichten-ID"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Einstellungen neu geladen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "keine Kodierung für {0} gefunden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Konte Daten nicht kodieren: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Fehler beim Lesen der hochzuladenen Datei: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Anhang nicht gefunden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Nachricht nicht gefunden."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "ungültige Seitengröße, wird auf Standardwert zurückgesetzt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Keine Nachrichten zum Löschen markiert"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "Eine Nachricht gelöscht"
 msgstr[1] "{0} Nachrichten gelöscht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Einstellungen gespeichert"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Anmelden"
 
@@ -197,154 +203,154 @@ msgstr "Anmelden"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "Eine Nachricht"
 msgstr[1] "{0} Nachrichten"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Nachricht anzeigen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Einstellungen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Nachricht wurde nicht gesendet. Möchten Sie diese löschen?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Fehler beim Dekodieren des Inhalts: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "kein Betreff"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Keine gültige Absenderadresse vorgefunden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "keine gültige Adresse in \\''{0}\\''"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "keine Empfänger gefunden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Mail versandt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Senden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "Absender"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "Empfänger"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Blindkopie zurück?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Betreff"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Anhang hinzufügen"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Einen weiteren Anhang hinzufügen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Selektierte Anhänge löschen"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Benutzer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Passwort"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "POP3-Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "SMTP-Port"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Emails offline lesen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Mehr über I2P-Mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Konto anlegen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Verfassen"
 
@@ -354,155 +360,159 @@ msgstr "Verfassen"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Nachrichten abrufen"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Abmelden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Datum"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Größe"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Nachricht ist neu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Nachricht hat einen Anhang"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Nachricht ist SPAM"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Keine Nachrichten"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "Sollen die markierten Nachrichten wirklich gelöscht werden?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Ja, löschen!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Ausgewählte Emails löschen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Alles markieren"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Alle Markierungen aufheben"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "erste"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "vorherige"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Seite {0} von {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "letzte"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "nächste"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Diese Nachricht wirklich löschen?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Ja, wirklich löschen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Antworten"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Allen antworten"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Speichern als"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Zurück zur Übersicht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Konnte Nachrichten nicht abrufen."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Seitengröße im Ordner"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "festlegen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Erweiterte Einstellungen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr "Einstellungen sichern"
 
 #. this appears in the UI so translate
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "Keine Antwort vom Server"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Verbindungsfehler zum Server"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
 msgstr "Fehler beim Öffnen der Mailbox"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "Anmeldung fehlgeschlagen"
diff --git a/apps/susimail/locale/messages_en.po b/apps/susimail/locale/messages_en.po
index 98ace677e7b7ba37a186b55aa3ec12b25fa6af7c..76cdcc1121ab6e390a3f3845576741a30ffd89e8 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: 2014-09-17 21:49+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+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"
@@ -23,318 +23,324 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:323
-#: src/src/i2p/susi/webmail/WebMail.java:337
-#: src/src/i2p/susi/webmail/WebMail.java:989
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:327
-#: src/src/i2p/susi/webmail/WebMail.java:341
-#: src/src/i2p/susi/webmail/WebMail.java:1027
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:578
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:599
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:653
-#: src/src/i2p/susi/webmail/WebMail.java:656
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:657
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:662
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:713
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:717
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:721
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:726
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:739
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:745
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:752
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:758
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:832
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:835
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:992
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1039
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1061
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1068
-#: src/src/i2p/susi/webmail/WebMail.java:2286
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1098
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1136
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1197
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1201
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1206
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr ""
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1291
-#: src/src/i2p/susi/webmail/WebMail.java:1294
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1341
-#: src/src/i2p/susi/webmail/WebMail.java:1469
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1365
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1448
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1664
-#: src/src/i2p/susi/webmail/WebMail.java:2077
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 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:1669
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1677
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1690
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1703
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1765
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1825
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1842
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1848
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1869
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1933
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1977
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1978
-#: src/src/i2p/susi/webmail/WebMail.java:2193
-#: src/src/i2p/susi/webmail/WebMail.java:2326
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2021
-#: src/src/i2p/susi/webmail/WebMail.java:2120
-#: src/src/i2p/susi/webmail/WebMail.java:2274
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2022
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2023
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2024
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2025
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2026
-#: src/src/i2p/susi/webmail/WebMail.java:2121
-#: src/src/i2p/susi/webmail/WebMail.java:2276
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr ""
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2046
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2065
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2066
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2071
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2072
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2078
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2082
-#: src/src/i2p/susi/webmail/WebMail.java:2211
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2099
-#: src/src/i2p/susi/webmail/WebMail.java:2255
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr ""
 
@@ -344,135 +350,139 @@ msgstr ""
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr ""
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2109
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2122
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2125
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2166
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2169
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2171
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr ""
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2191
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2192
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2195
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2199
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2224
-#: src/src/i2p/susi/webmail/WebMail.java:2225
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2224
-#: src/src/i2p/susi/webmail/WebMail.java:2225
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2227
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2230
-#: src/src/i2p/susi/webmail/WebMail.java:2231
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2230
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2243
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2243
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2256
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2257
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2258
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2260
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2308
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2314
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2325
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr ""
 
diff --git a/apps/susimail/locale/messages_es.po b/apps/susimail/locale/messages_es.po
index 22a3625951b9a34fda8c59d55739f783e07002ef..40cb63878535367b1c75bf41a6babf468968da6c 100644
--- a/apps/susimail/locale/messages_es.po
+++ b/apps/susimail/locale/messages_es.po
@@ -11,14 +11,14 @@
 # mixy, 2011
 # punkibastardo <punkibastardo@gmail.com>, 2011
 # punkibastardo <punkibastardo@gmail.com>, 2011
-# strel, 2014
+# strel, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-21 20:20+0000\n"
-"Last-Translator: blabla <blabla@trash-mail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 11:48+0000\n"
+"Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,164 +31,170 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "No se ha encontrado codificador para la codificación \\''{0}''\\."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Resp:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Reenv:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Aviso: no se ha encontrado el juego de caracteres, volviendo a US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "juego de caracteres \\''{0}\\''no soportado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "La parte ({0}) no se muestra, debido a {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Descargar adjunto {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "El archivo está empaquetado en un archivo zip por razones de seguridad."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Adjunto ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Es necesario un nombre de usuario para la autentificación."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Es necesaria una contraseña para la autenticación."
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Es necesario un nombre de host para la conexión."
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Es necesario el número de puerto para conectar pop3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "El puerto POP3 no está en el rango 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "El puerto POP3 no es válido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Es necesario el número de puerto para conectar smtp."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "El puerto SMTP no está en el rango 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "El puerto SMTP no es válido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Usuario desconectado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Error interno, pérdida de conexión."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "El {0} {1} escribió:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "comenzar correo reenviado"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "final del correo reenviado"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "No se pudo obtener el cuerpo del correo."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID del mensaje no válida."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Configuración re-cargada"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "No se ha encontrado codificación para {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "No se pudo codificar los datos: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Error al leer el archivo subido: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Adjunto no encontrado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Mensaje no encontrado."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Tamaño de página no válida, restableciendo los valores predeterminados."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "No hay mensajes marcados para su eliminación."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 mensaje eliminado."
 msgstr[1] "{0} mensajes eliminados."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Configuración guardada"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -197,154 +203,154 @@ msgstr "Iniciar sesión"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "1 Mensaje"
 msgstr[1] "{0} Mensajes"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Mostrar mensaje"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Configuración"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "El mensaje no ha sido enviado. ¿Quiere descartarlo?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Error al descodificar el contenido: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "sin asunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "No se ha encontrado una dirección de remitente válida."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "No se ha encontrado ninguna dirección válida en \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "No se han encontrado destinatarios."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Correo enviado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Enviar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "De"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "A"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Cco"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "CCO a mí mism@"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Asunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Añadir otro adjunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Borrar adjuntos seleccionados"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Usuario"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "Puerto POP3"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "Puerto SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Leer correo desconectado"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Configuraciones"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Aprende sobre I2P mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Crear una cuenta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nuevo"
 
@@ -354,155 +360,159 @@ msgstr "Nuevo"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Comprobar correo"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Desconectarse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Fecha"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "El mensaje es nuevo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "El mensaje tiene un adjunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "El mensaje es spam"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "No hay mensajes"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "¿Realmente deseas borrar los mensajes marcados?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Sí, realmente eliminarlos!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Borrar seleccionados"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Marcar todos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Borrar todos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Primero"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Página {0} de {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Última"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "¿Realmente deseas borrar este mensaje?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Sí, ¡bórralo!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Responder"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Responder a todos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Guardar como"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Volver a la carpeta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "No se pudo descargar el correo."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Tamaño de página de la carpeta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Establecer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr "Guardar configuración"
 
 #. this appears in the UI so translate
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "No hay respuesta del servidor"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Error conectando al servidor"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
 msgstr "Error abriendo el buzón de correo"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "Fallo al iniciar sesión"
diff --git a/apps/susimail/locale/messages_fi.po b/apps/susimail/locale/messages_fi.po
new file mode 100644
index 0000000000000000000000000000000000000000..c37c070e2e7a0bbc6153ab160745516c0d62391a
--- /dev/null
+++ b/apps/susimail/locale/messages_fi.po
@@ -0,0 +1,531 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susimail package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2015
+# oselotti, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-08 18:41+0000\n"
+"Last-Translator: oselotti\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/src/i2p/susi/webmail/MailPart.java:207
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
+msgstr "Koodausohjelman löytäminen kohteen ”{0}” koodausta varten epäonnistui."
+
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Vast:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Edelleenläh:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "tuntematon"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
+msgid "Warning: no charset found, fallback to US-ASCII."
+msgstr "Varoitus: merkistöä ei löytynyt, palataan takaisin US-ACII-merkistöön."
+
+#: src/src/i2p/susi/webmail/WebMail.java:614
+#, java-format
+msgid "Charset \\''{0}\\'' not supported."
+msgstr "Merkistöä ”{0}” ei tueta."
+
+#: src/src/i2p/susi/webmail/WebMail.java:618
+#, java-format
+msgid "Part ({0}) not shown, because of {1}"
+msgstr "Osaa ({0}) ei näytetä, syy: {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Lataa liite {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:658
+msgid "File is packed into a zipfile for security reasons."
+msgstr "Tiedosto on pakattu zip-tiedostoksi turvallisuussyistä."
+
+#: src/src/i2p/susi/webmail/WebMail.java:663
+#, java-format
+msgid "Attachment ({0})."
+msgstr "Liite ({0})."
+
+#: src/src/i2p/susi/webmail/WebMail.java:714
+msgid "Need username for authentication."
+msgstr "Käyttäjänimivaltuutustarve."
+
+#: src/src/i2p/susi/webmail/WebMail.java:718
+msgid "Need password for authentication."
+msgstr "Salasanavaltuutustarve."
+
+#: src/src/i2p/susi/webmail/WebMail.java:722
+msgid "Need hostname for connect."
+msgstr "Yhteydelle verkkotietokonenimitarve."
+
+#: src/src/i2p/susi/webmail/WebMail.java:727
+msgid "Need port number for pop3 connect."
+msgstr "Pop3-yhteyden porttinumerotarve."
+
+#: src/src/i2p/susi/webmail/WebMail.java:734
+msgid "POP3 port number is not in range 0..65535."
+msgstr "POP3 portin numero ei ole alueella 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:740
+msgid "POP3 port number is invalid."
+msgstr "POP3 portin numero on virheellinen."
+
+#: src/src/i2p/susi/webmail/WebMail.java:746
+msgid "Need port number for smtp connect."
+msgstr "Smtp-yhteyden porttinumerotarve."
+
+#: src/src/i2p/susi/webmail/WebMail.java:753
+msgid "SMTP port number is not in range 0..65535."
+msgstr "SMTP portin numero ei ole alueella 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:759
+msgid "SMTP port number is invalid."
+msgstr "SMTP portin numero on virheellinen."
+
+#: src/src/i2p/susi/webmail/WebMail.java:833
+msgid "User logged out."
+msgstr "Käyttäjä kirjautunut ulos."
+
+#: src/src/i2p/susi/webmail/WebMail.java:836
+msgid "Internal error, lost connection."
+msgstr "Sisäinen virhe, yhteys katkesi."
+
+#: src/src/i2p/susi/webmail/WebMail.java:993
+#, java-format
+msgid "On {0} {1} wrote:"
+msgstr "Kohteessa {0} {1} kirjoitti:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1040
+msgid "begin forwarded mail"
+msgstr "edelleenlähetetyn sähköpostiviestin alku"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1062
+msgid "end forwarded mail"
+msgstr "edelleenlähetetyn sähköpostiviestin loppu"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
+msgid "Could not fetch mail body."
+msgstr "Sähköpostiviestin rungon noutaminen epäonnistui."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1099
+msgid "Message id not valid."
+msgstr "Viestitunniste ei ollut kelvollinen."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr "Asetukset ladattu uudelleen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
+#, java-format
+msgid "No Encoding found for {0}"
+msgstr "Koodauksen löytäminen kohteesta {0} epäonnistui"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1202
+#, java-format
+msgid "Could not encode data: {0}"
+msgstr "Tietojen koodaus epäonnistui: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1207
+#, java-format
+msgid "Error reading uploaded file: {0}"
+msgstr "Palvelimelle kopioidun tiedoston lukeminen epäonnistui: {0}"
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Liitettä ei löytynyt."
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Viestiä ei löydetty."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
+msgid "Invalid pagesize number, resetting to default value."
+msgstr "Virheellinen sivukokonumero, nollataan oletusarvoon."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1393
+msgid "No messages marked for deletion."
+msgstr "Yhtään viestiä ei ole merkitty poistettavaksi."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1409
+#, java-format
+msgid "1 message deleted."
+msgid_plural "{0} messages deleted."
+msgstr[0] "1 viesti poistettu."
+msgstr[1] "{0} viestiä poistettu."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Asetukset tallennettu"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
+#. 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:1701
+#, java-format
+msgid "1 Message"
+msgid_plural "{0} Messages"
+msgstr[0] "1 viesti"
+msgstr[1] "{0} viestiä"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1707
+msgid "Show Message"
+msgstr "Näytä viesti"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Uusi viesti"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Asetukset"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiMail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "Viestiä ei ole lähetetty. Haluatko hylätä sen?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
+#, java-format
+msgid "Error decoding content: {0}"
+msgstr "Sisällön koodauksen purkamisessa virhe: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1905
+msgid "no subject"
+msgstr "ei aihetta"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1922
+msgid "Found no valid sender address."
+msgstr "Kelvollista lähettäjäosoitetta ei löytynyt."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1928
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
+msgstr "Kelvollisen osoitteen löytäminen kohteessa ”{0}” epäonnistui."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1949
+msgid "No recipients found."
+msgstr "Vastaanottajien löytäminen epäonnistui."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2013
+msgid "Mail sent."
+msgstr "Viesti lähetetty."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2057
+msgid "Send"
+msgstr "Lähetä"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "Lähettäjä"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "Kopio"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "Piilokopio"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2105
+msgid "Bcc to self"
+msgstr "Piilokopio itselle"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Aihe"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Lisää liite"
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Lisää toinen liite"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr "Liitteet"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Poista valitut liitteet"
+
+#. current postman hq length limits 16/12, new postman version 32/32
+#: src/src/i2p/susi/webmail/WebMail.java:2145
+msgid "User"
+msgstr "Käyttäjä"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2146
+msgid "Password"
+msgstr "Salasana"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2151
+msgid "Host"
+msgstr "Verkkotietokone"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr "POP3 portti"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr "SMTP portti"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Lue postia yhteydettömässä tilassa"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Asetukset"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2165
+msgid "Learn about I2P mail"
+msgstr "Lisätietoja I2P-postista"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2166
+msgid "Create Account"
+msgstr "Luo tili"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
+msgid "New"
+msgstr "Uusi"
+
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
+msgid "Check Mail"
+msgstr "Tarkista posti"
+
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
+msgid "Date"
+msgstr "Päiväys"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2205
+msgid "Size"
+msgstr "Koko"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr "Viesti on uusi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr "Viestissä on liite"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr "Viesti on roskapostia"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Ei viestejä"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Poistetaanko merkityt viestit oikeasti?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Kyllä, poista ne oikeasti!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr "Poista valitut"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
+msgid "Mark All"
+msgstr "Merkitse kaikki"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr "Nollaa kaikki"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+msgid "First"
+msgstr "Ensimmäinen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
+msgid "Previous"
+msgstr "Edellinen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2307
+#, java-format
+msgid "Page {0} of {1}"
+msgstr "Sivu {0} / {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+msgid "Last"
+msgstr "Viimeinen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
+msgid "Next"
+msgstr "Seuraava"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Really delete this message?"
+msgstr "Poistetaanko tämä viesti?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Yes, really delete it!"
+msgstr "Kyllä, poista se!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Vastaa"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Vastaa kaikille"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Lähetä edelleen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Tallenna nimellä"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Poista"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
+msgid "Back to Folder"
+msgstr "Takaisin kansioon"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2371
+msgid "Could not fetch mail."
+msgstr "Postin noutaminen epäonnistui."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr "Kansiosivukoko"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Aseta"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Lisäasetukset"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Tallenna asetukset"
+
+#. 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
+msgid "No response from server"
+msgstr "Ei vastausta palvelimelta"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr "Virhe yhdistettäessä palvelimelle"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr "Virhe avattaessa sähköpostilaatikko"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr "Sisäänkirjautuminen epäonnistui"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Yhteys epäonnistui"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr "Palvelin torjui yhteyden"
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr "Posti torjuttu"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr "Virhe lähetettäessä viestiä"
diff --git a/apps/susimail/locale/messages_fr.po b/apps/susimail/locale/messages_fr.po
index 88a5cf07767d2f8537f5a4a18ac392c20a257032..8ee42b197f9c0f3130fb91ba762eeebe7692ac3f 100644
--- a/apps/susimail/locale/messages_fr.po
+++ b/apps/susimail/locale/messages_fr.po
@@ -9,13 +9,14 @@
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
 # Boxoa590, 2012
+# Towinet, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-09 19:04+0000\n"
-"Last-Translator: bassmax\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 13:15+0000\n"
+"Last-Translator: Towinet\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,164 +29,170 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Pas d''encodeur trouvé pour encoder \"{0}\"."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "TR:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Avertissement: aucun jeu de caractères trouvé, retour en ASCII-US"
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Jeu de caractères \\''{0}\\'' non pris en charge."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Partie ({0}) non affichée car {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Télécharger les pièces jointes {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Fichier compressé en zip par sécurité."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Pièce jointe ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Identifiant requis pour l'authentification."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Mot de passe requis pour l'authentification."
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Nom d'hôte requis pour la connexion."
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Port requis pour la connexion POP3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Le port POP3 n'est pas compris entre 0 et 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Port POP3 incorrect."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Port requis pour la connexion SMTP."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Le port SMTP n'est pas compris entre 0 et 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Port SMTP incorrect."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Utilisateur déconnecté."
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Erreur interne, connexion perdue."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Sur {0} {1} écrit:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "tranfert du message commencé"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "tranfert du message terminé"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Impossible de ramener le corps du message."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID de message incorrecte."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Configuration rechargée"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Pas d''encodage trouvé pour {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Impossible d''encoder les données: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Erreur de lecture du fichier envoyé: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Pièce jointe non trouvée."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Message non trouvé."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Taille de page incorrecte: réinitialisation à la valeur par défaut."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Aucun message marqué pour suppression"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "{0} message supprimé"
 msgstr[1] "{0} messages supprimés"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Configuration sauvegardée"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Identification"
 
@@ -194,154 +201,154 @@ msgstr "Identification"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "{0} Message"
 msgstr[1] "{0} Messages"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Afficher le message"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Configuration"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Le message n'a pas été envoyé. Voulez-vous l'abandonner ?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Erreur de décodage de contenu: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "pas d'objet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Adresse d'expéditeur correcte non trouvée"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Pas d''adresse correcte dans \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Pas de destinataire trouvé."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Message envoyé."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "De"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "À"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Copie à"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Copie cachée à"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Cci à moi-même"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Objet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Ajouter une pièce jointe"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Ajouter une autre pièce jointe"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Supprimer les pièces jointes sélectionnées"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Hôte"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "Port POP3"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "Port SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Lire hors ligne"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Paramètres"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Apprendre sur I2P mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Créer un compte"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nouveau message"
 
@@ -351,155 +358,159 @@ msgstr "Nouveau message"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Relever le courrier"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Date"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Taille"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Nouveau message"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Le message contient une pièce jointe"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Le message est un spam"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Pas de nouveau message"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "voulez-vous vraiment supprimer les messages marqués?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Oui, suppression!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Supprimer les messages sélectionnés"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Tout cocher"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Supprimer tous les messages"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Premier"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Page {0} sur {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Dernier"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Suivant"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Voulez-vous vraiment supprimer ce message?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Oui, supprimer!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Répondre à tous"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Sauvegarder sous"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Retour au dossier"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Impossible de ramener le courrier."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Taille du dossier"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Définir"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Configuration avancée"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr "Sauvegarder la configuration"
 
 #. this appears in the UI so translate
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "Pas de réponse du serveur"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Erreur lors de la connection au serveur"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
 msgstr "Erreur lors de l'ouverture de la boîte mail"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "La connexion a échoué "
diff --git a/apps/susimail/locale/messages_hu.po b/apps/susimail/locale/messages_hu.po
index 5974cc5fecd1c5cfcff39b81aeda55cf0fb83f99..c5dd2c31f89e5f7f5e9c4a1a5ebc4454d2f618ec 100644
--- a/apps/susimail/locale/messages_hu.po
+++ b/apps/susimail/locale/messages_hu.po
@@ -2,446 +2,528 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-19 22:58+0000\n"
-"PO-Revision-Date: 2012-06-01 16:16+0000\n"
-"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/I2P/language/"
-"hu/)\n"
-"Language: hu\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:447
-msgid "unknown"
-msgstr "ismeretlen"
-
-#: src/src/i2p/susi/webmail/WebMail.java:466
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Figyelmeztetés: Nem található átviteli kódolás, visszatérés 7bitre."
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:471
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nincs kódoló a következőhöz: \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:477
-msgid "Warning: no charset found, fallback to US-ASCII."
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
 msgstr ""
-"Figyelmeztetés: Karakterkészlet nem található, visszatérés US-ASCII-hez."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "ismeretlen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
+msgid "Warning: no charset found, fallback to US-ASCII."
+msgstr "Figyelmeztetés: Karakterkészlet nem található, visszatérés US-ASCII-hez."
+
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "A \\''{0}\\'' not supported. karakterkészlet nem támogatott."
 
-#: src/src/i2p/susi/webmail/WebMail.java:495
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Nincs mutatva ({0}) rész, mert {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-msgid "Download"
-msgstr "Letöltés"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "A fájl zippel tömörített, biztonsági okokból."
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-#, java-format
-msgid "attachment ({0})."
-msgstr "melléklet ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:522
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Melléklet ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Hitelesítéshez felhasználónév szükséges."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Hitelesítéshez jelszó szükséges."
 
-#: src/src/i2p/susi/webmail/WebMail.java:580
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "A csatlakozáshoz hosztnév szükséges."
 
-#: src/src/i2p/susi/webmail/WebMail.java:585
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "A pop3 csatlakozáshoz port szám szükséges."
 
-#: src/src/i2p/susi/webmail/WebMail.java:592
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 port szám nincs a 0-65535 tartományban."
 
-#: src/src/i2p/susi/webmail/WebMail.java:598
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Érvénytelen POP3 port szám."
 
-#: src/src/i2p/susi/webmail/WebMail.java:604
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "smtp kapcsolathoz szükség van port számra."
 
-#: src/src/i2p/susi/webmail/WebMail.java:611
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP port szám nincs a 0-65535 tartományban."
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Érvénytelen SMTP port szám."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Felhasználó kijelentkezett."
 
-#: src/src/i2p/susi/webmail/WebMail.java:668
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Belső hiba, a kapcsolat megszakadt."
 
-#: src/src/i2p/susi/webmail/WebMail.java:764
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "{0}, {1} írta:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:811
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "Továbbított levél kezdete"
 
-#: src/src/i2p/susi/webmail/WebMail.java:833
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "továbbított levél vége"
 
-#: src/src/i2p/susi/webmail/WebMail.java:840
-#: src/src/i2p/susi/webmail/WebMail.java:1770
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Levéltörzs letöltése sikertelen."
 
-#: src/src/i2p/susi/webmail/WebMail.java:868
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Érvénytelen üzenet azonosító (ID)."
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nem található kódoló a következőhöz: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:955
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Adat kódolása sikertelen: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:960
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Hiba a feltöltött fájl olvasásakor: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1038
-msgid "Error parsing download parameter."
-msgstr "Hiba a letöltési paraméter elemzésekor."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1082
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Érvénytelen oldalméret, visszatérés az alapértelmezett értékhez."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1106
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Nincs kijelölve üzenet törlésre."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1126
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Hiba az üzenet törlésekor: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1137
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 üzenet lett törölve."
 msgstr[1] "{0} üzenet lett törölve."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1313
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1315
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "1 Üzenet"
 msgstr[1] "{0} Üzenet"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1317
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Üzenet Megjelenítése"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1383
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Hiba a dekódoláskor: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1388
-msgid "Error decoding content: No encoder found."
-msgstr "Hiba a dekódoláskor: Dekódoló nem található."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1435
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "nincs tárgy"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1452
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Érvényes feladó cím nem található."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1458
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Nem található érvényes cím a következőben: \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1477
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Címzett nem található."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1484
-msgid "Quoted printable encoder not available."
-msgstr "Nem található a megjelölt nyomtatható kódoló."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1489
-msgid "Header line encoder not available."
-msgstr "Fejléc kódoló nem elérhető."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Levél elküldve."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Küldés"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Melléklet Törlése"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Reload Config"
-msgstr "Beállítások Újratöltése"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1677
-#: src/src/i2p/susi/webmail/WebMail.java:1758
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "From:"
-msgstr "Feladó:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Címzett:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Másolat:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1764
-msgid "Subject:"
-msgstr "Tárgy:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc saját részre"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Új Melléklet:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Tárgy"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr ""
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Fájl Feltöltése"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Mellékletek:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Felhasználó"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1644
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Hoszt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "POP3-Port"
-msgstr "POP3 Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1651
-msgid "SMTP-Port"
-msgstr "SMTP Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
-msgid "Reset"
-msgstr "Visszaállít"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Ismerd meg az I2P mailt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1656
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Levélfiók Hozzáadása"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Really delete the marked messages?"
-msgstr "A kijelölt üzenetek tényleg törlésre kerüljenek?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Yes, really delete them!"
-msgstr "Igen, tényleg töröld őket!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Új"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply"
-msgstr "Válasz"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Reply All"
-msgstr "Válasz Mindenkinek"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Forward"
-msgstr "Továbbítás"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
-#: src/src/i2p/susi/webmail/WebMail.java:1753
-msgid "Delete"
-msgstr "Törlés"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Új Levelek Ellenőrzése"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Sender"
-msgstr "Feladó"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1680
-msgid "Subject"
-msgstr "Tárgy"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Kijelentkezés"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Dátum"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1682
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Méret"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1708
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "1 bájt"
-msgstr[1] "{0} bájt"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "A kijelölt üzenetek tényleg törlésre kerüljenek?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Igen, tényleg töröld őket!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Mindet Kijelöli"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Invert Selection"
-msgstr "Kijelölés Megfordítása"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1715
-msgid "Clear"
-msgstr "Töröl"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Első"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Előző"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1720
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "{0}. oldal, összesen {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Utolsó"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Következő"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Pagesize:"
-msgstr "Oldalméret:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-msgid "Set"
-msgstr "Beállít"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Tényleg törlődjön ez az üzenet?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Igen, tényleg töröld!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1756
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Válasz"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Válasz Mindenkinek"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Továbbítás"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Törlés"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Visszatérés Mappához"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Date:"
-msgstr "Dátum:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1774
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Nem sikerül a levél letöltése."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Beállít"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+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
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_id.po b/apps/susimail/locale/messages_id.po
new file mode 100644
index 0000000000000000000000000000000000000000..f858cc350b5c5a8af7a568a68dc68731932c1d40
--- /dev/null
+++ b/apps/susimail/locale/messages_id.po
@@ -0,0 +1,528 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susimail package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/src/i2p/susi/webmail/MailPart.java:207
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
+msgstr "Tidak ada encoder yang ditemukan untuk mengencoding \\\"{0}\\\"."
+
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Re:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Fwd:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "tidak diketahui"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
+msgid "Warning: no charset found, fallback to US-ASCII."
+msgstr "Peringatan: tidak ada charset yang ditemukan, kembali ke US-ASCII."
+
+#: src/src/i2p/susi/webmail/WebMail.java:614
+#, java-format
+msgid "Charset \\''{0}\\'' not supported."
+msgstr "Charset \\\"{0}\\\" tidak didukung."
+
+#: src/src/i2p/susi/webmail/WebMail.java:618
+#, java-format
+msgid "Part ({0}) not shown, because of {1}"
+msgstr "Bagian ({0}) tidak ditampilkan, karena {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Unduh lampiran {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:658
+msgid "File is packed into a zipfile for security reasons."
+msgstr "Demi alasan keamanan file dipaketkan kedalam file zip."
+
+#: src/src/i2p/susi/webmail/WebMail.java:663
+#, java-format
+msgid "Attachment ({0})."
+msgstr "Lampiran ({0})."
+
+#: src/src/i2p/susi/webmail/WebMail.java:714
+msgid "Need username for authentication."
+msgstr "Diperlukan nama pengguna untuk mengotentikasi."
+
+#: src/src/i2p/susi/webmail/WebMail.java:718
+msgid "Need password for authentication."
+msgstr "Diperlukan kata sandi untuk mengontentikasi."
+
+#: src/src/i2p/susi/webmail/WebMail.java:722
+msgid "Need hostname for connect."
+msgstr "Diperlukan hostname untuk terhubung."
+
+#: src/src/i2p/susi/webmail/WebMail.java:727
+msgid "Need port number for pop3 connect."
+msgstr "Diperlukan nomor port untuk sambungan pop3."
+
+#: src/src/i2p/susi/webmail/WebMail.java:734
+msgid "POP3 port number is not in range 0..65535."
+msgstr "Nomor port POP3 tidak dalam jarak 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:740
+msgid "POP3 port number is invalid."
+msgstr "Nomor port POP3 tidak valid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:746
+msgid "Need port number for smtp connect."
+msgstr "Diperlukan nomor port untuk sambungan smtp."
+
+#: src/src/i2p/susi/webmail/WebMail.java:753
+msgid "SMTP port number is not in range 0..65535."
+msgstr "Nomor port SMTP tidak dalam jarak 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:759
+msgid "SMTP port number is invalid."
+msgstr "Nomor port SMTP tidak valid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:833
+msgid "User logged out."
+msgstr "Pengguna keluar."
+
+#: src/src/i2p/susi/webmail/WebMail.java:836
+msgid "Internal error, lost connection."
+msgstr "Kesalahan internal, koneksi terputus."
+
+#: src/src/i2p/susi/webmail/WebMail.java:993
+#, java-format
+msgid "On {0} {1} wrote:"
+msgstr "Pada {0} {1} menulis:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1040
+msgid "begin forwarded mail"
+msgstr "mulai penerusan surat"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1062
+msgid "end forwarded mail"
+msgstr "akhiri penerusan surat"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
+msgid "Could not fetch mail body."
+msgstr "Tidak dapat mengambil badan surat."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1099
+msgid "Message id not valid."
+msgstr "Id pesan tidak valid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr "Konfigurasi dimuat ulang"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
+#, java-format
+msgid "No Encoding found for {0}"
+msgstr "Tidak ada Encoding yang ditemukan untuk {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1202
+#, java-format
+msgid "Could not encode data: {0}"
+msgstr "Tidak dapat mengencoding data: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1207
+#, java-format
+msgid "Error reading uploaded file: {0}"
+msgstr "Kesalahan saat membaca file yang diunggah: {0}"
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Lampiran tidak dietmukan."
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
+msgid "Invalid pagesize number, resetting to default value."
+msgstr "Jumlah ukuran halaman tidak valid, menyetel ulang ke value default."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1393
+msgid "No messages marked for deletion."
+msgstr "Tidak da pesan yang ditandai untuk penghapusan."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1409
+#, java-format
+msgid "1 message deleted."
+msgid_plural "{0} messages deleted."
+msgstr[0] "{0} pesan dihapus."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Konfigurasi disimpan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
+msgid "Login"
+msgstr "Masuk"
+
+#. 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:1701
+#, java-format
+msgid "1 Message"
+msgid_plural "{0} Messages"
+msgstr[0] "{0} Pesan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1707
+msgid "Show Message"
+msgstr "Tampilkan Pesan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Pesan Baru"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiMail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "Pesan tidak terkirim. Apakah Anda ingin membuangnya?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
+#, java-format
+msgid "Error decoding content: {0}"
+msgstr "Kesalahan saat mendecoding konten: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1905
+msgid "no subject"
+msgstr "tidak ada subyek"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1922
+msgid "Found no valid sender address."
+msgstr "Tidak ditemukan alamat pengirim yang valid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1928
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
+msgstr "Tidak ditemukan alamat yang valid di \\\"{0}\\\"."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1949
+msgid "No recipients found."
+msgstr "Tidak ada perima yang ditemukan."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2013
+msgid "Mail sent."
+msgstr "Surat terikirm."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2057
+msgid "Send"
+msgstr "Kirim"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
+msgid "Cancel"
+msgstr "Batalkan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "Dari"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Ke"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "Cc"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "Bcc"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2105
+msgid "Bcc to self"
+msgstr "Bcc to self"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Subyek"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Tambahkan Lampiran"
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Tambahkan lampiran lainnya"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr "Lampiran"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Hapus lampiran yang dipilih"
+
+#. current postman hq length limits 16/12, new postman version 32/32
+#: src/src/i2p/susi/webmail/WebMail.java:2145
+msgid "User"
+msgstr "Pengguna"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2146
+msgid "Password"
+msgstr "Kata sandi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2151
+msgid "Host"
+msgstr "Host"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr "Port POP3"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr "Port SMTP"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Baca Surat Offline"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Pengaturan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2165
+msgid "Learn about I2P mail"
+msgstr "Pelajari mengenai surat I2P"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2166
+msgid "Create Account"
+msgstr "Buat Akun"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
+msgid "New"
+msgstr "Baru"
+
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
+msgid "Check Mail"
+msgstr "Periksa Surat"
+
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Keluar"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
+msgid "Date"
+msgstr "Tanggal"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2205
+msgid "Size"
+msgstr "Ukuran"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr "Pesan ini baru"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr "Pesan memiliki lampiran"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr "Pesan ini spam"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Tidak ada pesan"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Benar ingin menghapus pesan yang ditandai?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Ya, benar-benar hapus mereka!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr "Hapus Yang Dipilih"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
+msgid "Mark All"
+msgstr "Tandai Semua"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr "Tandai Kosong"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+msgid "First"
+msgstr "Pertama"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2307
+#, java-format
+msgid "Page {0} of {1}"
+msgstr "Laman {0} dari {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+msgid "Last"
+msgstr "Terakhir"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
+msgid "Next"
+msgstr "Berikutnya"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Really delete this message?"
+msgstr "Benar ingin menghapus pesan ini?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Yes, really delete it!"
+msgstr "Ya, benar-benar hapus itu!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Balas"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Balas Semua"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Teruskan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Hapus"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
+msgid "Back to Folder"
+msgstr "Kembali ke Folder"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2371
+msgid "Could not fetch mail."
+msgstr "Tidak dapat mengambil surat."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr "Ukuran Laman Folder"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Setel"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Konfigurasi Lanjutan"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Simpan Konfigurasi"
+
+#. 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
+msgid "No response from server"
+msgstr "Tidak ada respon dari server"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr "Kesalahan dalam menghubungkan ke server"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr "Kesalahan saat membuak kotak surat"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr "Gagal masuk"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Tidak dapat terhubung"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr "Server menolak sambungan"
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr "Surat ditolak"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr "Kesalahan saat mengirim surat"
diff --git a/apps/susimail/locale/messages_it.po b/apps/susimail/locale/messages_it.po
index 6a7ea2b7b32ed73539ae865dae56411739b1c948..cc9dc0ab350445d2814bc1a8c36b465e54fc3e64 100644
--- a/apps/susimail/locale/messages_it.po
+++ b/apps/susimail/locale/messages_it.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-07 13:37+0000\n"
-"Last-Translator: alamir <christianm@libero.it>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,164 +26,170 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nessun codificatore trovato per la codifica \\\"{0}\\\"."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Attenzione: nessun charset trovato, ritorno a US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Charset \\\"{0}\\\" non supportato."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Parte ({0}) non mostrata, a causa di {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Scarica allegato {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Il file è compresso in formato zip per ragioni di sicurezza."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Allegato ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Serve l'username per l'autenticazione."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Serve la password per l'autenticazione."
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Serve l'hostname per connettersi"
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Serve il numero di porta per connettersi con pop3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Il numero di porta POP3 non è nell'intervallo 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Il numero di porta POP3 non è valido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Serve il numero di porta per connettersi con smtp."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Il numero di porta SMTP non è nell'intervallo 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Il numero di porta SMTP non è valido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Utente disconnesso."
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Errore interno, connessione persa."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Su {0} {1} scritto:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "inizia mail inoltrata"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "concludi mail inoltrata"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Non è stato possibile prendere il corpo della mail."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "L'id del messaggio non è valido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Configurazione ricaricata"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nessuna Codifica trovata per {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Non è stato possibile codificare i dati: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Errore nella lettura del file inviato: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Impossibile trovare l'allegato"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Numero di dimensione di pagina invalido, ripristino al valore di default in corso."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Nessun messaggio segnato per l'eliminazione."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 messaggio eliminato."
 msgstr[1] "{0} messaggi eliminati."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Configurazione salvata"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Login"
 
@@ -192,154 +198,154 @@ msgstr "Login"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "1 Messaggio"
 msgstr[1] "{0} Messaggi"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Mostra Messaggio"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Il messaggio non è stato inviato. Vuoi abbandonarlo?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Errore nella decodifica del contenuto: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "nessun soggetto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Non è stato trovato nessun indirizzo mittente valido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Non è stato trovato nessun indirizzo valido in \\\"{0}\\\"."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Nessun destinatario trovato."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Mail inviata."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Invia"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "Da"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "A"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Ccn"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc a se stessi"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Soggetto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Aggiungi allegato"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Aggiungi un altro allegato"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Cancella gli allegati selezionati"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Utente"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Password"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "Porta POP3"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "Porta SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Leggi mail non in linea"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Ulteriori informazioni sulla mail I2P"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Crea Account"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nuovo"
 
@@ -349,155 +355,159 @@ msgstr "Nuovo"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Controlla Mail"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Disconnettiti"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Data"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Il messaggio è nuovo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Il messaggio ha un allegato"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Il messaggio è spam"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Nessun messaggio"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "Eliminare veramente i messaggi selezionati?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Sì,eliminali per davvero!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Cancella selezionato"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Segna Tutti"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Pulisci tutto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Primo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Pagina {0} di {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Ultimo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Successivo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Eliminare per davvero questo messaggio?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Sì, eliminalo per davvero!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Rispondi A Tutti"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Torna alla Cartella"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Non è stato possibile recuperare la mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Dimensioni della pagina della cartella"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Imposta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Configurazione avanzata"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
 msgstr "Salva configurazione"
 
 #. this appears in the UI so translate
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "Nessuna risposta dal server"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Errore durante la connessione al server"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
 msgstr "Errore nell'apertura della mailbox"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "Login fallito "
diff --git a/apps/susimail/locale/messages_ja.po b/apps/susimail/locale/messages_ja.po
index 74f838a030f21f0ee25e960ce98e395562c57919..640fccf36ee9c9e1768bd7c117a2d881944143c0 100644
--- a/apps/susimail/locale/messages_ja.po
+++ b/apps/susimail/locale/messages_ja.po
@@ -4,15 +4,16 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# plazmism <gomidori@live.jp>, 2014
-# luixxiul, 2013
+# タカハシ <gomidori@live.jp>, 2014
+# rafe <rafe.kun@gmail.com>, 2015
+# Suguru Hirahara, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-05-01 12:00+0000\n"
-"Last-Translator: zzzi2p\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,163 +26,169 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr " \\''{0}\\'' のエンコード用のエンコーダーが見つかりませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
-msgstr ""
+msgstr "Fwd:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "不明"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "警告: 文字セットが見つかりませんでした、 US-ASCII にフォールバックします。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "文字セット \\''{0}\\'' はサポートされていません。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "パート ({0}) が表示されませ、 {1} のためです。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
-msgstr ""
+msgstr "添付ファイルをダウンロードする{0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "ファイルはセキュリティ上の理由から zip ファイルにパックされています。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "添付 ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "認証にはユーザー名が必要です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "認証にはパスワードが必要です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "接続にはホスト名が必要です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "pop3 接続にはポート番号が必要です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 ポート番号が0..65535の範囲にありません。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3 のポート番号は無効です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "smtp 接続にはポート番号が必要です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP ポート番号が0..65535の範囲にありません。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP ポート番号は無効です。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "ユーザーはログアウトしました"
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "内部エラー、接続が失われました。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "{0}に {1}が書きました:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "転送メールを開始"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "転送メールを終了"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "メール本文を取得できませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "メッセージIDが有効でありません。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
-msgstr ""
+msgstr "設定が変更されました"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "{0} にエンコーディングが見つかりませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "データをエンコードできませんでした: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "アップロードされたファイルを読込中にエラー: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
+msgstr "添付ファイルが見つかりません。"
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "無効なページサイズ番号、デフォルトの値にリセット中"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "削除にマークされているメッセージなし。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "{0} 件のメッセージ削除。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
-msgstr ""
+msgstr "設定が保存されました"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "ログイン"
 
@@ -190,153 +197,153 @@ msgstr "ログイン"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "{0} 件のメッセージ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "メッセージを表示"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
-msgstr ""
+msgstr "新着メール"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
-msgstr ""
+msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
-msgstr ""
+msgstr "メッセージの送信に失敗しました。メッセージを削除しますか?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "コンテンツのデコード中にエラ: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "無題"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "有効な差出人アドレスが見つかりませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "\\''{0}\\'' に有効なアドレスが見つかりませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "受信者が見つかりませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "メールが送信されました。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "送信"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
-msgstr ""
+msgstr "差出人"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "自分に Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "件名"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
-msgstr ""
+msgstr "ファイルを添付する"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
-msgstr ""
+msgstr "別のファイルを添付する"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
-msgstr ""
+msgstr "添付ファイル"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
-msgstr ""
+msgstr "指定された添付ファイルを削除する"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "ユーザー"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "パスワード"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "ホスト"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
-msgstr ""
+msgstr "POP3ポート"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTPポート"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
-msgstr ""
+msgstr "メールをオフラインで読む"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "I2P メールについて知る"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "アカウントを作成"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "新着"
 
@@ -346,174 +353,178 @@ msgstr "新着"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "メールをチェック"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "ログアウト"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "日付"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "サイズ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
-msgstr ""
+msgstr "新着メールです"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
-msgstr ""
+msgstr "添付ファイルがあります"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
-msgstr ""
+msgstr "迷惑メールです"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
-msgstr ""
+msgstr "本文がありません"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "本当にマークされたメッセージを削除しますか?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "はい、本当に削除します!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
-msgstr ""
+msgstr "マークされたメッセージを削除しました"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "全てマーク"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
-msgstr ""
+msgstr "全てクリア"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "最初"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "前へ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "ページ {0} / {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "最終"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "次へ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "本当にこのメッセージを削除しますか?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "はい、本当に削除します!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "返信"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "全て返信"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "転送"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "削除"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "フォルダーに戻る"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "メールを取得できませんでした。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
-msgstr ""
+msgstr "フォルダーのページサイズ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "設定"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
-msgstr ""
+msgstr "高度な設定"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 msgid "Save Configuration"
-msgstr ""
+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:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
-msgstr ""
+msgstr "サーバーからの応答がありません"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
-msgstr ""
+msgstr "サーバーに接続することができませんでした"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
-msgstr ""
+msgstr "メールボックスを開くことができませんでした"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
-msgstr ""
+msgstr "ログインに失敗しました。"
 
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
 msgid "Cannot connect"
-msgstr ""
+msgstr "接続できません。"
 
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
 msgid "Server refused connection"
-msgstr ""
+msgstr "サーバーに接続が拒否されました。"
 
 #. TODO which recipient?
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
 msgid "Mail rejected"
-msgstr ""
+msgstr "メールが拒否されました"
 
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
 msgid "Error sending mail"
-msgstr ""
+msgstr "メールを送信できませんでした"
diff --git a/apps/susimail/locale/messages_nl.po b/apps/susimail/locale/messages_nl.po
index 8cb53b173ee827709e32989c2a122634ec3fdb9b..86c25fe01193b57f50e055f345518d9f6c3cb336 100644
--- a/apps/susimail/locale/messages_nl.po
+++ b/apps/susimail/locale/messages_nl.po
@@ -2,447 +2,532 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
-# ducki2p <ducki2p@gmail.com>, 2011.
-# foo <foo@bar>, 2009.
-#   <random901@zoho.com>, 2012.
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Nathan Follens, 2015
+# attesor <random901@zoho.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-19 23:00+0000\n"
-"PO-Revision-Date: 2012-08-25 16:10+0000\n"
-"Last-Translator: attesor <random901@zoho.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:447
-msgid "unknown"
-msgstr "onbekend"
-
-#: src/src/i2p/susi/webmail/WebMail.java:466
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Waarschuwing: geen transfer encoding gevonden, terugval naar 7bit."
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:471
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Geen encoder gevonden voor de encoding \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:477
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Re:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Fwd:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "onbekend"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Waarschuwing: geen charset gevonden, terugval naar US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Charset \\''{0}\\'' niet ondersteund."
 
-#: src/src/i2p/susi/webmail/WebMail.java:495
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Deel ({0}) niet getoond, vanwege {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-msgid "Download"
-msgstr "Download"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Download bijlage {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Bestand is verpakt in een zipbestand wegens veiligheid."
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-#, java-format
-msgid "attachment ({0})."
-msgstr "bijlage ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:522
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Bijlage ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Gebruikersnaam nodig voor authenticatie."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Wachtwoord nodig voor authenticatie."
 
-#: src/src/i2p/susi/webmail/WebMail.java:580
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Hostnaam nodig voor verbinding."
 
-#: src/src/i2p/susi/webmail/WebMail.java:585
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Poortnummer nodig voor pop3 verbinding."
 
-#: src/src/i2p/susi/webmail/WebMail.java:592
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 poortnummer valt niet in het bereik 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:598
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3 poortnummer is ongeldig."
 
-#: src/src/i2p/susi/webmail/WebMail.java:604
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Poortnummer nodig voor smtp verbinding."
 
-#: src/src/i2p/susi/webmail/WebMail.java:611
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP poortnummer valt niet in het bereik 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP poortnummer is ongeldig."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Gebruiker is uitgelogged."
 
-#: src/src/i2p/susi/webmail/WebMail.java:668
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Interne fout, verbinding verbroken."
 
-#: src/src/i2p/susi/webmail/WebMail.java:764
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Op {0} schreef {1}:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:811
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "begin doorgestuurde mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:833
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "einde doorgestuurde mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:840
-#: src/src/i2p/susi/webmail/WebMail.java:1770
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Kon de body van het bericht niet ophalen."
 
-#: src/src/i2p/susi/webmail/WebMail.java:868
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Message id is ongeldig."
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr "Configuratie herladen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Geen Encoding gevonden voor {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:955
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Kon de data niet encoden: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:960
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Fout bij lezen van geupload bestand: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1038
-msgid "Error parsing download parameter."
-msgstr "Fout bij verwerken download parameter."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Bijlage niet gevonden."
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1082
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Ongeldig nummer voor paginagrootte, herstel naar standaardwaarde."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1106
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Geen berichten gemarkeerd voor verwijdering."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1126
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Fout bij verwijderen van bericht: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1137
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 bericht verwijderd."
 msgstr[1] "{0} berichten verwijderd."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1313
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Configuratie opgeslagen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Login"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1315
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "1 Bericht"
 msgstr[1] "{0} Berichten"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1317
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Toon Bericht"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1383
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Nieuw bericht"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiMail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "Bericht is niet verzonden. Wil je het verwijderen?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Fout bij decoden van inhoud: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1388
-msgid "Error decoding content: No encoder found."
-msgstr "Fout bij decoden van inhoud: Geen encoder gevonden."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1435
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "geen onderwerp"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1452
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Geen geldig afzender adres gevonden."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1458
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Geen geldig adres gevonden in \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1477
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Geen ontvangers gevonden."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1484
-msgid "Quoted printable encoder not available."
-msgstr "Gequote print encoder niet beschikbaar."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1489
-msgid "Header line encoder not available."
-msgstr "Kopregel encoder niet beschikbaar."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Mail verzonden."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Verstuur"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Verwijder Bijlage"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "Van"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Reload Config"
-msgstr "Herlaad Configuratie"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Naar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1677
-#: src/src/i2p/susi/webmail/WebMail.java:1758
-msgid "Logout"
-msgstr "Uitloggen"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "From:"
-msgstr "Van:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Aan:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1764
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc zelf"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Nieuwe Bijlage:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Bijlage toevoegen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Upload Bestand"
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Nog een bijlage toevoegen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
 msgstr "Bijlagen"
 
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Geselecteerde bijlagen verwijderen"
+
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Gebruiker"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1644
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "POP3-Port"
-msgstr "POP3-Poort"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr "POP3-poort"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr "SMTP-poort"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1651
-msgid "SMTP-Port"
-msgstr "SMTP-Poort"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Mail offline lezen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
-msgid "Reset"
-msgstr "Herstel"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Instellingen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Leer meer over I2P email"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1656
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Account Aanmaken"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Really delete the marked messages?"
-msgstr "Wil je de gemarkeerde berichten daadwerkelijk verwijderen?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Yes, really delete them!"
-msgstr "Ja, verwijder ze!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nieuw"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply"
-msgstr "Beantwoorden"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Reply All"
-msgstr "Allen Beantwoorden"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Forward"
-msgstr "Doorsturen"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
-#: src/src/i2p/susi/webmail/WebMail.java:1753
-msgid "Delete"
-msgstr "Verwijder"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Controlleer Mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Sender"
-msgstr "Verzender"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1680
-msgid "Subject"
-msgstr "Onderwerp"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Uitloggen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Datum"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1682
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Grootte"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1708
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "1 Byte"
-msgstr[1] "{0} Bytes"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr "Bericht is nieuw"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr "Bericht heeft een bijlage"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr "Bericht is spam"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Geen berichten"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Wil je de gemarkeerde berichten daadwerkelijk verwijderen?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Ja, verwijder ze!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr "Geselecteerde verwijderen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Allen Markeren"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Invert Selection"
-msgstr "Selectie Omkeren"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1715
-msgid "Clear"
-msgstr "Selectie Wissen"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr "Alles wissen"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Eerste"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1720
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Pagina {0} van {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Laatste"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Volgende"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Pagesize:"
-msgstr "Paginagrootte:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-msgid "Set"
-msgstr "Instellen"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Werkelijk dit bericht verwijderen?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Ja, verwijder ze!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1756
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Beantwoorden"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Allen Beantwoorden"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Doorsturen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Verwijder"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Terug naar de Map"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Date:"
-msgstr "Datum:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1774
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Kon de mail niet ophalen."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr "Mappaginagrootte"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Instellen"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Geavanceerde configuratie"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Configuratie opslaan"
+
+#. 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
+msgid "No response from server"
+msgstr "Geen antwoord van server"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr "Fout bij verbinden met server"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr "Fout bij openen van mailbox"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr "Login mislukt"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Kan niet verbinden"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr "Server weigerde verbinding"
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr "Mail geweigerd"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr "Fout bij versturen van mail"
diff --git a/apps/susimail/locale/messages_pl.po b/apps/susimail/locale/messages_pl.po
index 3e596faacd7172fcf95ac04e777a0519bfe58d6e..e583c169d5e2b4af5300f4319bed40d518e6e328 100644
--- a/apps/susimail/locale/messages_pl.po
+++ b/apps/susimail/locale/messages_pl.po
@@ -2,183 +2,204 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
-#   <b790979@klzlk.com>, 2011.
-#   <businesshehe@yahoo.com>, 2011.
+# PolishAnon <b790979@klzlk.com>, 2011
+# Warton <businesshehe@yahoo.com>, 2011
+# polacco <polacco@i2pmail.org>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-19 23:01+0000\n"
-"PO-Revision-Date: 2011-12-18 12:27+0000\n"
-"Last-Translator: Warton <businesshehe@yahoo.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-12 17:43+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:447
-msgid "unknown"
-msgstr "nieznany"
-
-#: src/src/i2p/susi/webmail/WebMail.java:466
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Uwaga: nie znaleziono kodowania transferu, powrót do 7 bitów"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:471
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
-msgstr "Nr kodeka dla kodowania \\''{0} \\''."
+msgstr "Nie znaleziono kodeka dla kodowania \\''{0} \\''."
+
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:477
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Fwd:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "nieznany"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Uwaga: nie znaleziono zestawu znaków, powrót do US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Zestaw znaków \\''{0} \\' 'nie obsługiwany."
 
-#: src/src/i2p/susi/webmail/WebMail.java:495
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Część ({0}) nie pokazana ze względu na {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-msgid "Download"
-msgstr "Pobierz"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Pobierz załącznik {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Plik zapakowany w format ZIP ze względów bezpieczeństwa."
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-#, java-format
-msgid "attachment ({0})."
-msgstr "załącznik ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:522
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Załącznik ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
-msgstr "Potrzebna nazwę użytkownika do uwierzytelnienia."
+msgstr "Potrzebna nazwa użytkownika do uwierzytelnienia."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
-msgstr "Potrzebne hasło do uwierzytelniania."
+msgstr "Potrzebne hasło do uwierzytelnienia."
 
-#: src/src/i2p/susi/webmail/WebMail.java:580
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
-msgstr "Potrzebuna nazwa host do połączenia."
+msgstr "Potrzebna nazwa hosta do połączenia."
 
-#: src/src/i2p/susi/webmail/WebMail.java:585
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
-msgstr "Potrzeba numer portu pop3 do połączenia."
+msgstr "Potrzebny numer portu do połączenia POP3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:592
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
-msgstr "Numeru portu POP3 poza zakresem 0..65535."
+msgstr "Numer portu POP3 poza zakresem 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:598
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
-msgstr "Numeru portu POP3 jest nieprawidłowy."
+msgstr "Numer portu POP3 jest nieprawidłowy."
 
-#: src/src/i2p/susi/webmail/WebMail.java:604
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
-msgstr "Potrzebny numer portu smtp do połączenia."
+msgstr "Potrzebny numer portu do połączenia SMTP."
 
-#: src/src/i2p/susi/webmail/WebMail.java:611
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
-msgstr "Numeru portu SMTP poza zakresem 0..65535."
+msgstr "Numer portu SMTP poza zakresem 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Numer portu SMTP jest nieprawidłowy."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Użytkownik wylogowany."
 
-#: src/src/i2p/susi/webmail/WebMail.java:668
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
-msgstr "Błąd wewnętrzny, połączenie utracone."
+msgstr "Błąd wewnętrzny, utracono połączenie."
 
-#: src/src/i2p/susi/webmail/WebMail.java:764
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Dnia {0} {1} napisał:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:811
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "Rozpocznij przekazywanie poczty"
 
-#: src/src/i2p/susi/webmail/WebMail.java:833
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "Zakończ przekazywanie poczty"
 
-#: src/src/i2p/susi/webmail/WebMail.java:840
-#: src/src/i2p/susi/webmail/WebMail.java:1770
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
-msgstr "Nie można pobrać głównej cześci maila"
+msgstr "Nie można pobrać treści listu."
 
-#: src/src/i2p/susi/webmail/WebMail.java:868
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID wiadomości niepoprawne."
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr "Przeładowano ustawienia"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nie znaleziono kodowania dla {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:955
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Nie można zakodować danych: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:960
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Błąd w odczycie wysłanego pliku: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1038
-msgid "Error parsing download parameter."
-msgstr "Błąd pobrania parametru analizy."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Nie znaleziono załącznika"
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Nie znaleziono wiadomości."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1082
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
-msgstr ""
-"Nieprawidłowy numer rozmiaru strony, resetowanie do wartości domyślnej."
+msgstr "Nieprawidłowy numer rozmiaru strony, resetowanie do wartości domyślnej."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1106
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Brak wiadomości zaznaczonych do usunięcia."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1126
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Błąd podczas usuwania wiadomości: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1137
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 wiadomość usunięta."
-msgstr[1] "{0} wiadomości usuniętych."
-msgstr[2] "{0} wiadomości usunięte."
+msgstr[1] "{0} wiadomości usunięte."
+msgstr[2] "{0} wiadomości usuniętych."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Zapisano ustawiania"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1313
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1315
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
@@ -186,267 +207,328 @@ msgstr[0] "1 wiadomość"
 msgstr[1] "{0} wiadomości"
 msgstr[2] "{0} wiadomości"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1317
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Pokaż wiadomość"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1383
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Nowa wiadomość"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Ustawienia"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiPoczta"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "Wiadomość nie została wysłana. Chcesz ją porzucić?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Błąd dekodowania treści: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1388
-msgid "Error decoding content: No encoder found."
-msgstr "Błąd dekodowania treści: Nie znaleziono enkodera."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1435
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "bez tematu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1452
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Nie znaleziono poprawnego adresu nadawcy."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1458
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
-msgstr "Nie znaleziono prawidłowego adresu w \\''{0} \\''."
+msgstr "Nie znaleziono prawidłowego adresu w \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1477
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Nie znaleziono odbiorców."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1484
-msgid "Quoted printable encoder not available."
-msgstr "Cytowany drukowalny enkoder nie dostepny."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1489
-msgid "Header line encoder not available."
-msgstr "Enkoder linii nagłówka nie dostępny."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
-msgstr "Mail wysłany."
+msgstr "List wysłany."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Usuń załącznik"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "Od"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Reload Config"
-msgstr "Przeładuj Konfiguracje"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Do"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1677
-#: src/src/i2p/susi/webmail/WebMail.java:1758
-msgid "Logout"
-msgstr "Wyloguj się"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "From:"
-msgstr "Od:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "DW"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "To:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "UDW"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2105
+msgid "Bcc to self"
+msgstr "UDW do siebie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1764
-msgid "Subject:"
-msgstr "Temat:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Temat"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
-msgid "Bcc to self"
-msgstr "Bcc do siebie"
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Dodaj załącznik"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Nowy załącznik:"
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Dodaj kolejny załącznik"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Prześlij plik"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr "Załączniki"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Załączniki:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Usuń wybrane załączniki"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Użytkownik"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1644
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Hasło"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "POP3-Port"
-msgstr "POP3-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr "Port POP3"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr "Port SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1651
-msgid "SMTP-Port"
-msgstr "SMTP-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Czytaj pocztę bez łączenia z serwerem (off-line)"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
-msgid "Reset"
-msgstr "Zresetuj"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Ustawienia"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Dowiedz się więcej o poczcie I2P"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1656
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Załóż konto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Really delete the marked messages?"
-msgstr "Czy na pewno usunąć zaznaczone wiadomości?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Yes, really delete them!"
-msgstr "Tak, naprawdę je usuń!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
-msgstr "Nowe"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply"
-msgstr "Odpowiedz"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Reply All"
-msgstr "Odpowiedz wszystkim"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Forward"
-msgstr "Przekaż"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
-#: src/src/i2p/susi/webmail/WebMail.java:1753
-msgid "Delete"
-msgstr "Usuń"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+msgstr "Nowy list"
+
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Sprawdź pocztę"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Sender"
-msgstr "Nadawca"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1680
-msgid "Subject"
-msgstr "Temat"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Wyloguj się"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Data"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1682
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1708
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "1 bajt"
-msgstr[1] "{0} bajtów"
-msgstr[2] "{0} bajty"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr "Wiadomość jest nowa"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr "Wiadomość ma załącznik"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr "Wiadomość jest spamem"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Brak wiadomości"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Czy na pewno usunąć zaznaczone wiadomości?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Tak, naprawdę je usuń!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr "Usuń zaznaczone"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Zaznacz wszystkie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Invert Selection"
-msgstr "Odwróć zaznaczenie"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr "Wyczyść wszystko"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1715
-msgid "Clear"
-msgstr "Wyczyść"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Pierwsze"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
-msgstr "Poprzedni"
+msgstr "Poprzednie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1720
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Strona {0} z {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Ostatnie"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Następne"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Pagesize:"
-msgstr "Rozmiar strony:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-msgid "Set"
-msgstr "Ustaw"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Czy na pewno usunąć tę wiadomość?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
-msgstr "Tak, naprawdę to usuń!"
+msgstr "Tak, naprawdę ją usuń!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Odpowiedz"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Odpowiedz wszystkim"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1756
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Przekaż dalej"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Zapisz jako"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Usuń"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Powrót do folderu"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Date:"
-msgstr "Data:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1774
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Nie można pobrać poczty."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr "Rozmiar strony folderu"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Ustaw"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Ustawienia zaawansowane"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Zapisz ustawienia"
+
+#. 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
+msgid "No response from server"
+msgstr "Brak odpowiedzi z serwera"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr "Błąd przy łączniu z serwerem"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr "Błąd przy otwieraniu skrzynki pocztowej"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr "Nieudane logowanie"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Nie można się połączyć"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr "Serwer odmówił połączenia"
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr "List odrzucony"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr "Błąd przy wysyłaniu listu"
diff --git a/apps/susimail/locale/messages_pt.po b/apps/susimail/locale/messages_pt.po
index d8e2ca0eb2e91f106ffc6d4a0546a64071f6455c..5bfc5d278fab938a1a0250cd2b9c3b543741edfc 100644
--- a/apps/susimail/locale/messages_pt.po
+++ b/apps/susimail/locale/messages_pt.po
@@ -5,14 +5,14 @@
 # 
 # Translators:
 # kgtm <fabio.h.f.antunes@gmail.com>, 2014
-# tuliouel, 2013
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2014-01-22 18:41+0000\n"
-"Last-Translator: kgtm <fabio.h.f.antunes@gmail.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,428 +20,512 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:443
-msgid "unknown"
-msgstr "desconhecido"
-
-#: src/src/i2p/susi/webmail/WebMail.java:462
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Aviso: nenhuma codificação de conteúdo de transferência encontrada. Recorrer para 7bit."
-
-#: src/src/i2p/susi/webmail/WebMail.java:467
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nenhum codificador encontrado para codificar ''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:473
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "desconhecido"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Aviso: nenhuma codificação de caracteres encontrada. Recorrer ao US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:487
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Codificação de caracteres \\''{0}\\'' não admitida."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Parte ({0}) não exibida por causa de {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-msgid "Download"
-msgstr "Baixar"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Arquivo zipado por razões de segurança."
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-#, java-format
-msgid "attachment ({0})."
-msgstr "Anexo ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Anexo ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:568
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Necessário nome de usuário para autenticação."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Nova senha para autenticação."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Necessário nome do host para conectar."
 
-#: src/src/i2p/susi/webmail/WebMail.java:581
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Necessário número de porta para conectar por pop3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:588
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "O número da porta do POP3 não pertence ao intervalo 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Número da porta do POP3 é inválido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:600
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Necessário número da porta para conectar por smtp."
 
-#: src/src/i2p/susi/webmail/WebMail.java:607
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "O número da porta do SMTP não pertence ao intervalo 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Número da porta do SMTP é inválido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:660
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Usuário se desconectou."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Erro interno. Conexão perdida."
 
-#: src/src/i2p/susi/webmail/WebMail.java:760
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Em {0} {1} escreveu:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:807
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "Início da mensagem encaminhada"
 
-#: src/src/i2p/susi/webmail/WebMail.java:829
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "fim da mensagem encaminhada"
 
-#: src/src/i2p/susi/webmail/WebMail.java:836
-#: src/src/i2p/susi/webmail/WebMail.java:1769
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Não foi possível recuperar o corpo do e-mail."
 
-#: src/src/i2p/susi/webmail/WebMail.java:864
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID da mensagem não é válido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:947
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nenhuma codificação encontrada para {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Não foi possível codificar datos: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:956
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Erro ao ler arquivo enviado: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1034
-msgid "Error parsing download parameter."
-msgstr "Erro ao analisar parâmetro de download."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1078
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Número inválido de tamanho de página, restituindo ao valor original."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1102
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Nenhuma mensagem marcada para eliminação."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1122
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Erro ao eliminar mensagem: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1133
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "Uma mensagem eliminada"
 msgstr[1] "{0} mensagens eliminadas."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1314
-#: src/src/i2p/susi/webmail/WebMail.java:1653
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Entrar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1316
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "Uma mensagem"
 msgstr[1] "{0} Mensagens"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1318
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Exibir Mensagem"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1384
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Erro ao decodificar conteúdo: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1389
-msgid "Error decoding content: No encoder found."
-msgstr "Erro ao decodificar conteúdo: Nenhum codificador encontrado."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1436
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "sem assunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1453
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Nenhum endereço válido de remetente encontrado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1459
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Nenhum endereço válido encontrado em \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1478
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Nenhum destinatário encontrado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1485
-msgid "Quoted printable encoder not available."
-msgstr "Codificação de caracteres ASCII imprimíveis não disponível."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1490
-msgid "Header line encoder not available."
-msgstr "Cabeçalho da codificação de caracteres não disponível."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "E-mail enviado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Enviar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Apagar anexo"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1675
-#: src/src/i2p/susi/webmail/WebMail.java:1756
-msgid "Reload Config"
-msgstr "Recarregar Configurações"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Logout"
-msgstr "Desconectar"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1761
-msgid "From:"
-msgstr "De:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Para:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cópia:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Cópia Oculta:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Subject:"
-msgstr "Assunto:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Cópia oculta para si próprio"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Novo Anexo:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Assunto"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr ""
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Enviar Arquivo"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Anexos:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1642
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Usuário"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Senha"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1648
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Servidor"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
-msgid "POP3-Port"
-msgstr "Porta-POP3"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "SMTP-Port"
-msgstr "Porta-SMTP"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1653
-msgid "Reset"
-msgstr "Reiniciar"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Aprenda sobre o e-mail do I2P"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Criar Conta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Really delete the marked messages?"
-msgstr "Eliminar, realmente, as mensagens marcadas?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Yes, really delete them!"
-msgstr "Sim, realmente elimine-as!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1669
-#: src/src/i2p/susi/webmail/WebMail.java:1748
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Novo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
-msgid "Reply"
-msgstr "Responder"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply All"
-msgstr "Responder a todos"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Forward"
-msgstr "Encaminhar"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Verificar e-mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1678
-msgid "Sender"
-msgstr "Remetente"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Subject"
-msgstr "Assunto"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Desconectar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1680
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Data"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1707
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "1 Byte"
-msgstr[1] "{0} Bytes"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Eliminar, realmente, as mensagens marcadas?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Sim, realmente elimine-as!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Marcar todos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
-msgid "Invert Selection"
-msgstr "Inverter Seleção"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Clear"
-msgstr "Apagar"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Primeiro"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1753
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Página {0} de {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Última"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Próxima"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1725
-msgid "Pagesize:"
-msgstr "Tamanho da página:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Set"
-msgstr "Definir"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Eliminar, realmente, esta mensagem?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Sim, realmente elimine-a!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Responder"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Responder a todos"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Encaminhar"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Voltar à Pasta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "Date:"
-msgstr "Data:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Não foi possível recuperar o e-mail."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Definir"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+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
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_pt_BR.po b/apps/susimail/locale/messages_pt_BR.po
index 05a36d88f216092d11726a8d8b5b009ad6a5673d..c92df416ca6450b1fa8b75b3c2cfd5a0a57d9c03 100644
--- a/apps/susimail/locale/messages_pt_BR.po
+++ b/apps/susimail/locale/messages_pt_BR.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # blueboy, 2013
+# blueboy, 2014-2015
 # blueboy, 2013-2014
 # thefabio <thefabioluiz@bol.com.br>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
-"PO-Revision-Date: 2014-03-02 22:48+0000\n"
-"Last-Translator: thefabio <thefabioluiz@bol.com.br>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,428 +22,512 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:443
-msgid "unknown"
-msgstr "desconhecido"
-
-#: src/src/i2p/susi/webmail/WebMail.java:462
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:467
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nenhum codificador foi encontrado para codificar \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:473
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Re:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Fwd:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "desconhecido"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Aviso: Nenhum conjunto de caractéres foi encontrado. Usando US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:487
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "O conjunto de caractéres \\''{0}\\'' não é suportado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Parte ({0}) não exibida por causa de {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-msgid "Download"
-msgstr "Baixar"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Baixar anexo {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Por questões de segurança, o arquivo está zipado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-#, java-format
-msgid "attachment ({0})."
-msgstr "anexo ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Anexo ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:568
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "É necessário fornecer o nome de usuário para autenticação."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "É necessário fornecer a senha para autenticação."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "É necessário fornecer o nome do host para conectar-se."
 
-#: src/src/i2p/susi/webmail/WebMail.java:581
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "É necessário fornecer o número da porta para o POP3 conectar."
 
-#: src/src/i2p/susi/webmail/WebMail.java:588
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
-msgstr "O número da porta POP3 não se inclui na faixa 0..65535."
+msgstr "O número da porta POP3 não está na faixa 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "O número da porta POP3 é inválido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:600
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "É necessário fornecer o número da porta para o SMTP conectar."
 
-#: src/src/i2p/susi/webmail/WebMail.java:607
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
-msgstr "O número da porta SMTP não se inclui na faixa 0..65535."
+msgstr "O número da porta SMTP não está na faixa 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "O número da porta SMTP é inválido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:660
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Usuário deslogado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Erro interno, conexão perdida."
 
-#: src/src/i2p/susi/webmail/WebMail.java:760
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Sobre {0}, {1} escreveu:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:807
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:829
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "fim"
 
-#: src/src/i2p/susi/webmail/WebMail.java:836
-#: src/src/i2p/susi/webmail/WebMail.java:1769
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Não foi possível recuperar o corpo da mensagem."
 
-#: src/src/i2p/susi/webmail/WebMail.java:864
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Id da mensagem inválido."
 
-#: src/src/i2p/susi/webmail/WebMail.java:947
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nenhuma codificação encontrada para {0}."
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Não foi possível codificar os dados: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:956
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Erro ao ler arquivo carregado: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1034
-msgid "Error parsing download parameter."
-msgstr "Erro ao analisar parâmetro de download."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Anexo não encontrado."
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1078
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Número de tamanho de página inválido, restaurando valor padrão."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1102
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Nenhuma mensagem marcada para deleção."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1122
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Erro excluindo mensagem: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1133
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "{0} mensagens deletadas."
 msgstr[1] "{0} mensagens deletadas."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1314
-#: src/src/i2p/susi/webmail/WebMail.java:1653
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Configurações salvas"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Entrar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1316
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "{0} mensagens"
 msgstr[1] "{0} mensagens"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1318
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Mostrar mensagem"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1384
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Nova mensagem"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Configuração"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiMail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "A mensagem não foi enviada. Deseja descartá-la?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Erro decodificando conteúdo: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1389
-msgid "Error decoding content: No encoder found."
-msgstr "Erro decodificando conteúdo: Decodificador não encontrado."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1436
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "sem assunto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1453
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Nenhum endereço de remetente válido foi encontrado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1459
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Nenhum endereço válido foi encontrado em \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1478
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1485
-msgid "Quoted printable encoder not available."
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1490
-msgid "Header line encoder not available."
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Correio enviado."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Enviar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Deletar anexo"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1675
-#: src/src/i2p/susi/webmail/WebMail.java:1756
-msgid "Reload Config"
-msgstr "Recarregar configurações"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Logout"
-msgstr "Sair"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1761
-msgid "From:"
-msgstr "De:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Para:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "De"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Para"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Subject:"
-msgstr "Assunto:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Novo anexo:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Assunto"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Anexar arquivo"
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Anexar outro arquivo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Carregar arquivo"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr "Anexos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Anexos:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Apagar anexos selecionados"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1642
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Usuário"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Senha"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1648
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Host"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
-msgid "POP3-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
 msgstr "Porta POP3"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "SMTP-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
 msgstr "Porta SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1653
-msgid "Reset"
-msgstr "Resetar"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Ler correio offline"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Configurações"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Conheça o correio da rede I2P"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Criar uma conta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Really delete the marked messages?"
-msgstr "Quer mesmo deletar as mensagens marcadas?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Yes, really delete them!"
-msgstr "Sim, quero deletá-las!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1669
-#: src/src/i2p/susi/webmail/WebMail.java:1748
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Novo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
-msgid "Reply"
-msgstr "Responder"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply All"
-msgstr "Responder todos"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Forward"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Delete"
-msgstr "Deletar"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Verificar correio"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1678
-msgid "Sender"
-msgstr "Remetente"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Subject"
-msgstr "Assunto"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Sair"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1680
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Data"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1707
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "{0} bytes"
-msgstr[1] "{0} Byt"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Sem mensagens"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Quer mesmo deletar as mensagens marcadas?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Sim, quero deletá-las!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Marcar todos"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
-msgid "Invert Selection"
-msgstr "Inverter seleção"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Clear"
-msgstr "Limpar"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Primeiro"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1753
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Página {0} de {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Último"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Próximo"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1725
-msgid "Pagesize:"
-msgstr "Tamanho da página:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Set"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Quer mesmo deletar esta mensagem?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Sim, quero deletá-lo!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Responder"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Responder todos"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Deletar"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Voltar para pasta"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "Date:"
-msgstr "Data:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Não foi possível recuperar o correio."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Configurações avançadas"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Salvar configurações"
+
+#. 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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+msgid "Login failed"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Não é possível conectar"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_ro.po b/apps/susimail/locale/messages_ro.po
index fcbc987c96cef06a219aa0098c0d07f7aecc196f..e9e785d97a130f1cdfa5756df6f0658dc2e13941 100644
--- a/apps/susimail/locale/messages_ro.po
+++ b/apps/susimail/locale/messages_ro.po
@@ -2,170 +2,181 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
-# CimpianAlin <Predator@windowslive.com>, 2013
-# polearnik <polearnik@mail.ru>, 2013
+# CimpianAlin <inactive+CimpianAlin@transifex.com>, 2013
+# pol polearnik <polearnik@mail.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:03+0000\n"
-"PO-Revision-Date: 2013-11-11 12:42+0000\n"
-"Last-Translator: polearnik <polearnik@mail.ru>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/"
-"ro/)\n"
-"Language: ro\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:443
-msgid "unknown"
-msgstr "necunoscut"
-
-#: src/src/i2p/susi/webmail/WebMail.java:462
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Atenție: nu sa găsit transfer codat, revenire la 7bit."
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:467
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Nici un encoder găsit pentru codificarea \\'' {0} \\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:473
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "necunoscut"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Atenție: nu sa găsit setul de caractere, revenire la US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:487
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Set de caractere \\'' {0} \\'' nu este suportat."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Partea ({0}) nu apare, din cauza {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-msgid "Download"
-msgstr "Descarcă"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Fișier este ambalat într-o arhiva zip pentru motive de securitate."
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-#, java-format
-msgid "attachment ({0})."
-msgstr "atașament ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Atașament ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:568
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Aveți nevoie de nume de utilizator pentru autentificare."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Aveți nevoie de parolă pentru autentificare."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Aveți nevoie de nume de gazdă pentru conectare."
 
-#: src/src/i2p/susi/webmail/WebMail.java:581
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Aveți nevoie de numărul de port la POP3 pentru conectare."
 
-#: src/src/i2p/susi/webmail/WebMail.java:588
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Numărul de port POP3 nu este în intervalul 0 .. 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Numărul de port POP3 este invalid."
 
-#: src/src/i2p/susi/webmail/WebMail.java:600
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Aveți nevoie de numărul de port pentru SMTP pentru conectare."
 
-#: src/src/i2p/susi/webmail/WebMail.java:607
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Numărul de port SMTP nu este în intervalul 0 .. 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Numărul de port SMTP este invalid."
 
-#: src/src/i2p/susi/webmail/WebMail.java:660
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Utilizatorul sa deconectat."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Eroare internă, conexiune pierdută."
 
-#: src/src/i2p/susi/webmail/WebMail.java:760
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Pe {0} {1} a scris:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:807
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "începe transmiterea la e-mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:829
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "sfârșește transmiterea la e-mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:836
-#: src/src/i2p/susi/webmail/WebMail.java:1769
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Nu poate prelua corpul la e-mail."
 
-#: src/src/i2p/susi/webmail/WebMail.java:864
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID-ul mesajului nu este valabil."
 
-#: src/src/i2p/susi/webmail/WebMail.java:947
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Nu sa găsit nici o codificare la {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Nu pot codifica datele: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:956
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Eroare la citirea fișierului încărcat: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1034
-msgid "Error parsing download parameter."
-msgstr "Eroare de analiză la descărcarea parametrului."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1078
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Număr invalid la dimensiunea paginii, resetare la valoarea implicită."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1102
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Nu sunt mesaje marcate pentru ștergere."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1122
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Eroare la ștergerea mesajului: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1133
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
@@ -173,12 +184,21 @@ msgstr[0] "mesaj sters"
 msgstr[1] "{0} mesaje sterse"
 msgstr[2] "{0} mesaje sterse"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1314
-#: src/src/i2p/susi/webmail/WebMail.java:1653
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Autentificare"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1316
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
@@ -186,267 +206,328 @@ msgstr[0] "{0} mesaj"
 msgstr[1] "{0} mesaje"
 msgstr[2] "{0} mesaje"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1318
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Arată mesajul"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1384
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Eroare decodare conținut: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1389
-msgid "Error decoding content: No encoder found."
-msgstr "Eroare conținut decodare: Nu sa găsit codificator."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1436
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "fară subiect"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1453
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Nu sa găsit nici o adresă de expeditor valabilă."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1459
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Nu sa găsit nici o adresă valabilă în \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1478
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Nici un destinatar găsit."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1485
-msgid "Quoted printable encoder not available."
-msgstr "Codificatorul imprimabil citat nu este valabil."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1490
-msgid "Header line encoder not available."
-msgstr "Linie antet codificator nu este valabil."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Mail trimis."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Trimite"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Anulează"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Ștergeți Atașament"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1675
-#: src/src/i2p/susi/webmail/WebMail.java:1756
-msgid "Reload Config"
-msgstr "Reîncarcă Configurația"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Logout"
-msgstr "Ieșire"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1761
-msgid "From:"
-msgstr "De la:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Pentru:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Subject:"
-msgstr "Subiect:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc pentru mine"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Atașament nou:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Subiect"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr ""
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Încărcați fișier"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Atașamente:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1642
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Utilizator"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Parola"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1648
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Gazdă"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
-msgid "POP3-Port"
-msgstr "POP3-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "SMTP-Port"
-msgstr "SMTP-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1653
-msgid "Reset"
-msgstr "Reset"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Aflați mai multe despre e-mail I2P"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Creați un cont"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Really delete the marked messages?"
-msgstr "Sigur ștergeți mesajele marcate?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Yes, really delete them!"
-msgstr "Da, într-adevăr ștergeți-le!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1669
-#: src/src/i2p/susi/webmail/WebMail.java:1748
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Nou"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
-msgid "Reply"
-msgstr "Replică"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply All"
-msgstr "Răspunde la toate"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Forward"
-msgstr "Înaintare"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Delete"
-msgstr "Șterge"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Verifica e-mail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1678
-msgid "Sender"
-msgstr "Expeditor"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Subject"
-msgstr "Subiect"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Ieșire"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1680
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Data"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1707
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "{0} Byte"
-msgstr[1] "{0} Bytes"
-msgstr[2] "{0} Bytes"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Sigur ștergeți mesajele marcate?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Da, într-adevăr ștergeți-le!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Marchează toate"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
-msgid "Invert Selection"
-msgstr "Inversează selecția"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Clear"
-msgstr "Goliți"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Primul"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1753
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Pagina {0} din {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Ultimul"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Următorul"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1725
-msgid "Pagesize:"
-msgstr "Dimensiune pagină:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Set"
-msgstr "Setează"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "într-adevăr  doriti sa stergeti acest mesaj?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1736
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Da, într-adevăr se șterge!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Replică"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Răspunde la toate"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Înaintare"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Șterge"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Înapoi la Dosar"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "Date:"
-msgstr "Data:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Nu pot prelua mail."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Setează"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+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
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_ru.po b/apps/susimail/locale/messages_ru.po
index 821e5813ab35bb3b7bcae7ed13fe826df6ee4ea9..94c01edac9f872b6cc7b76a592f277aa204e89ec 100644
--- a/apps/susimail/locale/messages_ru.po
+++ b/apps/susimail/locale/messages_ru.po
@@ -6,13 +6,13 @@
 # Translators:
 # foo <foo@bar>, 2009
 # gmind, 2012
-# yume, 2014
+# yume, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-07-25 21:21+0000\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 11:01+0000\n"
 "Last-Translator: yume\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -26,152 +26,158 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Для кодировки \\''{0}\\'' не найден кодек."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "неизвестно"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Предупреждение: кодировка непонятна, переключаемся в US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Кодировка \\''{0}\\'' не поддерживается."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Часть ({0}) не отображена из-за {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Скачать вложение {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Файл запакован в zip-архив из соображений безопасности."
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Вложение ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Требуется имя пользователя для аутентификации."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Требуется пароль для аутентификации."
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Требуется имя хоста для соединений."
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Требуется номер порта для pop3 соединений."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Номер POP3-порта не в диапазоне 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Номер POP3-порта некорректный."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Требуется номер порта для smtp соединений."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Номер SMTP-порта не в диапазоне 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Номер SMTP-порта некорректный."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Пользователь отключился."
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Внутренняя ошибка, соединение потеряно."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "В сообщении от {0} {1} написал(a):"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "начало пересланного сообщения"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "конец пересланного сообщения"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Не удалось скачать тело сообщения."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Message id некорректен."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Конфигурация перезагружена"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Не найдена кодировка для {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Не удаётся закодировать данные: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Ошибка при чтении загруженного файла: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Вложение не найдено."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "Сообщение не найдено."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Некорректный размер страницы, устанавливается значение по умолчанию."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Не отмечено сообщений для удаления."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
@@ -179,12 +185,12 @@ msgstr[0] "{0} сообщение удалено."
 msgstr[1] "{0} сообщения удалено."
 msgstr[2] "{0} сообщений удалены."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Конфигурация сохранена"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Логин"
 
@@ -193,7 +199,7 @@ msgstr "Логин"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
@@ -201,147 +207,147 @@ msgstr[0] "{0} сообщение"
 msgstr[1] "{0} сообщения"
 msgstr[2] "{0} сообщений"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Покзать сообщение"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Новое письмо"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Письмо не было отправлено. Отменить его?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Ошибка при декодировании контента: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "без темы"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Не найдено корректного адреса отправителя."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Не найдено корректного адреса в \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Не найдено получателей."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Сообщение отправлено."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Отправить"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "От"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "Кому"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Копия"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Скрытая копия"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Послать скрытую копию самому себе"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Тема"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Прикрепить файл"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Прикрепить ещё один файл"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Приложенные файлы"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Удалить выбранные файлы"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Пользователь"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Пароль"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Хост"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "POP3-порт"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Читать почту в автономном режиме"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Узнать об I2P почте"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Создать учётную запись"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Новое"
 
@@ -351,155 +357,159 @@ msgstr "Новое"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Проверить почту"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Выйти"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Дата"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Размер"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Новое письмо"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Письмо с вложением"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Письмо является спамом"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Нет входящих сообщений"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "Действительно удалить отмеченые сообщения?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Да, действительно удалить!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Удалить выбранное"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Отметить всё"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Удалить все"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Первое"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Предыдущее"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Страница {0} из {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Последнее"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Следующее"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Действительно удалить это сообщение?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Да, удалить это!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Ответить всем"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "Сохранить"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Вернуться к папке"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Не удалось скачать почту."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Количество писем на странице"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Установить"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Расширенная конфигурация"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 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:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "Нет ответа от сервера"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Ошибка соединения с сервером"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: 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:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "Ошибка входа"
diff --git a/apps/susimail/locale/messages_sq.po b/apps/susimail/locale/messages_sq.po
new file mode 100644
index 0000000000000000000000000000000000000000..16888a368c9cd77b4f6a62242233988070d9dfc6
--- /dev/null
+++ b/apps/susimail/locale/messages_sq.po
@@ -0,0 +1,530 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susimail package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Shpetim <shpetim@privacysolutions.no>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/I2P/language/sq/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/src/i2p/susi/webmail/MailPart.java:207
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
+msgstr "Nuk gjindet koduesi për të koduar \\''{0}\\''."
+
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr "Re:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr "Fwd:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "I panjohur"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
+msgid "Warning: no charset found, fallback to US-ASCII."
+msgstr "Vërejtje: nuk gjindet shenjetorja, kthehem në US-ASCII."
+
+#: src/src/i2p/susi/webmail/WebMail.java:614
+#, java-format
+msgid "Charset \\''{0}\\'' not supported."
+msgstr "Shenjëtorja \\''{0}\\'' nuk përkrahet."
+
+#: src/src/i2p/susi/webmail/WebMail.java:618
+#, java-format
+msgid "Part ({0}) not shown, because of {1}"
+msgstr "Pjesa ({0}) nuk shfaqet, për arsye të {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr "Shkarko shtojcën {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:658
+msgid "File is packed into a zipfile for security reasons."
+msgstr "Fili është paluar në zipfile për arsye sigurie."
+
+#: src/src/i2p/susi/webmail/WebMail.java:663
+#, java-format
+msgid "Attachment ({0})."
+msgstr "Shtojca ({0})."
+
+#: src/src/i2p/susi/webmail/WebMail.java:714
+msgid "Need username for authentication."
+msgstr "Duhet emrin për vërtetim."
+
+#: src/src/i2p/susi/webmail/WebMail.java:718
+msgid "Need password for authentication."
+msgstr "Duhet fjalëkalimi për vërtetim."
+
+#: src/src/i2p/susi/webmail/WebMail.java:722
+msgid "Need hostname for connect."
+msgstr "Duhet hostname për lidhje."
+
+#: src/src/i2p/susi/webmail/WebMail.java:727
+msgid "Need port number for pop3 connect."
+msgstr "Duhet numri i portales për lidhje në pop3."
+
+#: src/src/i2p/susi/webmail/WebMail.java:734
+msgid "POP3 port number is not in range 0..65535."
+msgstr "Numri i portales së POP3'së nuk arritet 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:740
+msgid "POP3 port number is invalid."
+msgstr "Numri i portales së POP3'së është invalid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:746
+msgid "Need port number for smtp connect."
+msgstr "Duhet numri i portales për të lidhur smtp."
+
+#: src/src/i2p/susi/webmail/WebMail.java:753
+msgid "SMTP port number is not in range 0..65535."
+msgstr "Numri i portales së SMTP'së nuk arritet 0..65535."
+
+#: src/src/i2p/susi/webmail/WebMail.java:759
+msgid "SMTP port number is invalid."
+msgstr "Numri i portales së SMTP'së është invalid."
+
+#: src/src/i2p/susi/webmail/WebMail.java:833
+msgid "User logged out."
+msgstr "Përdoruesi është jashtkyqur. "
+
+#: src/src/i2p/susi/webmail/WebMail.java:836
+msgid "Internal error, lost connection."
+msgstr "Gabim brendësor, u shkëput lidhja."
+
+#: src/src/i2p/susi/webmail/WebMail.java:993
+#, java-format
+msgid "On {0} {1} wrote:"
+msgstr "Ditën e {0} {1} shkroi:"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1040
+msgid "begin forwarded mail"
+msgstr "fillo e-postin përcjellës"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1062
+msgid "end forwarded mail"
+msgstr "përfundo e-postin përcjellës"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
+msgid "Could not fetch mail body."
+msgstr "Nuk mund të sjell përmbajtjen e e-postit."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1099
+msgid "Message id not valid."
+msgstr "Mesazhi nuk është i vlefshëm."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr "Konfigurimi u ringarkua"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
+#, java-format
+msgid "No Encoding found for {0}"
+msgstr "Nuk gjindet Kodimi për {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1202
+#, java-format
+msgid "Could not encode data: {0}"
+msgstr "Nuk mund të kodojë të dhënat: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1207
+#, java-format
+msgid "Error reading uploaded file: {0}"
+msgstr "Gabim në leximin e filit të ngarkuar: {0}"
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr "Nuk gjindet shtojca."
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
+msgid "Invalid pagesize number, resetting to default value."
+msgstr "Numri i madhësisë së faqes invalid, duke u rivendosur në vlerën e parazgjedhur."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1393
+msgid "No messages marked for deletion."
+msgstr "Nuk ka mesazhe të shenjuara për fshirje."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1409
+#, java-format
+msgid "1 message deleted."
+msgid_plural "{0} messages deleted."
+msgstr[0] "1 mesazh është fshirë."
+msgstr[1] "{0} mesazhe janë fshirë."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr "Konfigurimi është ruajtur"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
+msgid "Login"
+msgstr "Login"
+
+#. 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:1701
+#, java-format
+msgid "1 Message"
+msgid_plural "{0} Messages"
+msgstr[0] "1 Mesazh"
+msgstr[1] "{0} Mesazhe"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1707
+msgid "Show Message"
+msgstr "Shfaqe Mesazhin"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr "Mesazh i ri"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr "Konfigurimi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr "SusiMail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr "Mesazhi nuk u dërgua. Doni ta hudhni atë?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
+#, java-format
+msgid "Error decoding content: {0}"
+msgstr "Gabim në kodimin e përmbajtjes: {0}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1905
+msgid "no subject"
+msgstr "pa titull"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1922
+msgid "Found no valid sender address."
+msgstr "Nuk gjej adresë dërguese të vleshme."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1928
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
+msgstr "Nuk gjej adresë të vlefshme në \\''{0}\\''."
+
+#: src/src/i2p/susi/webmail/WebMail.java:1949
+msgid "No recipients found."
+msgstr "Nuk gjej marrës."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2013
+msgid "Mail sent."
+msgstr "Posti u dërgua"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2057
+msgid "Send"
+msgstr "Dërgo"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
+msgid "Cancel"
+msgstr "Anulo"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr "Nga"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr "Te"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr "Cc"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr "Bcc"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2105
+msgid "Bcc to self"
+msgstr "Bcc të vetëvetja"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Tema"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr "Ngjite Shtojcën"
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr "Ngjite një shtojcë tjetër"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr "Shtojcat"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr "Fshij shtojcat e shenjuara"
+
+#. current postman hq length limits 16/12, new postman version 32/32
+#: src/src/i2p/susi/webmail/WebMail.java:2145
+msgid "User"
+msgstr "Përdorues"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2146
+msgid "Password"
+msgstr "Fjalëkalimi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2151
+msgid "Host"
+msgstr "Host"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr "Portalja e POP3'së"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr "Portalja e SMTP'së"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr "Lexo E-postin Offline"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr "Cilësimet"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2165
+msgid "Learn about I2P mail"
+msgstr "Mëso për I2P mail"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2166
+msgid "Create Account"
+msgstr "Krijo Llogari"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
+msgid "New"
+msgstr "I ri / e re"
+
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
+msgid "Check Mail"
+msgstr "Shiko E-postin"
+
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Logout"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
+msgid "Date"
+msgstr "Data"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2205
+msgid "Size"
+msgstr "Madhësia"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr "Mesazhi është i ri"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr "Mesazhi ka një shtojcë"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr "Mesazhi është spam"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr "Nuk ka mesazhe"
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Vërtet fshij mesazhet e shenjuara?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Po, vërtet fshij ata!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr "Fshirja Zgjedhur"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
+msgid "Mark All"
+msgstr "Shenjo të Gjitha"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr "Pastro të Gjitha"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+msgid "First"
+msgstr "Së pari"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
+msgid "Previous"
+msgstr "Mëparshme"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2307
+#, java-format
+msgid "Page {0} of {1}"
+msgstr "Faqja {0} e {1}"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+msgid "Last"
+msgstr "Së fundi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
+msgid "Next"
+msgstr "Tjetër"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Really delete this message?"
+msgstr "Vërtet fshij mesazhin?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2323
+msgid "Yes, really delete it!"
+msgstr "Po, vërtet fshije atë!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Përgjigju"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Përgjigju të Gjithave"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Përcjelle"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Fshij"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
+msgid "Back to Folder"
+msgstr "Prapa te Folderi"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2371
+msgid "Could not fetch mail."
+msgstr "Nuk mund të sjell e-postin."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr "Madhësia e Faqes së Folderit"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Vë"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr "Konfigurim i avancuar"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Save Configuration"
+msgstr "Ruaj Konfigurimin"
+
+#. 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
+msgid "No response from server"
+msgstr "Nuk ka përgjegjje nga serveri"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr "Gabim lidhje me serverin"
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr "Gabim në hapjen e mailbox'it."
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr "Login dështoi"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr "Nuk mund të lidhem"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr "Serveri refuzoi lidhjen"
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr "E-posti nuk u pranua"
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr "Gabim dërgimi të e-postit"
diff --git a/apps/susimail/locale/messages_sv.po b/apps/susimail/locale/messages_sv.po
index 4e6480f22bf71195e14580c9b9a24d771f09e61e..480ff145018ad73e55ab3d71d175eb2b9e911d7d 100644
--- a/apps/susimail/locale/messages_sv.po
+++ b/apps/susimail/locale/messages_sv.po
@@ -2,447 +2,529 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
-# Martin Svensson <digitalmannen@gmail.com>, 2011.
+# Martin Svensson <digitalmannen@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-01 20:05+0000\n"
-"PO-Revision-Date: 2011-12-13 14:16+0000\n"
-"Last-Translator: Martin Svensson <digitalmannen@gmail.com>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/"
-"team/sv_SE/)\n"
-"Language: sv_SE\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:447
-msgid "unknown"
-msgstr "okänd"
-
-#: src/src/i2p/susi/webmail/WebMail.java:466
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr ""
-"Varning: ingen överförings kodning hittats, återgår till att använda 7bit."
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:471
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Ingen encoder hittades för kodning \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:477
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "okänd"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Varning: ingen teckenuppsättning hittats, återgår till US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Teckenuppsättning \\''{0}\\' stöds inte."
 
-#: src/src/i2p/susi/webmail/WebMail.java:495
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Del ({0}) visas inte på grund av {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-msgid "Download"
-msgstr "Hämta"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Filen packas till zipfil av säkerhetsskäl."
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-#, java-format
-msgid "attachment ({0})."
-msgstr "bilaga ({0})."
-
-#: src/src/i2p/susi/webmail/WebMail.java:522
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Bilaga ({0})."
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Behöver användarnamn för autentisering."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Behöver lösenord för autentisering."
 
-#: src/src/i2p/susi/webmail/WebMail.java:580
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Behöver värd namn för att ansluta."
 
-#: src/src/i2p/susi/webmail/WebMail.java:585
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Behöver portnummer för POP3 anslutning."
 
-#: src/src/i2p/susi/webmail/WebMail.java:592
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 portnummer är inte inom intervallet 0 .. 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:598
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3 portnummer är ogiltigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:604
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Behöver portnummer för SMTP anslutning."
 
-#: src/src/i2p/susi/webmail/WebMail.java:611
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP portnumret är inte inom intervallet 0 .. 65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP portnummer ör ogiltigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Användare loggade ut."
 
-#: src/src/i2p/susi/webmail/WebMail.java:668
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Internt fel, tappade anslutningen."
 
-#: src/src/i2p/susi/webmail/WebMail.java:764
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Den {0} {1} skrev:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:811
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "börjar vidarebefordra e-post"
 
-#: src/src/i2p/susi/webmail/WebMail.java:833
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "slutar vidarebefordra e-post"
 
-#: src/src/i2p/susi/webmail/WebMail.java:840
-#: src/src/i2p/susi/webmail/WebMail.java:1775
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Kunde inte hämta e-postets brödtext."
 
-#: src/src/i2p/susi/webmail/WebMail.java:868
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "Meddelande id är inte giltigt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Ingen teckenkodning hittades för {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:955
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Kunde inte koda data: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:960
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Fel vid läsning av uppladdad fil: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1038
-msgid "Error parsing download parameter."
-msgstr "Fel vid tolkning av nedladdnings parameter."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1082
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Ogiltigt sidstorleks antal, återställer till standard värde."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1106
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Inga meddelanden var märkta för radering"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1126
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Fel vid raderande av meddelande: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1137
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "1 meddelande raderart."
 msgstr[1] "{0} meddelanden raderade"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1318
-#: src/src/i2p/susi/webmail/WebMail.java:1659
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Logga in"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1320
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "1 meddelande"
 msgstr[1] "{0} meddelanden"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Visa meddelande"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1388
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Fel vid avkodning av innehåll: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1393
-msgid "Error decoding content: No encoder found."
-msgstr "Fel vid avkodning av innehåll: Ingen encoder hittades."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1440
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "inget ämne"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1457
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Hittade ingen giltig avsändaradress."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1463
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Hittade ingen giltig adress i \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1482
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Inga mottagare funna"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1489
-msgid "Quoted printable encoder not available."
-msgstr "Citerad utskrivbar encoder inte tillgänglig."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1494
-msgid "Header line encoder not available."
-msgstr "Header radens encoder är inte tillgänglig."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1545
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "E-post skickat"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1584
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Skicka"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1585
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1586
-msgid "Delete Attachment"
-msgstr "Radera bilaga"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1587
-#: src/src/i2p/susi/webmail/WebMail.java:1681
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "Reload Config"
-msgstr "Ladda om konfiguration"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1588
-#: src/src/i2p/susi/webmail/WebMail.java:1682
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Logout"
-msgstr "Logga ut"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1611
-#: src/src/i2p/susi/webmail/WebMail.java:1767
-msgid "From:"
-msgstr "Från:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1612
-msgid "To:"
-msgstr "Till:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1613
-msgid "Cc:"
-msgstr "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1615
-#: src/src/i2p/susi/webmail/WebMail.java:1769
-msgid "Subject:"
-msgstr "Ärende:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1616
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc till själv"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1619
-msgid "New Attachment:"
-msgstr "Ny bilaga:"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Ärende"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1619
-msgid "Upload File"
-msgstr "Ladda upp fil"
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1625
-msgid "Attachments:"
-msgstr "Bilagor:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1648
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Användare"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Värd"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
-msgid "POP3-Port"
-msgstr "POP3-port"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1656
-msgid "SMTP-Port"
-msgstr "SMTP-port"
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1659
-msgid "Reset"
-msgstr "Återställ"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1660
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Lär mer om I2P e-post"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1661
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Skapa konto"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-msgid "Really delete the marked messages?"
-msgstr "Vill du verkligen radera valda meddelanden?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-msgid "Yes, really delete them!"
-msgstr "Ja, radera dem!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1675
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Ny"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1755
-msgid "Reply"
-msgstr "Svara"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1677
-#: src/src/i2p/susi/webmail/WebMail.java:1756
-msgid "Reply All"
-msgstr "Svara alla"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1678
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Forward"
-msgstr "Vidarebefodera"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-#: src/src/i2p/susi/webmail/WebMail.java:1758
-msgid "Delete"
-msgstr "Radera"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1680
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Kolla e-post"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
-msgid "Sender"
-msgstr "Avsändare"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1685
-msgid "Subject"
-msgstr "Ärende"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Logga ut"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Datum"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1687
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Storlek"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "1 Byte"
-msgstr[1] "{0} Bytes"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Vill du verkligen radera valda meddelanden?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Ja, radera dem!"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Markera alla"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1719
-msgid "Invert Selection"
-msgstr "Invertera urvalet"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1720
-msgid "Clear"
-msgstr "Rensa "
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1724
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Första"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1724
-#: src/src/i2p/susi/webmail/WebMail.java:1759
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1725
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Sida {0} av {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-#: src/src/i2p/susi/webmail/WebMail.java:1728
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Sista"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-#: src/src/i2p/susi/webmail/WebMail.java:1728
-#: src/src/i2p/susi/webmail/WebMail.java:1760
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Nästa"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1731
-msgid "Pagesize:"
-msgstr "Pagesize:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1732
-msgid "Set"
-msgstr "Ställ"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1742
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Vill du verkligen radera detta meddelande?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1742
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Ja, radera det verkligen!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1761
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Svara"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Svara alla"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Vidarebefodera"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Radera"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Tillbaka till mapp"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1768
-msgid "Date:"
-msgstr "Datum:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1779
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Kunde inte hämta e-post."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Ställ"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+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
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_uk.po b/apps/susimail/locale/messages_uk.po
index 3e2a369188d54ef14d7542dd236d0b0f067ef6a5..d24ff3b84acf52403a5b304637aec8b2c3f4ffa9 100644
--- a/apps/susimail/locale/messages_uk.po
+++ b/apps/susimail/locale/messages_uk.po
@@ -8,13 +8,14 @@
 # Denis Blank <gribua@gmail.com>, 2011
 # Denis Blank <gribua@gmail.com>, 2011
 # LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-08-12 23:11+0000\n"
-"Last-Translator: 007 <Andrik007d@rambler.ru>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,152 +28,158 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Не знайдено кодировщик для кодування \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "Re:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "Невідомий"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Попередження: незрозуміле кодування, повертаємось до US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Кодування \\''{0}\\'' не підтримується."
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
-msgstr "Частина ({0}) не показана, тому що {1}"
+msgstr "Частина ({0}) не показана тому, що {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "Завантажити прикріплені файли {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Файл запакований в zipfile з міркувань безпеки"
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
-msgstr "Прикріплення Attachment ({0})"
+msgstr "Прикріплення ({0})"
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Необхідне ім'я користувача для авторизації."
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Необхідний пароль для авторизації."
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Необхідне ім'я хоста для з'єднання."
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Необхідний вказати порт для pop3 з'єднання."
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3 порт може бути лише в числовому проміжку 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3 порт вказаний не вірно."
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Необхідно вказати порт для smtp з'єднання."
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP порт може бути лише в числовому проміжку 0..65535."
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP порт вказаний не вірно."
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Користувач вийшов."
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Внутрішня помилка, з'єднання закрито."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "В повідомленні від {0}{1} написав(-ла):"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "початок пересланого листа"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "кінець пересланого листа"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Не вдалося отримати текст листа."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "id повідомлення не дійсний."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "Конфігурація перезавантажена"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Не знайдено кодировщика для {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Не можливо кодувати данні: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Помилка читання завантаженого файла: {0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "Прикріплені файли не знайдені"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Не дійсний розмір сторінки, скудую до параметру за замовчуванням"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Не позначені повідомлення для видалення."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
@@ -180,12 +187,12 @@ msgstr[0] "{0} повідомлення видалено."
 msgstr[1] "{0} повідомлення видалено.{0}"
 msgstr[2] "{0} повідомлень видалено."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "Конфігурація збережена"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Логін"
 
@@ -194,7 +201,7 @@ msgstr "Логін"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
@@ -202,147 +209,147 @@ msgstr[0] "{0} Повідомлення"
 msgstr[1] "{0} Повідомлення"
 msgstr[2] "{0} Повідомлень"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Показати повідомлення"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "Нове повідомлення"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "Повідомлення не було надіслано. Ви хочете його відмінити?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Помилка декодування вмісту: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "без теми"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Адреса відправника не дійсна."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Знайдена не дійсна адреса в  \\''{0}\\''."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Одержувачів не знайдено."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Лист надісланий."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Відправити"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
-msgstr "From"
+msgstr "Від"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
-msgstr "To"
+msgstr "Кому"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "Cc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Відправляти приховану копію самому собі"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "Тема"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "Прикріпити файли"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "Прикріпити інші файли"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "Прикріплені файли"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "Видалити обрані прикріплені файли"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Користувач"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "Пароль"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Хост"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "Порт POP3"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "Порт SMTP"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "Читати пошту офлайн"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "Налаштування"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "Дізнатись про I2P пошту"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Створити обліковий запис"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Новий"
 
@@ -352,155 +359,159 @@ msgstr "Новий"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Перевірити пошту"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "Вийти"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Дата"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Розмір"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "Нове повідомлення"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "Повідомлення містить прикріплені файли"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "Повідомлення є спамом"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "Немає повідомлень"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "Ви дійсно хочете видалити позначені повідомлення?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "Так, дійсно видалити їх!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "Видалити обрані"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Позначити всі"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "Очистити все"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Перше"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Попереднє"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Сторінка {0} з {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Останнє"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Наступне"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Ви дійсно хочете видалити ці повідомлення?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Так, дійсно видалити це!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "Відповісти всім"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Назад в Папку"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Не змогли отримати пошту."
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "Кількість листів на сторінці"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "Встановити"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "Розширена конфігурація"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 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:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "Немає відповіді від сервера"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "Помилка з'єднання з сервером"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: 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:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "Помилка входу"
diff --git a/apps/susimail/locale/messages_vi.po b/apps/susimail/locale/messages_vi.po
index 5656f03a20ec05bbb620790b4d72055c73ae4264..4c72fd72d03f33eeb808fd10713ba1e1f3f35985 100644
--- a/apps/susimail/locale/messages_vi.po
+++ b/apps/susimail/locale/messages_vi.po
@@ -2,442 +2,527 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the susimail package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
-# dich_tran <tran.nathan@gmail.com>, 2011.
+# 
+# Translators:
+# dich_tran <thnhan@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-19 23:06+0000\n"
-"PO-Revision-Date: 2011-04-14 07:47+0000\n"
-"Last-Translator: dich_tran <tran.nathan@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/"
-"vi/)\n"
-"Language: vi\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-06 18:33+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: src/src/i2p/susi/webmail/WebMail.java:447
-msgid "unknown"
-msgstr "không biết"
-
-#: src/src/i2p/susi/webmail/WebMail.java:466
-msgid "Warning: no transfer encoding found, fallback to 7bit."
-msgstr "Cảnh báo: không thấy bộ mã chuyển nào, trở lại dùng 7bit."
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:471
+#: src/src/i2p/susi/webmail/MailPart.java:207
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "Không tìm bộ mã hóa cho bộ \\\"{0}\\\""
 
-#: src/src/i2p/susi/webmail/WebMail.java:477
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
+msgid "Re:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:579
+msgid "unknown"
+msgstr "không biết"
+
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "Cảnh báo: không thấy bộ chữ nào, trở lại dùng US-ASCII."
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "Bộ mã \\\"{0}\\\" không dùng được."
 
-#: src/src/i2p/susi/webmail/WebMail.java:495
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "Phần ({0}) không hiển thị, vì {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-msgid "Download"
-msgstr "Tải xuống"
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "Tập tin được nén lại dạng zip vì lý do an ninh."
 
-#: src/src/i2p/susi/webmail/WebMail.java:518
-#, java-format
-msgid "attachment ({0})."
-msgstr "đính kèm ({0})"
-
-#: src/src/i2p/susi/webmail/WebMail.java:522
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "Đính kèm ({0})"
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "Cần tên người dùng để xác thực."
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "Cần mật khẩu để xác thực."
 
-#: src/src/i2p/susi/webmail/WebMail.java:580
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "Cần tên máy chủ để nối vào."
 
-#: src/src/i2p/susi/webmail/WebMail.java:585
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "Cần số cổng để nối qua pop3."
 
-#: src/src/i2p/susi/webmail/WebMail.java:592
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "Số cổng POP3 không trong khoảng 0..65535"
 
-#: src/src/i2p/susi/webmail/WebMail.java:598
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "Số cổng POP3 không đúng."
 
-#: src/src/i2p/susi/webmail/WebMail.java:604
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "Cần số cổng để nối smtp."
 
-#: src/src/i2p/susi/webmail/WebMail.java:611
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "Số cổng SMTP không trong khoảng 0..65535"
 
-#: src/src/i2p/susi/webmail/WebMail.java:617
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "Số cổng SMTP không đúng."
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "Người dùng đã đăng xuất."
 
-#: src/src/i2p/susi/webmail/WebMail.java:668
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "Lỗi nội tại, mất đường nối."
 
-#: src/src/i2p/susi/webmail/WebMail.java:764
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "Vào {0} {1} viết:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:811
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "Bắt đầu email chuyển tiếp "
 
-#: src/src/i2p/susi/webmail/WebMail.java:833
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "Chấm dứt email chuyển tiếp"
 
-#: src/src/i2p/susi/webmail/WebMail.java:840
-#: src/src/i2p/susi/webmail/WebMail.java:1770
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "Không thể lấy thân bài email."
 
-#: src/src/i2p/susi/webmail/WebMail.java:868
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "ID của thư không đúng"
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1137
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "Không tìm thấy bộ mã cho {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:955
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "Không thể đổi dạng dữ kiện: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:960
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "Lỗi đọc tập tin tải lên: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1038
-msgid "Error parsing download parameter."
-msgstr "Lỗi không hiểu các thông số tải xuống."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1082
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "Khổ trang không đúng, trở lại giá trị mặc định."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1106
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "Không có thư nào chờ xóa."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1126
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr "Lỗi xóa thư: {0}"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1137
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "{0} thư đã bị xóa."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1313
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:1476
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1315
+#. 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:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "{0} Thư"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1317
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "Hiển Thị Thư"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1383
+#: src/src/i2p/susi/webmail/WebMail.java:1709
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1711
+msgid "Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1722
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1735
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "Lỗi giải mã nội dung: {0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1388
-msgid "Error decoding content: No encoder found."
-msgstr "Lỗi giải mã nội dung: Không tìm thấy bộ mã hóa."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1435
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "không chủ đề"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1452
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "Không tìm thấy địa chỉ người gửi."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1458
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "Không tìm thấy địa chỉ người gửi trong \\\"{0}\\\""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1477
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "Không thấy người nhận."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1484
-msgid "Quoted printable encoder not available."
-msgstr "Bộ mã hóa quoted-printable không có."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1489
-msgid "Header line encoder not available."
-msgstr "Bộ mã hóa header không có."
-
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "Thư đã gửi."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "Gửi."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "Hủy"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr "Xóa đính kèm"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Reload Config"
-msgstr "Nạp lại cấu hình"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1677
-#: src/src/i2p/susi/webmail/WebMail.java:1758
-msgid "Logout"
-msgstr "Đăng xuất"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "From:"
-msgstr "Từ:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
-msgstr "Tới:"
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
+msgid "From"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
-msgstr "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2102
+msgid "To"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
-msgstr "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2103
+msgid "Cc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1764
-msgid "Subject:"
-msgstr "Chủ đề:"
+#: src/src/i2p/susi/webmail/WebMail.java:2104
+msgid "Bcc"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "Bcc cho mình"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
-msgstr "Đính kèm mới"
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
+msgid "Subject"
+msgstr "Chủ đề"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2109
+msgid "Add Attachment"
+msgstr ""
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2111
+msgid "Add another attachment"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
-msgstr "Tải tập tin lên"
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Attachments"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
-msgstr "Đính kèm:"
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+msgid "Delete selected attachments"
+msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "Người dùng"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1644
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
-msgstr "Qua"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "Máy chủ"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "POP3-Port"
-msgstr "Cổng-POP3"
+#: src/src/i2p/susi/webmail/WebMail.java:2152
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2153
+msgid "SMTP Port"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1651
-msgid "SMTP-Port"
-msgstr "Cổng-SMTP"
+#: src/src/i2p/susi/webmail/WebMail.java:2158
+msgid "Read Mail Offline"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
-msgid "Reset"
-msgstr "Chỉnh lại"
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
+msgid "Settings"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1656
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "Tạo tài khoản"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Really delete the marked messages?"
-msgstr "Thực sự xóa các thư đánh dấu?"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1668
-msgid "Yes, really delete them!"
-msgstr "Vâng, hãy xóa chúng!"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "Mới"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply"
-msgstr "Trả lời"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Reply All"
-msgstr "Trả lời tất cả"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Forward"
-msgstr "Chuyển tiếp"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1674
-#: src/src/i2p/susi/webmail/WebMail.java:1753
-msgid "Delete"
-msgstr "Xóa"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1675
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "Lấy thư"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Sender"
-msgstr "Người gửi"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1680
-msgid "Subject"
-msgstr "Chủ đề"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2189
+msgid "Logout"
+msgstr "Đăng xuất"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "Ngày"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1682
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1708
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] "{0} Byte(s)"
+#: src/src/i2p/susi/webmail/WebMail.java:2246
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2249
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2251
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2259
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2271
+msgid "Really delete the marked messages?"
+msgstr "Thực sự xóa các thư đánh dấu?"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2272
+msgid "Yes, really delete them!"
+msgstr "Vâng, hãy xóa chúng!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
+#: src/src/i2p/susi/webmail/WebMail.java:2275
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "Đánh dấu tất cả"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Invert Selection"
-msgstr "Đảo ngược lựa chọn"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1715
-msgid "Clear"
-msgstr "Làm sạch"
+#: src/src/i2p/susi/webmail/WebMail.java:2279
+msgid "Clear All"
+msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "Đầu tiên"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1719
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "Trước"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1720
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "Trang {0} của {1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "Chót"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1723
-#: src/src/i2p/susi/webmail/WebMail.java:1755
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "Kế"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Pagesize:"
-msgstr "Khổ trang"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1727
-msgid "Set"
-msgstr "Chọn"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "Thực sự muốn xoá thư này?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1737
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "Vâng, thực sự xóa nó!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1756
+#: src/src/i2p/susi/webmail/WebMail.java:2336
+msgid "Reply"
+msgstr "Trả lời"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2337
+msgid "Reply All"
+msgstr "Trả lời tất cả"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2338
+msgid "Forward"
+msgstr "Chuyển tiếp"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete"
+msgstr "Xóa"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "Trở lại thư mục"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Date:"
-msgstr "Ngày:"
-
-#: src/src/i2p/susi/webmail/WebMail.java:1774
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "Không thể lấy thư."
+
+#: src/src/i2p/susi/webmail/WebMail.java:2389
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2392
+msgid "Set"
+msgstr "Chọn"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2395
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+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
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: 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
+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
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/apps/susimail/locale/messages_zh.po b/apps/susimail/locale/messages_zh.po
index 85ac5cf06c1382ec9544412c6cf3a189253250a4..ed7c143b81605f5a4f35df2dafcd8bf2d762f3bb 100644
--- a/apps/susimail/locale/messages_zh.po
+++ b/apps/susimail/locale/messages_zh.po
@@ -7,13 +7,14 @@
 # xkimo_daeee <michael_ies@yahoo.com>, 2014
 # walking <waling@mail.i2p>, 2013
 # walking <walking@i2pmail.org>, 2011
+# YF <yfdyh000@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 11:45+0000\n"
-"PO-Revision-Date: 2014-07-01 16:20+0000\n"
-"Last-Translator: xkimo_daeee <michael_ies@yahoo.com>\n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-02-07 03:55+0000\n"
+"Last-Translator: YF <yfdyh000@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,163 +27,169 @@ msgstr ""
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr "没有找到可用编码器处理编码\\ '' {0} \\ ''。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:304
-#: src/src/i2p/susi/webmail/WebMail.java:318
-#: src/src/i2p/susi/webmail/WebMail.java:1005
+#: src/src/i2p/susi/webmail/WebMail.java:324
+#: src/src/i2p/susi/webmail/WebMail.java:338
+#: src/src/i2p/susi/webmail/WebMail.java:990
 msgid "Re:"
 msgstr "回复:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:308
-#: src/src/i2p/susi/webmail/WebMail.java:322
-#: src/src/i2p/susi/webmail/WebMail.java:1043
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1028
 msgid "Fwd:"
 msgstr "转发:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:579
 msgid "unknown"
 msgstr "未知"
 
-#: src/src/i2p/susi/webmail/WebMail.java:615
+#: src/src/i2p/susi/webmail/WebMail.java:600
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr "警告:字符集检测失败,回退为US - ASCII。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:629
+#: src/src/i2p/susi/webmail/WebMail.java:614
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr "不支持字符集\\ '' {0} \\ ''。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:633
+#: src/src/i2p/susi/webmail/WebMail.java:618
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr "第({0})部分没有显示,因为{1}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:669
-#: src/src/i2p/susi/webmail/WebMail.java:672
+#: src/src/i2p/susi/webmail/WebMail.java:654
+#: src/src/i2p/susi/webmail/WebMail.java:657
 #, java-format
 msgid "Download attachment {0}"
 msgstr "下载附件{0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:673
+#: src/src/i2p/susi/webmail/WebMail.java:658
 msgid "File is packed into a zipfile for security reasons."
 msgstr "出于安全原因,文件被打包为zip文件。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:663
 #, java-format
 msgid "Attachment ({0})."
 msgstr "附件({0})。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:729
+#: src/src/i2p/susi/webmail/WebMail.java:714
 msgid "Need username for authentication."
 msgstr "需要认证用的用户名。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:733
+#: src/src/i2p/susi/webmail/WebMail.java:718
 msgid "Need password for authentication."
 msgstr "需要认证用的密码。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:737
+#: src/src/i2p/susi/webmail/WebMail.java:722
 msgid "Need hostname for connect."
 msgstr "需要连接用的主机名。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:727
 msgid "Need port number for pop3 connect."
 msgstr "需要POP3的连接端口号。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:749
+#: src/src/i2p/susi/webmail/WebMail.java:734
 msgid "POP3 port number is not in range 0..65535."
 msgstr "POP3端口号超出范围0-65535。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:740
 msgid "POP3 port number is invalid."
 msgstr "POP3端口号是无效的。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:761
+#: src/src/i2p/susi/webmail/WebMail.java:746
 msgid "Need port number for smtp connect."
 msgstr "需要的SMTP连接端口号。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:753
 msgid "SMTP port number is not in range 0..65535."
 msgstr "SMTP端口号是超出范围0-65535。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:759
 msgid "SMTP port number is invalid."
 msgstr "SMTP端口号无效。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:848
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "User logged out."
 msgstr "用户已登出。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:851
+#: src/src/i2p/susi/webmail/WebMail.java:836
 msgid "Internal error, lost connection."
 msgstr "内部错误,连接已断开。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1008
+#: src/src/i2p/susi/webmail/WebMail.java:993
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr "在 {0} {1} 写到:"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1055
+#: src/src/i2p/susi/webmail/WebMail.java:1040
 msgid "begin forwarded mail"
 msgstr "转信开始"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1077
+#: src/src/i2p/susi/webmail/WebMail.java:1062
 msgid "end forwarded mail"
 msgstr "转信结束"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1084
-#: src/src/i2p/susi/webmail/WebMail.java:2290
+#: src/src/i2p/susi/webmail/WebMail.java:1069
+#: src/src/i2p/susi/webmail/WebMail.java:2367
 msgid "Could not fetch mail body."
 msgstr "无法获取邮件正文。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1114
+#: src/src/i2p/susi/webmail/WebMail.java:1099
 msgid "Message id not valid."
 msgstr "消息ID无效。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1152
+#: src/src/i2p/susi/webmail/WebMail.java:1137
 msgid "Configuration reloaded"
 msgstr "重新加载配置"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1213
+#: src/src/i2p/susi/webmail/WebMail.java:1198
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr "{0}的编码检测失败。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1217
+#: src/src/i2p/susi/webmail/WebMail.java:1202
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr "无法对数据进行编码:{0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1222
+#: src/src/i2p/susi/webmail/WebMail.java:1207
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr "读取上传文件错误:{0}"
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1307
-#: src/src/i2p/susi/webmail/WebMail.java:1310
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:1295
 msgid "Attachment not found."
 msgstr "找不到附件."
 
-#: src/src/i2p/susi/webmail/WebMail.java:1357
-#: src/src/i2p/susi/webmail/WebMail.java:1483
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message not found."
+msgstr "未找到消息。"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+#: src/src/i2p/susi/webmail/WebMail.java:1497
 msgid "Invalid pagesize number, resetting to default value."
 msgstr "无效的每页数,重置为默认值。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1381
+#: src/src/i2p/susi/webmail/WebMail.java:1393
 msgid "No messages marked for deletion."
 msgstr "没有邮件被标记来删除。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1397
+#: src/src/i2p/susi/webmail/WebMail.java:1409
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] "已删除{0}封邮件。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/WebMail.java:1476
 msgid "Configuration saved"
 msgstr "配置已保存"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:2085
+#: src/src/i2p/susi/webmail/WebMail.java:1696
+#: src/src/i2p/susi/webmail/WebMail.java:2157
 msgid "Login"
 msgstr "登录"
 
@@ -191,153 +198,153 @@ msgstr "登录"
 #. "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages",
 #. sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1678
+#: src/src/i2p/susi/webmail/WebMail.java:1701
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] "{0} 封邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1684
+#: src/src/i2p/susi/webmail/WebMail.java:1707
 msgid "Show Message"
 msgstr "显示消息"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1686
+#: src/src/i2p/susi/webmail/WebMail.java:1709
 msgid "New Message"
 msgstr "新邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1688
+#: src/src/i2p/susi/webmail/WebMail.java:1711
 msgid "Configuration"
 msgstr "配置"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1699
+#: src/src/i2p/susi/webmail/WebMail.java:1722
 msgid "SusiMail"
 msgstr "SusiMail"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:1735
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr "消息尚未发送. 你想要放弃它吗?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:1797
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr "解码错误:{0}"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1833
+#: src/src/i2p/susi/webmail/WebMail.java:1905
 msgid "no subject"
 msgstr "没有主题"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1850
+#: src/src/i2p/susi/webmail/WebMail.java:1922
 msgid "Found no valid sender address."
 msgstr "没有找到有效的发件人地址。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1856
+#: src/src/i2p/susi/webmail/WebMail.java:1928
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr "\\ '' {0} \\ ''中没有找到有效的地址。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1877
+#: src/src/i2p/susi/webmail/WebMail.java:1949
 msgid "No recipients found."
 msgstr "没有找到收件人。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1941
+#: src/src/i2p/susi/webmail/WebMail.java:2013
 msgid "Mail sent."
 msgstr "邮件已发送。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1985
+#: src/src/i2p/susi/webmail/WebMail.java:2057
 msgid "Send"
 msgstr "发送"
 
-#: src/src/i2p/susi/webmail/WebMail.java:1986
-#: src/src/i2p/susi/webmail/WebMail.java:2199
-#: src/src/i2p/susi/webmail/WebMail.java:2330
+#: src/src/i2p/susi/webmail/WebMail.java:2058
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+#: src/src/i2p/susi/webmail/WebMail.java:2407
 msgid "Cancel"
 msgstr "取消"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2029
-#: src/src/i2p/susi/webmail/WebMail.java:2128
-#: src/src/i2p/susi/webmail/WebMail.java:2278
+#: src/src/i2p/susi/webmail/WebMail.java:2101
+#: src/src/i2p/susi/webmail/WebMail.java:2200
+#: src/src/i2p/susi/webmail/WebMail.java:2355
 msgid "From"
 msgstr "发件人"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2030
+#: src/src/i2p/susi/webmail/WebMail.java:2102
 msgid "To"
 msgstr "收件人"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2031
+#: src/src/i2p/susi/webmail/WebMail.java:2103
 msgid "Cc"
 msgstr "抄送"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2032
+#: src/src/i2p/susi/webmail/WebMail.java:2104
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2033
+#: src/src/i2p/susi/webmail/WebMail.java:2105
 msgid "Bcc to self"
 msgstr "密送给自己"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2034
-#: src/src/i2p/susi/webmail/WebMail.java:2129
-#: src/src/i2p/susi/webmail/WebMail.java:2280
+#: src/src/i2p/susi/webmail/WebMail.java:2106
+#: src/src/i2p/susi/webmail/WebMail.java:2201
+#: src/src/i2p/susi/webmail/WebMail.java:2357
 msgid "Subject"
 msgstr "主题"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2037
+#: src/src/i2p/susi/webmail/WebMail.java:2109
 msgid "Add Attachment"
 msgstr "添加附件"
 
 #. TODO disable/hide in JS if no file selected
-#: src/src/i2p/susi/webmail/WebMail.java:2039
+#: src/src/i2p/susi/webmail/WebMail.java:2111
 msgid "Add another attachment"
 msgstr "添加另一个附件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2045
+#: src/src/i2p/susi/webmail/WebMail.java:2117
 msgid "Attachments"
 msgstr "附件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2054
+#: src/src/i2p/susi/webmail/WebMail.java:2126
 msgid "Delete selected attachments"
 msgstr "删除所选的附件"
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2073
+#: src/src/i2p/susi/webmail/WebMail.java:2145
 msgid "User"
 msgstr "用户"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2074
+#: src/src/i2p/susi/webmail/WebMail.java:2146
 msgid "Password"
 msgstr "密码"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2079
+#: src/src/i2p/susi/webmail/WebMail.java:2151
 msgid "Host"
 msgstr "主机"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2080
+#: src/src/i2p/susi/webmail/WebMail.java:2152
 msgid "POP3 Port"
 msgstr "POP3 端口"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2081
+#: src/src/i2p/susi/webmail/WebMail.java:2153
 msgid "SMTP Port"
 msgstr "SMTP 端口"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2086
+#: src/src/i2p/susi/webmail/WebMail.java:2158
 msgid "Read Mail Offline"
 msgstr "脱机阅读邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2090
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2162
+#: src/src/i2p/susi/webmail/WebMail.java:2291
 msgid "Settings"
 msgstr "设置"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2093
+#: src/src/i2p/susi/webmail/WebMail.java:2165
 msgid "Learn about I2P mail"
 msgstr "了解 I2P 邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2094
+#: src/src/i2p/susi/webmail/WebMail.java:2166
 msgid "Create Account"
 msgstr "创建帐户"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2107
-#: src/src/i2p/susi/webmail/WebMail.java:2262
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2335
 msgid "New"
 msgstr "新建"
 
@@ -347,155 +354,159 @@ msgstr "新建"
 #. button( REPLYALL, _("Reply All") ) +
 #. button( FORWARD, _("Forward") ) + spacer +
 #. button( DELETE, _("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2114
+#: src/src/i2p/susi/webmail/WebMail.java:2186
 msgid "Check Mail"
 msgstr "检查邮件"
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2117
+#: src/src/i2p/susi/webmail/WebMail.java:2189
 msgid "Logout"
 msgstr "注销"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2130
-#: src/src/i2p/susi/webmail/WebMail.java:2282
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2359
 msgid "Date"
 msgstr "日期"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2133
+#: src/src/i2p/susi/webmail/WebMail.java:2205
 msgid "Size"
 msgstr "大小"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2173
+#: src/src/i2p/susi/webmail/WebMail.java:2246
 msgid "Message is new"
 msgstr "是新邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
+#: src/src/i2p/susi/webmail/WebMail.java:2249
 msgid "Message has an attachment"
 msgstr "邮件带有附件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2251
 msgid "Message is spam"
 msgstr "邮件是垃圾邮件"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2185
+#: src/src/i2p/susi/webmail/WebMail.java:2259
 msgid "No messages"
 msgstr "没有邮件"
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2197
+#: src/src/i2p/susi/webmail/WebMail.java:2271
 msgid "Really delete the marked messages?"
 msgstr "真要删除标记的邮件?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2272
 msgid "Yes, really delete them!"
 msgstr "是的,立刻删除!"
 
-#. TODO js
-#: src/src/i2p/susi/webmail/WebMail.java:2202
+#: src/src/i2p/susi/webmail/WebMail.java:2275
 msgid "Delete Selected"
 msgstr "删除所选"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2204
+#: src/src/i2p/susi/webmail/WebMail.java:2277
 msgid "Mark All"
 msgstr "全部标记"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2206
+#: src/src/i2p/susi/webmail/WebMail.java:2279
 msgid "Clear All"
 msgstr "全部清除"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "First"
 msgstr "第一页"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2231
-#: src/src/i2p/susi/webmail/WebMail.java:2232
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:2305
+#: src/src/i2p/susi/webmail/WebMail.java:2345
 msgid "Previous"
 msgstr "上一页"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
+#: src/src/i2p/susi/webmail/WebMail.java:2307
 #, java-format
 msgid "Page {0} of {1}"
 msgstr "第{0}页 共{1}页"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
 msgid "Last"
 msgstr "最后一页"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2237
-#: src/src/i2p/susi/webmail/WebMail.java:2238
-#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2310
+#: src/src/i2p/susi/webmail/WebMail.java:2311
+#: src/src/i2p/susi/webmail/WebMail.java:2347
 msgid "Next"
 msgstr "下一页"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Really delete this message?"
 msgstr "真的要删除此邮件?"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2250
+#: src/src/i2p/susi/webmail/WebMail.java:2323
 msgid "Yes, really delete it!"
 msgstr "是的,立刻删除!"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2263
+#: src/src/i2p/susi/webmail/WebMail.java:2336
 msgid "Reply"
 msgstr "回复"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2264
+#: src/src/i2p/susi/webmail/WebMail.java:2337
 msgid "Reply All"
 msgstr "回复所有人"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2265
+#: src/src/i2p/susi/webmail/WebMail.java:2338
 msgid "Forward"
 msgstr "转寄"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2266
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Save As"
+msgstr "另存为"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2343
 msgid "Delete"
 msgstr "删除"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2346
 msgid "Back to Folder"
 msgstr "返回到文件夹"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2371
 msgid "Could not fetch mail."
 msgstr "无法收取邮件。"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2312
+#: src/src/i2p/susi/webmail/WebMail.java:2389
 msgid "Folder Page Size"
 msgstr "文件夹页面大小"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2392
 msgid "Set"
 msgstr "设置"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2395
 msgid "Advanced Configuration"
 msgstr "高级配置"
 
-#: src/src/i2p/susi/webmail/WebMail.java:2329
+#: src/src/i2p/susi/webmail/WebMail.java:2406
 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:747
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
 msgid "No response from server"
 msgstr "服务器没有响应"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
 msgid "Error connecting to server"
 msgstr "连接到服务器错误"
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+#: 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:1021
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
 msgid "Login failed"
 msgstr "登录失败"
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index ad665e0b6e3c04257563d028780b75052dd60ea0..4df447af8516764775c5b96dbe260ed74a3f7324 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -69,6 +69,7 @@ import javax.servlet.http.HttpSessionBindingListener;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.servlet.RequestWrapper;
 
 /**
  * @author susi23
@@ -1824,10 +1825,11 @@ public class WebMail extends HttpServlet
 						name = "part" + part.hashCode();
 					String name2 = sanitizeFilename(name);
 					response.setContentType( "application/zip; name=\"" + name2 + ".zip\"" );
-					response.addHeader( "Content-Disposition:", "attachment; filename=\"" + name2 + ".zip\"" );
+					response.addHeader( "Content-Disposition", "attachment; filename=\"" + name2 + ".zip\"" );
 					ZipEntry entry = new ZipEntry( name );
 					zip.putNextEntry( entry );
 					zip.write( content.content, content.offset, content.length );
+					zip.closeEntry();
 					zip.finish();
 					shown = true;
 				} catch (IOException e) {
@@ -1862,7 +1864,7 @@ public class WebMail extends HttpServlet
 			response.setContentType("message/rfc822");
 			response.setContentLength(content.length);
 			// cache-control?
-			response.addHeader( "Content-Disposition:", "attachment; filename=\"" + name + ".eml\"" );
+			response.addHeader( "Content-Disposition", "attachment; filename=\"" + name + ".eml\"" );
 			response.getOutputStream().write(content.content, content.offset, content.length);
 			return true;
 		} catch (IOException e) {
diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/SevenBit.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/SevenBit.java
index b79583a09c1ebd6c4be48daa460ef4751dae6f9d..3cb64ac6df759968730593cf1d32800da0a5a393 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/SevenBit.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/SevenBit.java
@@ -71,13 +71,13 @@ public class SevenBit implements Encoding {
 		int backupOffset = offset;
 		while( length-- > 0 ) {
 			byte b = in[offset++];
-			if( b > 32 && b < 127 )
+			if( b >= 32 && b < 127 )
 				continue;
-			if( b == ' ' || b == '\t' )
+			if( b == '\t' )
 				continue;
 			if( b == '\r' || b == '\n' )
 				continue;
-			throw new DecodingException( "No 8bit Data allowed (" + b + ")" );
+			throw new DecodingException( "No 8 bit data allowed in 7 bit encoding (" + b + ')' );
 		}
 		return new ReadBuffer(in, backupOffset, backupLength);
 	}
diff --git a/apps/susimail/src/src/i2p/susi/webmail/package.html b/apps/susimail/src/src/i2p/susi/webmail/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..60ba58cb40ba2660bf801b9e63399d8da04ca042
--- /dev/null
+++ b/apps/susimail/src/src/i2p/susi/webmail/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+The SusiMail webapp, which implements a webmail interface,
+POP3 and SMTP client-side protocols, and local caching of email.
+</p>
+</body>
+</html>
diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
index 3b3b77abc6b4f706c061ffadc573d6d96e0da917..f688ddc16a980f86f92d5a039a101e9937c5921b 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java
@@ -1186,7 +1186,7 @@ public class POP3MailBox implements NewMailListener {
 		if (!isConnected())
 			return null;
 		synchronized( synchronizer ) {
-		       return new ArrayList(uidlToID.keySet());
+		       return new ArrayList<String>(uidlToID.keySet());
 		}
 	}
 
diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
index a6b608d90095d5dd8808b5d7139486b36c8d95b1..21f6f45f7989a37f560dd2a9ed3bdf9392e2f78f 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
@@ -37,7 +37,6 @@ public class SysTray implements SysTrayMenuListener {
     private static SysTray        _instance;
     private static String         _portString;
     private static boolean        _showIcon;
-    private static UrlLauncher    _urlLauncher    = new UrlLauncher();
     private static final boolean _is64 = SystemVersion.is64Bit();
 
     static {
@@ -84,17 +83,18 @@ public class SysTray implements SysTrayMenuListener {
     private static void openRouterConsole(String url) {
 
         String browser = null;
+        UrlLauncher urlLauncher = new UrlLauncher();
 
         if (_browserString == null || _browserString.equals("default")) {
             try {
-                if (_urlLauncher.openUrl(url))
+                if (urlLauncher.openUrl(url))
                     return;
             } catch (Exception ex) {
                 // Fall through.
             }
         } else {
             try {
-                if (_urlLauncher.openUrl(url, _browserString))
+                if (urlLauncher.openUrl(url, _browserString))
                     return;
             } catch (Exception ex) {
                 // Fall through.
diff --git a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
index aeb159aa3baa77c892b217079087f5197c00269b..7604169b00fcafcdac878de58593ae92ce4c37a6 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
@@ -22,6 +22,9 @@ import java.net.URL;
 import java.util.Locale;
 
 import net.i2p.I2PAppContext;
+import net.i2p.app.*;
+import static net.i2p.app.ClientAppState.*;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.ShellCommand;
 import net.i2p.util.SystemVersion;
 
@@ -35,13 +38,19 @@ import net.i2p.util.SystemVersion;
  * 
  * @author hypercubus
  */
-public class UrlLauncher {
+public class UrlLauncher implements ClientApp {
 
-    ShellCommand _shellCommand = new ShellCommand();
+    private final ShellCommand _shellCommand;
+    private volatile ClientAppState _state;
+    private final I2PAppContext _context;
+    private final ClientAppManager _mgr;
+    private final String[] _args;
 
     private static final int WAIT_TIME = 5*1000;
     private static final int MAX_WAIT_TIME = 5*60*1000;
     private static final int MAX_TRIES = 99;
+    private static final String REGISTERED_NAME = "UrlLauncher";
+    private static final String PROP_BROWSER = "routerconsole.browser";
 
     /**
      *  Browsers to try IN-ORDER
@@ -69,12 +78,43 @@ public class UrlLauncher {
             "lynx"
     };
             
+    /**
+     *  ClientApp constructor used from clients.config
+     *
+     *  @since 0.9.18
+     */
+    public UrlLauncher(I2PAppContext context, ClientAppManager mgr, String[] args) {
+        _state = UNINITIALIZED;
+        _context = context;
+        _mgr = mgr;
+        if (args == null || args.length <= 0)
+            args = new String[] {"http://127.0.0.1:7657/index.jsp"};
+        _args = args;
+        _shellCommand = new ShellCommand();
+        _state = INITIALIZED;
+    }
+            
+    /**
+     *  Constructor from SysTray
+     *
+     *  @since 0.9.18
+     */
+    public UrlLauncher() {
+        _state = UNINITIALIZED;
+        _context = I2PAppContext.getGlobalContext();
+        _mgr = null;
+        _args = null;
+        _shellCommand = new ShellCommand();
+        _state = INITIALIZED;
+    }
+
     /**
      *  Prevent bad user experience by waiting for the server to be there
      *  before launching the browser.
+     *
      *  @return success
      */
-    public boolean waitForServer(String urlString) {
+    private static boolean waitForServer(String urlString) {
         URL url;
         try {
             url = new URL(urlString);
@@ -126,6 +166,8 @@ public class UrlLauncher {
      * unsuccessful, an attempt is made to launch the URL using the most common
      * browsers.
      * 
+     * BLOCKING
+     * 
      * @param  url The URL to open.
      * @return     <code>true</code> if the operation was successful, otherwise
      *             <code>false</code>.
@@ -133,12 +175,14 @@ public class UrlLauncher {
      * @throws Exception
      */ 
     public boolean openUrl(String url) throws Exception {
-
-        String osName = System.getProperty("os.name");
-
         waitForServer(url);
         if (validateUrlFormat(url)) {
-            if (osName.toLowerCase(Locale.US).indexOf("mac") > -1) {
+            String cbrowser = _context.getProperty(PROP_BROWSER);
+            if (cbrowser != null) {
+                return openUrl(url, cbrowser);
+            }
+            if (SystemVersion.isMac()) {
+                String osName = System.getProperty("os.name");
                 if (osName.toLowerCase(Locale.US).startsWith("mac os x")) {
 
                     if (_shellCommand.executeSilentAndWaitTimed("open " + url, 5))
@@ -150,13 +194,11 @@ public class UrlLauncher {
 
                 if (_shellCommand.executeSilentAndWaitTimed("iexplore " + url, 5))
                     return true;
-
             } else if (SystemVersion.isWindows()) {
-
                 String         browserString  = "\"C:\\Program Files\\Internet Explorer\\iexplore.exe\" -nohome";
                 BufferedReader bufferedReader = null;
 
-                File foo = new File(I2PAppContext.getGlobalContext().getTempDir(), "browser.reg");
+                File foo = new File(_context.getTempDir(), "browser.reg");
                 _shellCommand.executeSilentAndWait("regedit /E \"" + foo.getAbsolutePath() + "\" \"HKEY_CLASSES_ROOT\\http\\shell\\open\\command\"");
 
                 try {
@@ -184,12 +226,9 @@ public class UrlLauncher {
                 }
                 if (_shellCommand.executeSilentAndWaitTimed(browserString + ' ' + url, 5))
                     return true;
-
             } else {
-
                 // fall through
             }
-
             for (int i = 0; i < BROWSERS.length; i++) {
                 if (_shellCommand.executeSilentAndWaitTimed(BROWSERS[i] + ' ' + url, 5))
                     return true;
@@ -201,6 +240,8 @@ public class UrlLauncher {
     /**
      * Opens the given URL with the given browser.
      * 
+     * BLOCKING
+     * 
      * @param  url     The URL to open.
      * @param  browser The browser to use.
      * @return         <code>true</code> if the operation was successful,
@@ -209,17 +250,16 @@ public class UrlLauncher {
      * @throws Exception
      */
     public boolean openUrl(String url, String browser) throws Exception {
-
         waitForServer(url);
-        if (validateUrlFormat(url))
+        if (validateUrlFormat(url)) {
             if (_shellCommand.executeSilentAndWaitTimed(browser + " " + url, 5))
                 return true;
-
+        }
         return false;
     }
 
-    private boolean validateUrlFormat(String urlString) {
-        try {
+    private static boolean validateUrlFormat(String urlString) {
+         try {
             // just to check validity
             new URL(urlString);
         } catch (MalformedURLException e) {
@@ -228,6 +268,86 @@ public class UrlLauncher {
         return true;
     }
 
+    /**
+     *  ClientApp interface
+     *  @since 0.9.18
+     */
+    public void startup() {
+        String url = _args[0];
+        if (!validateUrlFormat(url)) {
+            changeState(START_FAILED, new MalformedURLException("Bad url: " + url));
+            return;
+        }
+        changeState(STARTING);
+        Thread t = new I2PAppThread(new Runner(), "UrlLauncher", true);
+        t.start();
+    }
+
+    private class Runner implements Runnable {
+        public void run() {
+            changeState(RUNNING);
+            try {
+                String url = _args[0];
+                openUrl(url);
+                changeState(STOPPED);
+            } catch (Exception e) {
+                changeState(CRASHED, e);
+            }
+        }
+    }
+
+    /**
+     *  ClientApp interface
+     *  @since 0.9.18
+     */
+    public ClientAppState getState() {
+        return _state;
+    }
+
+    /**
+     *  ClientApp interface
+     *  @since 0.9.18
+     */
+    public String getName() {
+        return REGISTERED_NAME;
+    }
+
+    /**
+     *  ClientApp interface
+     *  @since 0.9.18
+     */
+    public String getDisplayName() {
+        return REGISTERED_NAME + " \"" + _args[0] + '"';
+    }
+
+    /**
+     *  @since 0.9.18
+     */
+    private void changeState(ClientAppState state) {
+        changeState(state, null);
+    }
+
+    /**
+     *  @since 0.9.18
+     */
+    private synchronized void changeState(ClientAppState state, Exception e) {
+        _state = state;
+        if (_mgr != null)
+            _mgr.notify(this, state, null, e);
+    }
+
+    /**
+     *  ClientApp interface
+     *  @since 0.9.18
+     */
+    public void shutdown(String[] args) {
+        // doesn't really do anything
+        changeState(STOPPED);
+    }
+
+    /**
+     *  Obsolete, now uses ClientApp interface
+     */
     public static void main(String args[]) {
         UrlLauncher launcher = new UrlLauncher();
         try {
diff --git a/apps/systray/java/src/net/i2p/apps/systray/package.html b/apps/systray/java/src/net/i2p/apps/systray/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..5698cb171b3b79f4680695ba55ea27aa33858f80
--- /dev/null
+++ b/apps/systray/java/src/net/i2p/apps/systray/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+A system tray control for launching the I2P router console.
+</p>
+</body>
+</html>
diff --git a/build.xml b/build.xml
index 4e765e0d6cbfcca1d63c0bcfc91df15337a201f0..5e513551b22e5fd2478a8e041ca179684fa6d58b 100644
--- a/build.xml
+++ b/build.xml
@@ -67,7 +67,7 @@
             <echo message="The following command will install all of the dependencies for you:" />
             <echo message=" " />
             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
-            <echo message="                   quilt libcommons-logging-java" />
+            <echo message="                   quilt libcommons-logging-java dh-apparmor" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
             <echo message="to patch the source and build the packages." />
@@ -286,6 +286,7 @@
     <!-- jar (not war) for Android -->
     <target name="buildAddressbookJar" depends="buildCore" >
         <ant dir="apps/addressbook/" target="jar" />
+        <copy file="apps/addressbook/dist/addressbook.jar" todir="build/" />
     </target>
 
     <target name="buildAddressbook" depends="buildCore, buildJetty" >
@@ -293,10 +294,11 @@
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     </target>
 
-    <!-- jar only (no war) for Android -->
-    <target name="buildI2PTunnelJar" depends="buildStreaming" >
-        <ant dir="apps/i2ptunnel/java/" target="jar" />
+    <!-- Both jars and no war, for Android -->
+    <target name="buildI2PTunnelJars" depends="buildStreaming" >
+        <ant dir="apps/i2ptunnel/java/" target="uiJar" />
         <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
+        <copy file="apps/i2ptunnel/java/build/i2ptunnel-ui.jar" todir="build/" />
     </target>
 
     <target name="buildI2PTunnel" depends="buildStreaming, buildJetty" >
@@ -678,7 +680,7 @@
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
-            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
+            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
             <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.update:net.i2p.router.news" />
             <!-- apps and bridges starting here, alphabetical please -->
             <group title="Addressbook Application" packages="net.i2p.addressbook" />
@@ -688,11 +690,11 @@
             <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
             <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
             <group title="Installer Utilities" packages="net.i2p.installer" />
-            <group title="Jetty Starter and Logging" packages="net.i2p.jetty:net.i2p.servlet:net.i2p.servlet.*" />
+            <group title="Jetty Utilities" packages="net.i2p.jetty:net.i2p.servlet:net.i2p.servlet.*:org.mortbay.servlet:org.mortbay.util" />
             <group title="SAM Bridge" packages="net.i2p.sam" />
             <group title="SAM Demos" packages="net.i2p.sam.client" />
             <group title="SusiDNS Application" packages="i2p.susi.dns" />
-            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
+            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
             <group title="Systray Application" packages="net.i2p.apps.systray" />
             <sourcepath>
                 <pathelement location="core/java/src" />
@@ -1135,6 +1137,7 @@
         <copy file="history.txt" todir="pkg-temp/" overwrite="true" />
         <mkdir dir="pkg-temp/scripts" />
         <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
+        <copy file="apps/apparmor/home.i2p.i2prouter" todir="pkg-temp/scripts/" />
         <copy file="installer/resources/startconsole.html" todir="pkg-temp/docs/" />
         <copy file="installer/resources/start.ico" todir="pkg-temp/docs/" />
         <copy file="installer/resources/console.ico" todir="pkg-temp/docs/" />
@@ -1384,6 +1387,7 @@
         </copy>
         <concat append="true" destfile="pkg-temp/history.txt">&#10;&#10;----------------&#10;&#10;EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE"</concat>
         <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" />
+        <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
     </target>
 
     <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepjupdatefixes, prepthemeupdates">
diff --git a/core/java/src/com/nettgryppa/security/package.html b/core/java/src/com/nettgryppa/security/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..a15c85b54cf99ee82fc138e9bf0cfe5c90bef1e9
--- /dev/null
+++ b/core/java/src/com/nettgryppa/security/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+HashCash implementation. Unused.
+</p>
+</body>
+</html>
diff --git a/core/java/src/freenet/support/CPUInformation/package.html b/core/java/src/freenet/support/CPUInformation/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..db1df9a5185bdebefea2fa45f5e43ab96bc773d9
--- /dev/null
+++ b/core/java/src/freenet/support/CPUInformation/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+CPUID implementaion, borrowed from freenet, updated and heavily modified
+</p>
+</body>
+</html>
diff --git a/core/java/src/gnu/crypto/prng/package.html b/core/java/src/gnu/crypto/prng/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..4aeca8f65a5f744c55d402d4022bfbbc9872394e
--- /dev/null
+++ b/core/java/src/gnu/crypto/prng/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+The Fortuna PRNG from GNU Crypto, updated and modifed for I2P.
+</p>
+</body>
+</html>
diff --git a/core/java/src/gnu/getopt/MessagesBundle_id.properties b/core/java/src/gnu/getopt/MessagesBundle_id.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4e0771671b4c9d2b9d3512ffa62c34ce5f5e9be1
--- /dev/null
+++ b/core/java/src/gnu/getopt/MessagesBundle_id.properties
@@ -0,0 +1,31 @@
+#**************************************************************************
+#* MessagesBundle.properties -- English language error messages
+#*
+#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and
+#*                       Aaron M. Renn (arenn@urbanophile.com)
+#*
+#* This program is free software; you can redistribute it and/or modify
+#* it under the terms of the GNU Library General Public License as published
+#* by  the Free Software Foundation; either version 2 of the License or
+#* (at your option) any later version.
+#*
+#* This program is distributed in the hope that it will be useful, but
+#* WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#* GNU Library General Public License for more details.
+#*
+#* You should have received a copy of the GNU Library General Public License
+#* along with this program; see the file COPYING.LIB.  If not, write to
+#* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
+#* Boston, MA  02111-1307 USA
+#**************************************************************************/
+getopt.ambigious={0}\: opsi ''{1}'' meragukan
+getopt.arguments1={0}\: opsi ''--{1}'' tidak mengizinkan argumen
+getopt.arguments2={0}\: opsi ''{1}{2}'' tidak mengizinkan argumen
+getopt.requires={0}\: opsi ''{1}'' memerlukan argumen
+getopt.unrecognized={0}\: opsi tidak dikenal ''--{1}''
+getopt.unrecognized2={0}\: opsi tidak dikenal ''{1}{2}''
+getopt.illegal={0}\: opsi ilegal -- {1}
+getopt.invalid={0}\: opsi tidak valid -- {1}
+getopt.requires2={0}\: opsi memerlukan argumen -- {1}
+getopt.invalidValue=Vaue tidak valid {0} untuk parameter 'has_arg'
diff --git a/core/java/src/gnu/getopt/MessagesBundle_ko.properties b/core/java/src/gnu/getopt/MessagesBundle_ko.properties
new file mode 100644
index 0000000000000000000000000000000000000000..997ae976a88065d6425ae1f276682d96827449e3
--- /dev/null
+++ b/core/java/src/gnu/getopt/MessagesBundle_ko.properties
@@ -0,0 +1,31 @@
+#**************************************************************************
+#* MessagesBundle.properties -- English language error messages
+#*
+#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and
+#*                       Aaron M. Renn (arenn@urbanophile.com)
+#*
+#* This program is free software; you can redistribute it and/or modify
+#* it under the terms of the GNU Library General Public License as published
+#* by  the Free Software Foundation; either version 2 of the License or
+#* (at your option) any later version.
+#*
+#* This program is distributed in the hope that it will be useful, but
+#* WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#* GNU Library General Public License for more details.
+#*
+#* You should have received a copy of the GNU Library General Public License
+#* along with this program; see the file COPYING.LIB.  If not, write to
+#* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
+#* Boston, MA  02111-1307 USA
+#**************************************************************************/
+getopt.ambigious={0}\: \uc635\uc158 "{1}"\uc774 \uc560\ub9e4\ubaa8\ud638\ud568
+getopt.arguments1={0}\: \uc635\uc158 "--{1}"\uc740 \uc778\uc218\ub97c \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc74c
+getopt.arguments2={0}\: \uc635\uc158 "{1}{2}" \uc740 \uc778\uc218\ub97c \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc74c
+getopt.requires={0}\: \uc635\uc158 "{1}" \uc740 \uc778\uc218\uac00 \ud544\uc694\ud568
+getopt.unrecognized={0}\: \uc54c\uc218\uc5c6\ub294 \uc635\uc158 "--{1}"
+getopt.unrecognized2={0}\: \uc54c\uc218\uc5c6\ub294 \uc635\uc158 "{1}{2}"
+getopt.illegal={0}\: \uc798\ubabb\ub41c \uc635\uc158 -- {1}
+getopt.invalid={0}\: \uc798\ubabb\ub41c \uc635\uc158 -- {1}
+getopt.requires2={0}\: \uc635\uc158\uc740 \uc778\uc790\ub97c \ud544\uc694\ub85c \ud568 -- {1}
+getopt.invalidValue=\uc778\uc218 'has_arg'\uc5d0 \ubd80\uc801\ud569\ud55c \uac12 {0}
diff --git a/core/java/src/gnu/getopt/MessagesBundle_nl.properties b/core/java/src/gnu/getopt/MessagesBundle_nl.properties
index 50b2fe56e9c3b771a9ca1686eade6e88f068ab3a..be2e1f201d27f762cbcc7532b7032089c0a821e6 100644
--- a/core/java/src/gnu/getopt/MessagesBundle_nl.properties
+++ b/core/java/src/gnu/getopt/MessagesBundle_nl.properties
@@ -1,7 +1,8 @@
 #**************************************************************************
-#* MessagesBundle_nl.properties -- Dutch language error messages
+#* MessagesBundle.properties -- English language error messages
 #*
-#* Copyright (c) 1999 by Ernst de Haan (ernst@jollem.com)
+#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and
+#*                       Aaron M. Renn (arenn@urbanophile.com)
 #*
 #* This program is free software; you can redistribute it and/or modify
 #* it under the terms of the GNU Library General Public License as published
@@ -18,13 +19,13 @@
 #* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 #* Boston, MA  02111-1307 USA
 #**************************************************************************/
-getopt.ambigious={0}: optie ''{1}'' is ambigue
-getopt.arguments1={0}: optie ''--{1}'' staat geen argumenten toe
-getopt.arguments2={0}: optie ''{1}{2}'' staat geen argumenten toe
-getopt.requires={0}: optie ''{1}'' heeft een argument nodig
-getopt.unrecognized={0}: onbekende optie ''--{1}''
-getopt.unrecognized2={0}: onbekende optie ''{1}{2}''
-getopt.illegal={0}: niet-toegestane optie -- {1}
-getopt.invalid={0}: onjuiste optie -- {1}
-getopt.requires2={0}: optie heeft een argument nodig -- {1}
-getopt.invalidValue=Ongeldige waarde {0} voor parameter 'has_arg' 
+getopt.ambigious={0}\: optie ''{1}'' is ambigu
+getopt.arguments1={0}\: optie ''--{1}'' staat geen argumenten toe
+getopt.arguments2={0}\: optie ''{1}{2}'' staat geen argumenten toe
+getopt.requires={0}\: optie ''{1}'' heeft een argument nodig
+getopt.unrecognized={0}\: onbekende optie ''--{1}''
+getopt.unrecognized2={0}\: onbekende optie ''{1}{2}''
+getopt.illegal={0}\: niet toegestane optie -- {1}
+getopt.invalid={0}\: onjuiste optie -- {1}
+getopt.requires2={0}\: optie heeft een argument nodig -- {1}
+getopt.invalidValue=Ongeldige waarde {0} voor parameter 'has_arg'
diff --git a/core/java/src/gnu/getopt/MessagesBundle_pl.properties b/core/java/src/gnu/getopt/MessagesBundle_pl.properties
index 557220fd4a846eb0b502c88a8d569a7d95e03aee..d584044559b411b8ac6373bd8fff66196ccdb693 100644
--- a/core/java/src/gnu/getopt/MessagesBundle_pl.properties
+++ b/core/java/src/gnu/getopt/MessagesBundle_pl.properties
@@ -1,8 +1,8 @@
 #**************************************************************************
-#* MessagesBundle_pl.properties -- Polish language error messages
+#* MessagesBundle.properties -- English language error messages
 #*
-#* Polish Messages Copyright (c) 2006 by Krzysztof Szyma?ski (sirch.s@gmail.com)
-#* These messages are encoded in ISO-8859-2
+#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and
+#*                       Aaron M. Renn (arenn@urbanophile.com)
 #*
 #* This program is free software; you can redistribute it and/or modify
 #* it under the terms of the GNU Library General Public License as published
@@ -19,13 +19,13 @@
 #* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 #* Boston, MA  02111-1307 USA
 #**************************************************************************/
-getopt.ambigious={0}: opcja ''{1}''jest wieloznaczna
-getopt.arguments1={0}: opcja ''--{1}'' nie akceptuje argumentu
-getopt.arguments2={0}: opcja ''{1}{2}'' nie akceptuje argumentu
-getopt.requires={0}: opcja ''{1}'' wymaga argumentu
-getopt.unrecognized={0}: nierozpoznana opcja ''--{1}''
-getopt.unrecognized2={0}: nierozpoznana opcja ''{1}{2}''
-getopt.illegal={0}: nie dopuszczalna opcja --{1}
-getopt.invalid={0}: b??dna opcja --{1}
-getopt.requires2={0}: opcja --{1} oczekuje argumentu 
-getopt.invalidValue=Nie poprawna warto?? {0} argument 'has_arg' 
+getopt.ambigious={0}\: opcja ''{1}'' jest wieloznaczna
+getopt.arguments1={0}\: opcja ''--{1}'' nie akceptuje argumentu
+getopt.arguments2={0}\: opcja ''{1}{2}'' nie akceptuje argumentu
+getopt.requires={0}\: opcja ''{1}'' wymaga argumentu
+getopt.unrecognized={0}\: nierozpoznana opcja ''--{1}''
+getopt.unrecognized2={0}\: nierozpoznana opcja ''{1}{2}''
+getopt.illegal={0}\: niedopuszczalna opcja -- {1}
+getopt.invalid={0}\: b\u0142\u0119dna opcja -- {1}
+getopt.requires2={0}\: opcja wymaga argumentu -- {1}
+getopt.invalidValue=Niepoprawna warto\u015b\u0107 {0} dla parametru 'has_arg'
diff --git a/core/java/src/gnu/getopt/MessagesBundle_uk.properties b/core/java/src/gnu/getopt/MessagesBundle_uk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..52f7b4341182521d9c3815d8b515fbe0f77293d2
--- /dev/null
+++ b/core/java/src/gnu/getopt/MessagesBundle_uk.properties
@@ -0,0 +1,31 @@
+#**************************************************************************
+#* MessagesBundle.properties -- English language error messages
+#*
+#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and
+#*                       Aaron M. Renn (arenn@urbanophile.com)
+#*
+#* This program is free software; you can redistribute it and/or modify
+#* it under the terms of the GNU Library General Public License as published
+#* by  the Free Software Foundation; either version 2 of the License or
+#* (at your option) any later version.
+#*
+#* This program is distributed in the hope that it will be useful, but
+#* WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#* GNU Library General Public License for more details.
+#*
+#* You should have received a copy of the GNU Library General Public License
+#* along with this program; see the file COPYING.LIB.  If not, write to
+#* the Free Software Foundation Inc., 59 Temple Place - Suite 330,
+#* Boston, MA  02111-1307 USA
+#**************************************************************************/
+getopt.ambigious={0}\: \u043e\u043f\u0446\u0456\u044f ''{1}'' \u043d\u0435\u043e\u0434\u043d\u043e\u0437\u043d\u0430\u0447\u043d\u0430
+getopt.arguments1={0}\: \u043e\u043f\u0446\u0456\u044f ''--{1}'' \u043d\u0435 \u0432\u0438\u043c\u0430\u0433\u0430\u0454 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440
+getopt.arguments2={0}\: \u043e\u043f\u0446\u0456\u044f ''{1}{2}'' \u043d\u0435 \u0432\u0438\u043c\u0430\u0433\u0430\u0454 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440
+getopt.requires={0}\: \u043e\u043f\u0446\u0456\u044f ''{1}'' \u0432\u0438\u043c\u0430\u0433\u0430\u0454 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440
+getopt.unrecognized={0}\: \u043d\u0435\u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0430 \u043e\u043f\u0446\u0456\u044f ''--{1}''
+getopt.unrecognized2={0}\: \u043d\u0435\u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0430 \u043e\u043f\u0446\u0456\u044f ''{1}{2}''
+getopt.illegal={0}\: \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430 \u043e\u043f\u0446\u0456\u044f -- {1}
+getopt.invalid={0}\: \u043d\u0435\u0434\u0456\u0439\u0441\u043d\u0430 \u043e\u043f\u0446\u0456\u044f -- {1}
+getopt.requires2={0}\: \u043e\u043f\u0446\u0456\u044f \u0432\u0438\u043c\u0430\u0433\u0430\u0454 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 -- {1}
+getopt.invalidValue=\u041d\u0435\u0434\u0456\u0439\u0441\u043d\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f {0} \u0434\u043b\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0443 'has_arg'
diff --git a/core/java/src/gnu/gettext/package.html b/core/java/src/gnu/gettext/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..cb5e0f8e6cc538c2e5c7b27904c9cef1922701a6
--- /dev/null
+++ b/core/java/src/gnu/gettext/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+GettextResource only, for ngettext().
+Called only from net.i2p.util.Translate, which is where everything except ngettext is implemented.
+</p>
+</body>
+</html>
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 8407e972b94c4495fc65b325cc3e737582cf6e12..bfadb7d9770d04b6cb1751ded0c442865e3b4cac 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -14,9 +14,20 @@ package net.i2p;
  *
  */
 public class CoreVersion {
+
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.9.16";
+
+    public final static String VERSION = "0.9.18";
+
+    /**
+     *  For Vuze.
+     *  @return VERSION
+     *  @since 0.9.19
+     */
+    public static String getVersion() {
+        return VERSION;
+    }
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index ad562bae4a217aef33c64b28a0b410070146f814..71ae745076019052c6da5394bd7caf16c9118b51 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -406,9 +406,11 @@ public class I2PAppContext {
                 } else if (_tmpDir.mkdir()) {
                     _tmpDir.deleteOnExit();
                 } else {
-                    System.err.println("Could not create temp dir " + _tmpDir.getAbsolutePath());
+                    System.err.println("WARNING: Could not create temp dir " + _tmpDir.getAbsolutePath());
                     _tmpDir = new SecureDirectory(_routerDir, "tmp");
-                    _tmpDir.mkdir();
+                    _tmpDir.mkdirs();
+                    if (!_tmpDir.exists())
+                        System.err.println("ERROR: Could not create temp dir " + _tmpDir.getAbsolutePath());
                 }
             }
         }
diff --git a/core/java/src/net/i2p/app/ClientApp.java b/core/java/src/net/i2p/app/ClientApp.java
index 3f611454d3be96077a713939e17d615f38469051..ed8e2f9ddac51c715c706d619a49e72495eb7cac 100644
--- a/core/java/src/net/i2p/app/ClientApp.java
+++ b/core/java/src/net/i2p/app/ClientApp.java
@@ -53,7 +53,7 @@ public interface ClientApp {
     public String getName();
 
     /**
-     *  The dislplay name of the ClientApp, used in user interfaces.
+     *  The display name of the ClientApp, used in user interfaces.
      *  The app must translate.
      *  @return non-null
      */
diff --git a/core/java/src/net/i2p/client/I2PClient.java b/core/java/src/net/i2p/client/I2PClient.java
index c4503608cf240a1281954268d913e33fd3d0304b..273ba7e2d9668e495d5a0d5cb0d582e7ff2f9e4b 100644
--- a/core/java/src/net/i2p/client/I2PClient.java
+++ b/core/java/src/net/i2p/client/I2PClient.java
@@ -72,6 +72,8 @@ public interface I2PClient {
      * the router how to handle the new session, and to configure the end to end
      * encryption.
      *
+     * As of 0.9.19, defaults in options are honored.
+     *
      * @param destKeyStream location from which to read the Destination, PrivateKey, and SigningPrivateKey from,
      *                      format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      * @param options set of options to configure the router with, if null will use System properties
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 7fd17597854bc5704b3fb582be78a9a2a3071d83..0c89835282ca4563716c168e74ceabc45dae8b70 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@@ -235,6 +235,8 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
      * Create a new session, reading the Destination, PrivateKey, and SigningPrivateKey
      * from the destKeyStream, and using the specified options to connect to the router
      *
+     * As of 0.9.19, defaults in options are honored.
+     *
      * @param destKeyStream stream containing the private key data,
      *                             format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
      * @param options set of options to configure the router with, if null will use System properties
@@ -314,11 +316,14 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
         }
     }
 
-    /** save some memory, don't pass along the pointless properties */
+    /**
+     *  Save some memory, don't pass along the pointless properties.
+     *  As of 0.9.19, defaults from options will be promoted to real values in rv.
+     *  @return a new Properties without defaults
+     */
     private Properties filter(Properties options) {
         Properties rv = new Properties();
-        for (Object oKey : options.keySet()) { // TODO-Java6: s/keySet()/stringPropertyNames()/
-            String key = (String) oKey;
+        for (String key : options.stringPropertyNames()) {
             if (key.startsWith("java.") ||
                 key.startsWith("user.") ||
                 key.startsWith("os.") ||
@@ -787,7 +792,9 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
     I2CPMessageProducer getProducer() { return _producer; }
 
     /**
-     * Retrieve the configuration options
+     * Retrieve the configuration options, filtered.
+     * All defaults passed in via constructor have been promoted to the primary map.
+     *
      * @return non-null, if insantiated with null options, this will be the System properties.
      */
     Properties getOptions() { return _options; }
diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
index ca72587dbaa23395aabb30d049635ca263f3e481..e6e9965a8247941f6bcdb19c1c410dca288f5b7b 100644
--- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
+++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
@@ -74,22 +74,68 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
      *  Finish creating and signing the new LeaseSet
      *  @since 0.9.7
      */
-    protected void signLeaseSet(LeaseSet leaseSet, I2PSessionImpl session) {
+    protected synchronized void signLeaseSet(LeaseSet leaseSet, I2PSessionImpl session) {
+        Destination dest = session.getMyDestination();
         // also, if this session is connected to multiple routers, include other leases here
-        leaseSet.setDestination(session.getMyDestination());
+        leaseSet.setDestination(dest);
 
         // reuse the old keys for the client
-        LeaseInfo li = _existingLeaseSets.get(session.getMyDestination());
+        LeaseInfo li = _existingLeaseSets.get(dest);
         if (li == null) {
-            li = new LeaseInfo(session.getMyDestination());
-            _existingLeaseSets.put(session.getMyDestination(), li);
+            // [enctype:]b64 of private key
+            String spk = session.getOptions().getProperty("i2cp.leaseSetPrivateKey");
+            // [sigtype:]b64 of private key
+            String sspk = session.getOptions().getProperty("i2cp.leaseSetSigningPrivateKey");
+            PrivateKey privKey = null;
+            SigningPrivateKey signingPrivKey = null;
+            boolean useOldKeys;
+            if (spk != null && sspk != null) {
+                useOldKeys = true;
+                int colon = sspk.indexOf(':');
+                SigType type = dest.getSigType();
+                if (colon > 0) {
+                    String stype = sspk.substring(0, colon);
+                    SigType t = SigType.parseSigType(stype);
+                    if (t == type)
+                        sspk = sspk.substring(colon + 1);
+                    else
+                        useOldKeys = false;
+                }
+                colon = spk.indexOf(':');
+                // just ignore for now, no other types supported
+                if (colon >= 0)
+                    spk = spk.substring(colon + 1);
+                if (useOldKeys) {
+                    try {
+                        signingPrivKey = new SigningPrivateKey(type);
+                        signingPrivKey.fromBase64(sspk);
+                    } catch (DataFormatException iae) {
+                        useOldKeys = false;
+                    }
+                }
+                if (useOldKeys) {
+                    try {
+                        privKey = new PrivateKey();
+                        privKey.fromBase64(spk);
+                    } catch (DataFormatException iae) {
+                        useOldKeys = false;
+                    }
+                }
+            } else {
+                useOldKeys = false;
+            }
+            if (useOldKeys)
+                li = new LeaseInfo(privKey, signingPrivKey);
+            else
+                li = new LeaseInfo(dest);
+            _existingLeaseSets.put(dest, li);
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Creating new leaseInfo keys for "  
-                           + session.getMyDestination().calculateHash().toBase64());
+                           + dest + " using configured private keys? " + useOldKeys);
         } else {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Caching the old leaseInfo keys for " 
-                           + session.getMyDestination().calculateHash().toBase64());
+                           + dest);
         }
 
         leaseSet.setEncryptionKey(li.getPublicKey());
@@ -133,7 +179,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
         private final SigningPrivateKey _signingPrivKey;
 
         public LeaseInfo(Destination dest) {
-            Object encKeys[] = KeyGenerator.getInstance().generatePKIKeypair();
+            SimpleDataStructure encKeys[] = KeyGenerator.getInstance().generatePKIKeys();
             // must be same type as the Destination's signing key
             SimpleDataStructure signKeys[];
             try {
@@ -147,6 +193,16 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
             _signingPrivKey = (SigningPrivateKey) signKeys[1];
         }
 
+        /**
+         *  @since 0.9.18
+         */
+        public LeaseInfo(PrivateKey privKey, SigningPrivateKey signingPrivKey) {
+            _pubKey = KeyGenerator.getPublicKey(privKey);
+            _privKey = privKey;
+            _signingPubKey = KeyGenerator.getSigningPublicKey(signingPrivKey);
+            _signingPrivKey = signingPrivKey;
+        }
+
         public PublicKey getPublicKey() {
             return _pubKey;
         }
diff --git a/core/java/src/net/i2p/crypto/CryptoConstants.java b/core/java/src/net/i2p/crypto/CryptoConstants.java
index 21ebe3c1d42fde2e78e795f800d1cb45f3815518..94facd366bb36bac43e4b676f5f7be6474acd842 100644
--- a/core/java/src/net/i2p/crypto/CryptoConstants.java
+++ b/core/java/src/net/i2p/crypto/CryptoConstants.java
@@ -29,7 +29,9 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.lang.reflect.Constructor;
 import java.math.BigInteger;
+import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.DSAParameterSpec;
 
 import net.i2p.util.NativeBigInteger;
@@ -37,6 +39,9 @@ import net.i2p.util.NativeBigInteger;
 /**
  * Prime for ElGamal from http://tools.ietf.org/html/rfc3526
  * Primes for DSA: Generated by TheCrypto http://article.gmane.org/gmane.comp.security.invisiblenet.iip.devel/343
+ *
+ * See also: ECConstants, RSAConstants
+ *
  */
 public class CryptoConstants {
     public static final BigInteger dsap = new NativeBigInteger(
@@ -52,6 +57,8 @@ public class CryptoConstants {
                                                              + "985e43d136cdcfc6bd5409cd2f450821142a5e6f8eb1c3ab5d0484b8129fcf17bce4f7f3"
                                                              + "3321c3cb3dbb14a905e7b2b3e93be4708cbcc82",
                                                                16);
+
+    /** 2048-bit MODP Group from RFC 3526 */
     public static final BigInteger elgp = new NativeBigInteger("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
                                                                + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
                                                                + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
@@ -63,10 +70,40 @@ public class CryptoConstants {
                                                                + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
                                                                + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
                                                                + "15728E5A8AACAA68FFFFFFFFFFFFFFFF", 16);
+
     public static final BigInteger elgg = new NativeBigInteger("2");
 
     /**
      *  @since 0.9.9
      */
     public static final DSAParameterSpec DSA_SHA1_SPEC = new DSAParameterSpec(dsap, dsaq, dsag);
+
+    /**
+     *  This will be org.bouncycastle.jce.spec.ElgamalParameterSpec
+     *  if BC is available, otherwise it
+     *  will be net.i2p.crypto.ElgamalParameterSpec
+     *
+     *  @since 0.9.18
+     */
+    public static final AlgorithmParameterSpec ELGAMAL_2048_SPEC;
+
+    static {
+        AlgorithmParameterSpec spec;
+        if (ECConstants.isBCAvailable()) {
+            try {
+                Class<?> cls = Class.forName("org.bouncycastle.jce.spec.ElGamalParameterSpec");
+                Constructor<?> con = cls.getConstructor(new Class[] {BigInteger.class, BigInteger.class});
+                spec = (AlgorithmParameterSpec)con.newInstance(new Object[] {elgp, elgg});
+                //System.out.println("BC ElG spec loaded");
+            } catch (Exception e) {
+                //System.out.println("BC ElG spec failed");
+                //e.printStackTrace();
+                spec = new ElGamalParameterSpec(elgp, elgg);
+            }
+        } else {
+            //System.out.println("BC not available");
+            spec = new ElGamalParameterSpec(elgp, elgg);
+        }
+        ELGAMAL_2048_SPEC = spec;
+    }
 }
diff --git a/core/java/src/net/i2p/crypto/DirKeyRing.java b/core/java/src/net/i2p/crypto/DirKeyRing.java
index 38ba45bf8e2f6480fe05b00b678336fa2fcb506a..cc840b36e796d730de755622f0e3a10e198fbf34 100644
--- a/core/java/src/net/i2p/crypto/DirKeyRing.java
+++ b/core/java/src/net/i2p/crypto/DirKeyRing.java
@@ -61,6 +61,9 @@ class DirKeyRing implements KeyRing {
                     throw new GeneralSecurityException("CN mismatch: " + cn);
             }
             return cert.getPublicKey();
+        } catch (IllegalArgumentException iae) {
+            // java 1.8.0_40-b10, openSUSE
+            throw new GeneralSecurityException("Bad cert", iae);
         } finally {
             try { if (fis != null) fis.close(); } catch (IOException foo) {}
         }
diff --git a/core/java/src/net/i2p/crypto/ElGamalParameterSpec.java b/core/java/src/net/i2p/crypto/ElGamalParameterSpec.java
new file mode 100644
index 0000000000000000000000000000000000000000..cee640804633809432703ae796ad21b93332e694
--- /dev/null
+++ b/core/java/src/net/i2p/crypto/ElGamalParameterSpec.java
@@ -0,0 +1,66 @@
+package net.i2p.crypto;
+
+/*
+ * Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+import java.math.BigInteger;
+import java.security.spec.AlgorithmParameterSpec;
+
+/**
+ *  Copied from org.bouncycastle.jce.spec
+ *  This can't actually be passed to the BC provider, we would have to
+ *  use reflection to create a "real" org.bouncycasle.jce.spec.ElGamalParameterSpec.
+ *
+ *  @since 0.9.18
+ */
+public class ElGamalParameterSpec implements AlgorithmParameterSpec {
+    private final BigInteger p;
+    private final BigInteger g;
+
+    /**
+     * Constructs a parameter set for Diffie-Hellman, using a prime modulus
+     * <code>p</code> and a base generator <code>g</code>.
+     * 
+     * @param p the prime modulus
+     * @param g the base generator
+     */
+    public ElGamalParameterSpec(BigInteger p, BigInteger g) {
+        this.p = p;
+        this.g = g;
+    }
+
+    /**
+     * Returns the prime modulus <code>p</code>.
+     *
+     * @return the prime modulus <code>p</code>
+     */
+    public BigInteger getP() {
+        return p;
+    }
+
+    /**
+     * Returns the base generator <code>g</code>.
+     *
+     * @return the base generator <code>g</code>
+     */
+    public BigInteger getG() {
+        return g;
+    }
+}
diff --git a/core/java/src/net/i2p/crypto/EncAlgo.java b/core/java/src/net/i2p/crypto/EncAlgo.java
new file mode 100644
index 0000000000000000000000000000000000000000..751701bccb30f225af6027c2c4adf385099156f0
--- /dev/null
+++ b/core/java/src/net/i2p/crypto/EncAlgo.java
@@ -0,0 +1,22 @@
+package net.i2p.crypto;
+
+/**
+ * PRELIMINARY - unused - subject to change
+ *
+ * Base encryption algorithm type
+ *
+ * @since 0.9.18
+ */
+public enum EncAlgo {
+
+    ELGAMAL("ElGamal"),
+    EC("EC");
+
+    private final String name;
+
+    EncAlgo(String name) {
+        this.name = name;
+    }
+
+    public String getName() { return name; }
+}
diff --git a/core/java/src/net/i2p/crypto/EncType.java b/core/java/src/net/i2p/crypto/EncType.java
new file mode 100644
index 0000000000000000000000000000000000000000..cb9c0ad9632432ae068fe9b0566825c1ecc8a361
--- /dev/null
+++ b/core/java/src/net/i2p/crypto/EncType.java
@@ -0,0 +1,171 @@
+package net.i2p.crypto;
+
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.InvalidParameterSpecException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import net.i2p.data.Hash;
+import net.i2p.data.SimpleDataStructure;
+
+/**
+ * PRELIMINARY - unused - subject to change
+ *
+ * Defines the properties for various encryption types
+ * that I2P supports or may someday support.
+ *
+ * All PublicKeys and PrivateKeys have a type.
+ * Note that a EncType specifies both an algorithm and parameters, so that
+ * we may change primes or curves for a given algorithm.
+ *
+ * @since 0.9.18
+ */
+public enum EncType {
+    /**
+     *  2048-bit MODP Group from RFC 3526.
+     *  This is the default.
+     *  Pubkey 256 bytes, privkey 256 bytes.
+     */
+    ELGAMAL_2048(0, 256, 256, EncAlgo.ELGAMAL, "ElGamal/None/NoPadding", CryptoConstants.ELGAMAL_2048_SPEC, "0"),
+
+    /**  Pubkey 64 bytes; privkey 32 bytes; */
+    EC_P256(1, 64, 32, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P256_SPEC, "0.9.20"),
+
+    /**  Pubkey 96 bytes; privkey 48 bytes; */
+    EC_P384(2, 96, 48, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P384_SPEC, "0.9.20"),
+
+    /**  Pubkey 132 bytes; privkey 66 bytes; */
+    EC_P521(3, 132, 66, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P521_SPEC, "0.9.20");
+
+
+
+
+    private final int code, pubkeyLen, privkeyLen;
+    private final EncAlgo base;
+    private final String algoName, since;
+    private final AlgorithmParameterSpec params;
+    private final boolean isAvail;
+
+    /**
+     *
+     *  @param transformation algorithm/mode/padding
+     *
+     */
+    EncType(int cod, int pubLen, int privLen, EncAlgo baseAlgo,
+            String transformation, AlgorithmParameterSpec pSpec, String supportedSince) {
+        code = cod;
+        pubkeyLen = pubLen;
+        privkeyLen = privLen;
+        base = baseAlgo;
+        algoName = transformation;
+        params = pSpec;
+        since = supportedSince;
+        isAvail = x_isAvailable();
+    }
+
+    /** the unique identifier for this type */
+    public int getCode() { return code; }
+
+    /** the length of the public key, in bytes */
+    public int getPubkeyLen() { return pubkeyLen; }
+
+    /** the length of the private key, in bytes */
+    public int getPrivkeyLen() { return privkeyLen; }
+
+    /** the standard base algorithm name used for the Java crypto factories */
+    public EncAlgo getBaseAlgorithm() { return base; }
+
+    /** the standard name used for the Java crypto factories */
+    public String getAlgorithmName() { return algoName; }
+
+    /**
+     *  The elliptic curve ECParameterSpec for ECDSA; DSAParameterSpec for DSA
+     *  @throws InvalidParameterSpecException if the algorithm is not available on this JVM.
+     */
+    public AlgorithmParameterSpec getParams() throws InvalidParameterSpecException {
+        if (params == null)
+            throw new InvalidParameterSpecException(toString() + " is not available in this JVM");
+        return params;
+    }
+
+    /**
+     *  The router version in which this type was first supported.
+     */
+    public String getSupportedSince() {
+        return since;
+    }
+
+    /**
+     *  @return true if supported in this JVM
+     */
+    public boolean isAvailable() {
+        return isAvail;
+    }
+
+    private boolean x_isAvailable() {
+        if (ELGAMAL_2048 == this)
+            return true;
+        try {
+            getParams();
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *  @return true if supported in this JVM
+     */
+    public static boolean isAvailable(int code) {
+        EncType type = getByCode(code);
+        if (type == null)
+            return false;
+        return type.isAvailable();
+    }
+
+    /**
+     *  @param stype number or name
+     *  @return true if supported in this JVM
+     */
+    public static boolean isAvailable(String stype) {
+        EncType type = parseEncType(stype);
+        if (type == null)
+            return false;
+        return type.isAvailable();
+    }
+
+    private static final Map<Integer, EncType> BY_CODE = new HashMap<Integer, EncType>();
+
+    static {
+        for (EncType type : EncType.values()) {
+            if (BY_CODE.put(Integer.valueOf(type.getCode()), type) != null)
+                throw new IllegalStateException("Duplicate EncType code");
+        }
+    }
+
+    /** @return null if not supported */
+    public static EncType getByCode(int code) {
+        return BY_CODE.get(Integer.valueOf(code));
+    }
+
+    /**
+     *  Convenience for user apps
+     *
+     *  @param stype number or name
+     *  @return null if not found
+     */
+    public static EncType parseEncType(String stype) {
+        try {
+            String uc = stype.toUpperCase(Locale.US);
+            return valueOf(uc);
+        } catch (IllegalArgumentException iae) {
+            try {
+                int code = Integer.parseInt(stype);
+                return getByCode(code);
+            } catch (NumberFormatException nfe) {
+                return null;
+            }
+        }
+    }
+}
diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java
index 5e86e2719dc486ed3a359d082b28ae7f7cecfb11..aa6164e3055a3020dbf68c1d072b4467b0eed5be 100644
--- a/core/java/src/net/i2p/crypto/KeyGenerator.java
+++ b/core/java/src/net/i2p/crypto/KeyGenerator.java
@@ -26,6 +26,9 @@ import java.security.spec.ECPublicKeySpec;
 import java.security.spec.EllipticCurve;
 import java.security.spec.RSAKeyGenParameterSpec;
 import java.security.spec.RSAPublicKeySpec;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
@@ -334,6 +337,9 @@ public class KeyGenerator {
         }
     }
 
+    /**
+     *  Usage: KeyGenerator [sigtype...]
+     */
     public static void main(String args[]) {
         try {
              main2(args);
@@ -342,14 +348,35 @@ public class KeyGenerator {
         }
     }
 
-    public static void main2(String args[]) {
+    /**
+     *  Usage: KeyGenerator [sigtype...]
+     */
+    private static void main2(String args[]) {
         RandomSource.getInstance().nextBoolean();
         try { Thread.sleep(1000); } catch (InterruptedException ie) {}
         int runs = 200; // warmup
+        Collection<SigType> toTest;
+        if (args.length > 0) {
+            toTest = new ArrayList<SigType>();
+            for (int i = 0; i < args.length; i++) {
+                SigType type = SigType.parseSigType(args[i]);
+                if (type != null)
+                    toTest.add(type);
+                else
+                    System.out.println("Unknown type: " + args[i]);
+            }
+            if (toTest.isEmpty()) {
+                System.out.println("No types to test");
+                return;
+            }
+        } else {
+            toTest = Arrays.asList(SigType.values());
+        }
         for (int j = 0; j < 2; j++) {
-            for (SigType type : SigType.values()) {
+            for (SigType type : toTest) {
                 if (!type.isAvailable()) {
                     System.out.println("Skipping unavailable: " + type);
+                    continue;
                 }
                 try {
                     System.out.println("Testing " + type);
diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
index 3cd641ad684a81a4c7ecd7cadc6185a23f4b7701..c374ad1204a15ffaa90d7e2af5f282082a2e5b47 100644
--- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java
+++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
@@ -248,6 +248,12 @@ public class KeyStoreUtil {
         } catch (IOException ioe) {
             error("Error reading X509 Certificate: " + file.getAbsolutePath(), ioe);
             return false;
+        } catch (IllegalArgumentException iae) {
+            // java 1.8.0_40-b10, openSUSE
+            // Exception in thread "main" java.lang.IllegalArgumentException: Input byte array has wrong 4-byte ending unit
+            // at java.util.Base64$Decoder.decode0(Base64.java:704)
+            error("Error reading X509 Certificate: " + file.getAbsolutePath(), iae);
+            return false;
         } finally {
             try { if (fis != null) fis.close(); } catch (IOException foo) {}
         }
diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java
index 939187ac887d9d35f46999c45c80517205440b80..bc4d0251c7f105cc4cd1ec8cc79900631f410de8 100644
--- a/core/java/src/net/i2p/crypto/SU3File.java
+++ b/core/java/src/net/i2p/crypto/SU3File.java
@@ -50,6 +50,7 @@ public class SU3File {
     private String _version;
     private int _versionLength;
     private String _signer;
+    private int _signatureLength;
     private int _signerLength;
     private int _fileType = -1;
     private ContentType _contentType;
@@ -125,7 +126,7 @@ public class SU3File {
     private static final ContentType DEFAULT_CONTENT_TYPE = ContentType.UNKNOWN;
     // avoid early ctx init
     //private static final SigType DEFAULT_SIG_TYPE = SigType.DSA_SHA1;
-    private static final int DEFAULT_SIG_CODE = 0;
+    private static final int DEFAULT_SIG_CODE = 6;
 
     /**
      *
@@ -265,16 +266,16 @@ public class SU3File {
         // In verifyAndMigrate it reads this far then rewinds, but we don't need to here
         if (_sigType == null)
             throw new IOException("unknown sig type: " + sigTypeCode);
-        _signerLength = (int) DataHelper.readLong(in, 2);
-        if (_signerLength != _sigType.getSigLen())
+        _signatureLength = (int) DataHelper.readLong(in, 2);
+        if (_signatureLength != _sigType.getSigLen())
             throw new IOException("bad sig length");
         skip(in, 1);
         int _versionLength = in.read();
         if (_versionLength < MIN_VERSION_BYTES)
             throw new IOException("bad version length");
         skip(in, 1);
-        int signerLen = in.read();
-        if (signerLen <= 0)
+        _signerLength = in.read();
+        if (_signerLength <= 0)
             throw new IOException("bad signer length");
         _contentLength = DataHelper.readLong(in, 8);
         if (_contentLength <= 0)
@@ -302,9 +303,9 @@ public class SU3File {
         }
         _version = new String(data, 0, zbyte, "UTF-8");
 
-        data = new byte[signerLen];
+        data = new byte[_signerLength];
         bytesRead = DataHelper.read(in, data);
-        if (bytesRead != signerLen)
+        if (bytesRead != _signerLength)
             throw new EOFException();
         _signer = DataHelper.getUTF8(data);
 
@@ -413,6 +414,9 @@ public class SU3File {
                 din.on(false);
                 Signature signature = new Signature(_sigType);
                 signature.readBytes(in);
+                int avail = in.available();
+                if (avail > 0)
+                    throw new IOException(avail + " bytes data after sig");
                 SimpleDataStructure hash = _sigType.getHashInstance();
                 hash.setData(sha);
                 //System.out.println("hash\n" + HexDump.dump(sha));
@@ -593,7 +597,7 @@ public class SU3File {
             } else if ("keygen".equals(cmd)) {
                 ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2));
             } else if ("extract".equals(cmd)) {
-                ok = extractCLI(a.get(0), a.get(1), shouldVerify);
+                ok = extractCLI(a.get(0), a.get(1), shouldVerify, kfile);
             } else {
                 showUsageCLI();
             }
@@ -822,6 +826,11 @@ public class SU3File {
                 System.out.println("Private key for " + signerName + " not found in keystore " + privateKeyFile);
                 return false;
             }
+            // now fix the sig type based on the private key
+            SigType oldType = type;
+            type = SigUtil.fromJavaKey(pk).getType();
+            if (oldType != type)
+                System.out.println("Warning: Using private key type " + type + ", ignoring specified type " + oldType);
             SU3File file = new SU3File(signedFile);
             file.write(new File(inputFile), ftype, ctype.getCode(), version, signerName, pk, type);
             System.out.println("Input file '" + inputFile + "' signed and written to '" + signedFile + "'");
@@ -861,10 +870,12 @@ public class SU3File {
      *  @return success
      *  @since 0.9.9
      */
-    private static final boolean extractCLI(String signedFile, String outFile, boolean verifySig) {
+    private static final boolean extractCLI(String signedFile, String outFile, boolean verifySig, String pkFile) {
         InputStream in = null;
         try {
             SU3File file = new SU3File(signedFile);
+            if (pkFile != null)
+                file.setPublicKeyCertificate(new File(pkFile));
             file.setVerifySignature(verifySig);
             File out = new File(outFile);
             boolean ok = file.verifyAndMigrate(out);
@@ -969,6 +980,11 @@ public class SU3File {
             IOException ioe = new IOException("cert error");
             ioe.initCause(gse);
             throw ioe;
+        } catch (IllegalArgumentException iae) {
+            // java 1.8.0_40-b10, openSUSE
+            IOException ioe = new IOException("cert error");
+            ioe.initCause(iae);
+            throw ioe;
         } finally {
             try { if (fis != null) fis.close(); } catch (IOException foo) {}
         }
diff --git a/core/java/src/net/i2p/crypto/SigUtil.java b/core/java/src/net/i2p/crypto/SigUtil.java
index c492dc663066419c56009a59ee0063dff9fe51b7..d04abb438d125646c53760906d2bcd4beeeae13b 100644
--- a/core/java/src/net/i2p/crypto/SigUtil.java
+++ b/core/java/src/net/i2p/crypto/SigUtil.java
@@ -18,6 +18,7 @@ import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
+import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.DSAPrivateKeySpec;
 import java.security.spec.DSAPublicKeySpec;
 import java.security.spec.ECParameterSpec;
@@ -97,6 +98,55 @@ public class SigUtil {
     }
 
     /**
+     *  Use if SigType is unknown.
+     *  For efficiency, use fromJavakey(pk, type) if type is known.
+     *
+     *  @param pk JAVA key!
+     *  @throws IllegalArgumentException on unknown type
+     *  @since 0.9.18
+     */
+    public static SigningPublicKey fromJavaKey(PublicKey pk)
+                              throws GeneralSecurityException {
+        if (pk instanceof DSAPublicKey) {
+            return fromJavaKey((DSAPublicKey) pk);
+        }
+        if (pk instanceof ECPublicKey) {
+            ECPublicKey k = (ECPublicKey) pk;
+            AlgorithmParameterSpec spec = k.getParams();
+            SigType type;
+            if (spec.equals(SigType.ECDSA_SHA256_P256.getParams()))
+                type = SigType.ECDSA_SHA256_P256;
+            else if (spec.equals(SigType.ECDSA_SHA384_P384.getParams()))
+                type = SigType.ECDSA_SHA384_P384;
+            else if (spec.equals(SigType.ECDSA_SHA512_P521.getParams()))
+                type = SigType.ECDSA_SHA512_P521;
+            else
+                throw new IllegalArgumentException("Unknown EC type");
+            return fromJavaKey(k, type);
+        }
+        if (pk instanceof EdDSAPublicKey) {
+            return fromJavaKey((EdDSAPublicKey) pk, SigType.EdDSA_SHA512_Ed25519);
+        }
+        if (pk instanceof RSAPublicKey) {
+            RSAPublicKey k = (RSAPublicKey) pk;
+            int sz = k.getModulus().bitLength();
+            SigType type;
+            if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA256_2048.getParams()).getKeysize())
+                type = SigType.RSA_SHA256_2048;
+            else if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA384_3072.getParams()).getKeysize())
+                type = SigType.RSA_SHA384_3072;
+            else if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA512_4096.getParams()).getKeysize())
+                type = SigType.RSA_SHA512_4096;
+            else
+                throw new IllegalArgumentException("Unknown RSA type");
+            return fromJavaKey(k, type);
+        }
+        throw new IllegalArgumentException("Unknown type");
+    }
+
+    /**
+     *  Use if SigType is known.
+     *
      *  @param pk JAVA key!
      */
     public static SigningPublicKey fromJavaKey(PublicKey pk, SigType type)
@@ -116,6 +166,55 @@ public class SigUtil {
     }
 
     /**
+     *  Use if SigType is unknown.
+     *  For efficiency, use fromJavakey(pk, type) if type is known.
+     *
+     *  @param pk JAVA key!
+     *  @throws IllegalArgumentException on unknown type
+     *  @since 0.9.18
+     */
+    public static SigningPrivateKey fromJavaKey(PrivateKey pk)
+                              throws GeneralSecurityException {
+        if (pk instanceof DSAPrivateKey) {
+            return fromJavaKey((DSAPrivateKey) pk);
+        }
+        if (pk instanceof ECPrivateKey) {
+            ECPrivateKey k = (ECPrivateKey) pk;
+            AlgorithmParameterSpec spec = k.getParams();
+            SigType type;
+            if (spec.equals(SigType.ECDSA_SHA256_P256.getParams()))
+                type = SigType.ECDSA_SHA256_P256;
+            else if (spec.equals(SigType.ECDSA_SHA384_P384.getParams()))
+                type = SigType.ECDSA_SHA384_P384;
+            else if (spec.equals(SigType.ECDSA_SHA512_P521.getParams()))
+                type = SigType.ECDSA_SHA512_P521;
+            else
+                throw new IllegalArgumentException("Unknown EC type");
+            return fromJavaKey(k, type);
+        }
+        if (pk instanceof EdDSAPrivateKey) {
+            return fromJavaKey((EdDSAPrivateKey) pk, SigType.EdDSA_SHA512_Ed25519);
+        }
+        if (pk instanceof RSAPrivateKey) {
+            RSAPrivateKey k = (RSAPrivateKey) pk;
+            int sz = k.getModulus().bitLength();
+            SigType type;
+            if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA256_2048.getParams()).getKeysize())
+                type = SigType.RSA_SHA256_2048;
+            else if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA384_3072.getParams()).getKeysize())
+                type = SigType.RSA_SHA384_3072;
+            else if (sz <= ((RSAKeyGenParameterSpec) SigType.RSA_SHA512_4096.getParams()).getKeysize())
+                type = SigType.RSA_SHA512_4096;
+            else
+                throw new IllegalArgumentException("Unknown RSA type");
+            return fromJavaKey(k, type);
+        }
+        throw new IllegalArgumentException("Unknown type");
+    }
+
+    /**
+     *  Use if SigType is known.
+     *
      *  @param pk JAVA key!
      */
     public static SigningPrivateKey fromJavaKey(PrivateKey pk, SigType type)
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index 791372dfa6a1b64a8dfdc799a57a37d4e8c98aa1..b365a662af43211a7b6d54a9a6a3d890c4c56f34 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -767,10 +767,10 @@ riCe6OlAEiNpcc6mMyIYYWFICbrDFTrDR3wXqwc/Jkcx6L5VVWoagpSzbo3yGhc=
             if (bytesToSignInputStream != null)
                 try {
                     bytesToSignInputStream.close();
+                    fileInputStream.close();
                 } catch (IOException ioe) {
                 }
 
-            fileInputStream = null;
         }
 
         FileOutputStream fileOutputStream = null;
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
index 8dd9831550673c89607fe31379b01b5bdd86e22c..53cff91a0418bb92ada74e70a6775b5dcadd4de5 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
@@ -705,18 +705,11 @@ public class Ed25519FieldElement extends FieldElement {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: What is this? Is the author superstitious?
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // 9 == 8 + 1
         t1 = multiply(t1);
@@ -727,11 +720,6 @@ public class Ed25519FieldElement extends FieldElement {
         // 22 == 2 * 11
         t2 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t2 = t2.square();
-        }
-
         // 31 == 22 + 9
         t1 = t1.multiply(t2);
 
@@ -838,18 +826,11 @@ public class Ed25519FieldElement extends FieldElement {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: see invert
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // z9 = z1*z8
         t1 = multiply(t1);
@@ -860,11 +841,6 @@ public class Ed25519FieldElement extends FieldElement {
         // 22 == 2 * 11
         t0 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 31 == 22 + 9
         t0 = t1.multiply(t0);
 
@@ -949,9 +925,7 @@ public class Ed25519FieldElement extends FieldElement {
         t0 = t0.square();
 
         // 2^252 - 2^2
-        for (int i = 1; i < 2; ++i) {
-            t0 = t0.square();
-        }
+        t0 = t0.square();
 
         // 2^252 - 3
         return multiply(t0);
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
index 70bd6fdf3d85e93a42c5411dcb2c951c49d28ef5..75e1196dd4480a7900dff578d570b6a28275a2e8 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java
@@ -70,7 +70,7 @@ public class Ed25519LittleEndianEncoding extends Encoding {
 
         // Step 1:
         // Calculate q
-        q = (19 * h9 + (((int) 1) << 24)) >> 25;
+        q = (19 * h9 + (1 << 24)) >> 25;
         q = (h0 + q) >> 26;
         q = (h1 + q) >> 25;
         q = (h2 + q) >> 26;
diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java
index 2a30d3631a97bd33618f064ceb5b5c6e423850aa..2633c1b69188a9f7936e486bbedce80ef6be5473 100644
--- a/core/java/src/net/i2p/data/Base64.java
+++ b/core/java/src/net/i2p/data/Base64.java
@@ -726,7 +726,7 @@ public class Base64 {
      * As of 0.9.14, whitespace will cause an error.
      * Prior to that, it was ignored.
      *
-     * @param s the strind to decode
+     * @param s the string to decode
      * @return The data as a string, or null on error
      * @since 1.4
      */
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index b1861671657ea8ff54462c807bf3258547c3c36b..ffa1d2577d3b9dc39f4a6bfbe3505b002adb5cb3 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -172,11 +172,13 @@ public class DataHelper {
      * Property keys and values must not contain '=' or ';', this is not checked and they are not escaped
      * Keys and values must be 255 bytes or less,
      * Formatted length must not exceed 65535 bytes
-     * @throws DataFormatException if either is too long.
+     *
+     * Properties from the defaults table of props (if any) are not written out by this method.
      *
      * @param rawStream stream to write to
      * @param props properties to write out
-     * @throws DataFormatException if there is not enough valid data to write out
+     * @throws DataFormatException if there is not enough valid data to write out,
+     *                             or a length limit is exceeded
      * @throws IOException if there is an IO error writing out the data
      */
     public static void writeProperties(OutputStream rawStream, Properties props) 
@@ -190,7 +192,8 @@ public class DataHelper {
      * Property keys and values must not contain '=' or ';', this is not checked and they are not escaped
      * Keys and values must be 255 bytes or less,
      * Formatted length must not exceed 65535 bytes
-     * @throws DataFormatException if either is too long.
+     *
+     * Properties from the defaults table of props (if any) are not written out by this method.
      *
      * jrandom disabled UTF-8 in mid-2004, for performance reasons,
      * i.e. slow foo.getBytes("UTF-8")
@@ -199,6 +202,7 @@ public class DataHelper {
      * Use utf8 = false for RouterAddress (fast, non UTF-8)
      * Use utf8 = true for SessionConfig (slow, UTF-8)
      * @param props source may be null
+     * @throws DataFormatException if a length limit is exceeded
      */
     public static void writeProperties(OutputStream rawStream, Properties props, boolean utf8) 
             throws DataFormatException, IOException {
@@ -213,6 +217,8 @@ public class DataHelper {
      * Keys and values must be 255 bytes or less,
      * Formatted length must not exceed 65535 bytes
      *
+     * Properties from the defaults table of props (if any) are not written out by this method.
+     *
      * jrandom disabled UTF-8 in mid-2004, for performance reasons,
      * i.e. slow foo.getBytes("UTF-8")
      * Re-enable it so we can pass UTF-8 tunnel names through the I2CP SessionConfig.
@@ -269,6 +275,8 @@ public class DataHelper {
      * Strings will be UTF-8 encoded in the byte array.
      * Warning - confusing method name, Properties is the source.
      *
+     * Properties from the defaults table of props (if any) are not written out by this method.
+     *
      * @deprecated unused
      *
      * @param target returned array as specified in data structure spec
@@ -364,6 +372,8 @@ public class DataHelper {
      * Formatted length must not exceed 65535 bytes
      * Warning - confusing method name, Properties is the source.
      *
+     * Properties from the defaults table of props (if any) are not written out by this method.
+     *
      * @throws DataFormatException if key, value, or total is too long
      */
     public static byte[] toProperties(Properties opts) throws DataFormatException {
@@ -477,6 +487,8 @@ public class DataHelper {
      * Note that this does not escape the \r or \n that are unescaped in loadProps() above.
      * As of 0.8.1, file will be mode 600.
      *
+     * Properties from the defaults table of props (if any) are not written out by this method.
+     *
      * Leading or trailing whitespace in values is not checked but
      * will be trimmed by loadProps()
      *
@@ -680,17 +692,21 @@ public class DataHelper {
     }
     
     /**
+     * Big endian.
+     *
      * @param numBytes 1-8
      * @param value non-negative
+     * @return an array of length numBytes
      */
     public static byte[] toLong(int numBytes, long value) throws IllegalArgumentException {
-        if (value < 0) throw new IllegalArgumentException("Negative value not allowed");
         byte val[] = new byte[numBytes];
         toLong(val, 0, numBytes, value);
         return val;
     }
     
     /**
+     * Big endian.
+     *
      * @param numBytes 1-8
      * @param value non-negative
      */
@@ -712,6 +728,7 @@ public class DataHelper {
      * @since 0.8.12
      */
     public static void toLongLE(byte target[], int offset, int numBytes, long value) {
+        if (numBytes <= 0 || numBytes > 8) throw new IllegalArgumentException("Invalid number of bytes");
         if (value < 0) throw new IllegalArgumentException("Negative value not allowed");
         int limit = offset + numBytes;
         for (int i = offset; i < limit; i++) {
@@ -721,6 +738,8 @@ public class DataHelper {
     }
     
     /**
+     * Big endian.
+     *
      * @param src if null returns 0
      * @param numBytes 1-8
      * @return non-negative
@@ -728,6 +747,7 @@ public class DataHelper {
      * @throws IllegalArgumentException if negative (only possible if numBytes = 8)
      */
     public static long fromLong(byte src[], int offset, int numBytes) {
+        if (numBytes <= 0 || numBytes > 8) throw new IllegalArgumentException("Invalid number of bytes");
         if ( (src == null) || (src.length == 0) )
             return 0;
         
@@ -752,6 +772,7 @@ public class DataHelper {
      * @since 0.8.12
      */
     public static long fromLongLE(byte src[], int offset, int numBytes) {
+        if (numBytes <= 0 || numBytes > 8) throw new IllegalArgumentException("Invalid number of bytes");
         long rv = 0;
         for (int i = offset + numBytes - 1; i >= offset; i--) {
             rv <<= 8;
@@ -1485,11 +1506,11 @@ public class DataHelper {
      * @since 0.8.2
      */
     public static String formatDuration2(long ms) {
+        if (ms == 0)
+            return "0";
         String t;
         long ams = ms >= 0 ? ms : 0 - ms;
-        if (ms == 0) {
-            return "0";
-        } else if (ams < 3 * 1000) {
+        if (ams < 3 * 1000) {
             // NOTE TO TRANSLATORS: Feel free to translate all these as you see fit, there are several options...
             // spaces or not, '.' or not, plural or not. Try not to make it too long, it is used in
             // a lot of tables.
@@ -1529,6 +1550,42 @@ public class DataHelper {
         return t.replace(" ", "&nbsp;");
     }
     
+    /**
+     * Like formatDuration2(long) but with microsec and nanosec also.
+     *
+     * @since 0.9.19
+     */
+    public static String formatDuration2(double ms) {
+        if (ms == 0d)
+            return "0";
+        String t;
+        double adms = ms >= 0 ? ms : 0 - ms;
+        long lms = (long) ms;
+        long ams = lms >= 0 ? lms : 0 - lms;
+        if (adms < 0.000000001d) {
+            return "0";
+        } else if (adms < 0.001d) {
+            t = ngettext("1 ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d));
+        } else if (adms < 1.0d) {
+            t = ngettext("1 μs", "{0,number,###} μs", (int) Math.round(ms * 1000d));
+        } else if (ams < 3 * 1000) {
+            t = ngettext("1 ms", "{0,number,####} ms", (int) Math.round(ms));
+        } else if (ams < 2 * 60 * 1000) {
+            t = ngettext("1 sec", "{0} sec", (int) (ms / 1000));
+        } else if (ams < 120 * 60 * 1000) {
+            t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
+        } else if (ams < 2 * 24 * 60 * 60 * 1000) {
+            t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
+        } else if (ams > 1000l * 24l * 60l * 60l * 1000l) {
+            return _("n/a");
+        } else {
+            t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
+        }
+        if (ms < 0)
+            t = t.replace("-", "&minus;");
+        return t.replace(" ", "&nbsp;");
+    }
+    
     private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
 
     private static String _(String key) {
diff --git a/core/java/src/net/i2p/data/TunnelId.java b/core/java/src/net/i2p/data/TunnelId.java
index d058d63749b5ad06c017455c59a2766361c24c33..2188614ca59a56e33e457a823762abe2b04f81f5 100644
--- a/core/java/src/net/i2p/data/TunnelId.java
+++ b/core/java/src/net/i2p/data/TunnelId.java
@@ -18,6 +18,10 @@ import java.io.OutputStream;
  * the tunnel (otherwise they would get confused and send messages down the 
  * wrong one).
  *
+ * Note that a TunnelId must be greater than zero,
+ * as the DatabaseStoreMessage uses a zero ID to request
+ * a direct reply.
+ *
  * @author jrandom
  */
 public class TunnelId extends DataStructureImpl {
@@ -29,6 +33,10 @@ public class TunnelId extends DataStructureImpl {
         _tunnelId = -1;
     }
 
+    /**
+     *  @param id 1 to 0xffffffff
+     *  @throws IllegalArgumentException if less than or equal to zero
+     */
     public TunnelId(long id) { 
         if (id <= 0) throw new IllegalArgumentException("wtf, tunnelId " + id);
         _tunnelId = id;
@@ -36,6 +44,10 @@ public class TunnelId extends DataStructureImpl {
 
     public long getTunnelId() { return _tunnelId; }
 
+    /**
+     *  @param id 1 to 0xffffffff
+     *  @throws IllegalArgumentException if less than or equal to zero
+     */
     public void setTunnelId(long id) { 
         _tunnelId = id; 
         if (id <= 0) throw new IllegalArgumentException("wtf, tunnelId " + id);
diff --git a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
index 00c5a75b87a25c21be523551d68ef48b1f2aa0c3..a65d626b65a0ea10fb90e362bce920b8a8468eae 100644
--- a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java
@@ -45,6 +45,10 @@ public class GetDateMessage extends I2CPMessageImpl {
     }
 
     /**
+     *  Defaults in GetDateMessage options are, in general, NOT honored.
+     *  Defaults are not serialized out-of-JVM, and the router does not recognize defaults in-JVM.
+     *  Client side must promote defaults to the primary map.
+     *
      *  @param version the client's version String to be sent to the router; may be null;
      *                 must be non-null if options is non-null and non-empty.
      *  @param options Client options to be sent to the router; primarily for authentication; may be null;
diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
index e3f8468c70342eaf0043bce6d63c3592ed6ae623..de6734349e0f9371de22d7744a45b96f30a75a57 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
@@ -41,15 +41,18 @@ public class SessionConfig extends DataStructureImpl {
     private Properties _options;
 
     /** 
-     * if the client authorized this session more than the specified period ago, 
-     * refuse it, since it may be a replay attack
+     * If the client authorized this session more than the specified period ago, 
+     * refuse it, since it may be a replay attack.
      *
+     * Really? See also ClientManager.REQUEST_LEASESET_TIMEOUT.
+     * If I2CP replay attacks are a thing, there's a lot more to do.
      */
-    private final static long OFFSET_VALIDITY = 30 * 1000;
+    private final static long OFFSET_VALIDITY = 3*60*1000;
 
     public SessionConfig() {
         this(null);
     }
+
     public SessionConfig(Destination dest) {
         _destination = dest;
         _creationDate = new Date(Clock.getInstance().now());
@@ -91,6 +94,10 @@ public class SessionConfig extends DataStructureImpl {
      * Configure the session with the given options;
      * keys and values 255 bytes (not chars) max each
      *
+     * Defaults in SessionConfig options are, in general, NOT honored.
+     * Defaults are not serialized out-of-JVM, and the router does not recognize defaults in-JVM.
+     * Client side must promote defaults to the primary map.
+     *
      * @param options Properties for this session
      */
     public void setOptions(Properties options) {
@@ -120,6 +127,9 @@ public class SessionConfig extends DataStructureImpl {
     /**
      * Verify that the signature matches the destination's signing public key.
      *
+     * Note that this also returns false if the creation date is too far in the
+     * past or future. See tooOld() and getCreationDate().
+     *
      * @return true only if the signature matches
      */
     public boolean verifySignature() {
@@ -154,6 +164,9 @@ public class SessionConfig extends DataStructureImpl {
         return ok;
     }
 
+    /**
+     *  Misnamed, could be too old or too far in the future.
+     */
     public boolean tooOld() {
         long now = Clock.getInstance().now();
         long earliestValid = now - OFFSET_VALIDITY;
diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java
index b7889917264e5c92d34f479b4fc414fea2ffcb5c..f0f59a1b911675f4a1e78a4acfd8d10f7b3c9ce9 100644
--- a/core/java/src/net/i2p/stat/StatManager.java
+++ b/core/java/src/net/i2p/stat/StatManager.java
@@ -1,5 +1,6 @@
 package net.i2p.stat;
 
+import java.text.Collator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -216,7 +217,7 @@ public class StatManager {
             String gname = stat.getGroupName();
             SortedSet<String> names = groups.get(gname);
             if (names == null) {
-                names = new TreeSet<String>();
+                names = new TreeSet<String>(Collator.getInstance());
                 groups.put(gname, names);
             }
             names.add(stat.getName());
@@ -225,7 +226,7 @@ public class StatManager {
             String gname = stat.getGroupName();
             SortedSet<String> names = groups.get(gname);
             if (names == null) {
-                names = new TreeSet<String>();
+                names = new TreeSet<String>(Collator.getInstance());
                 groups.put(gname, names);
             }
             names.add(stat.getName());
diff --git a/core/java/src/net/i2p/util/Clock.java b/core/java/src/net/i2p/util/Clock.java
index 25600259c6b786f60f8ba33932b156b1c4830a8d..521facd2d583d6743d0493fa94e69d67567569e8 100644
--- a/core/java/src/net/i2p/util/Clock.java
+++ b/core/java/src/net/i2p/util/Clock.java
@@ -71,21 +71,27 @@ public class Clock implements Timestamper.UpdateListener {
         long delta = offsetMs - _offset;
         if (!force) {
             if ((offsetMs > MAX_OFFSET) || (offsetMs < 0 - MAX_OFFSET)) {
-                getLog().error("Maximum offset shift exceeded [" + offsetMs + "], NOT HONORING IT");
+                Log log = getLog();
+                if (log.shouldLog(Log.WARN))
+                    log.warn("Maximum offset shift exceeded [" + offsetMs + "], NOT HONORING IT");
                 return;
             }
             
             // only allow substantial modifications before the first 10 minutes
             if (_alreadyChanged && (System.currentTimeMillis() - _startedOn > 10 * 60 * 1000)) {
                 if ( (delta > MAX_LIVE_OFFSET) || (delta < 0 - MAX_LIVE_OFFSET) ) {
-                    getLog().log(Log.CRIT, "The clock has already been updated, but you want to change it by "
+                    Log log = getLog();
+                    if (log.shouldLog(Log.WARN))
+                        log.warn("The clock has already been updated, but you want to change it by "
                                            + delta + " to " + offsetMs + "?  Did something break?");
                     return;
                 }
             }
             
             if ((delta < MIN_OFFSET_CHANGE) && (delta > 0 - MIN_OFFSET_CHANGE)) {
-                getLog().debug("Not changing offset since it is only " + delta + "ms");
+                Log log = getLog();
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Not changing offset since it is only " + delta + "ms");
                 _alreadyChanged = true;
                 return;
             }
@@ -102,7 +108,9 @@ public class Clock implements Timestamper.UpdateListener {
             }
             _context.statManager().addRateData("clock.skew", delta, 0);
         } else {
-            getLog().log(Log.INFO, "Initializing clock offset to " + offsetMs + "ms from " + _offset + "ms");
+            Log log = getLog();
+            if (log.shouldLog(Log.INFO))
+                log.info("Initializing clock offset to " + offsetMs + "ms from " + _offset + "ms");
         }
         _alreadyChanged = true;
         _offset = offsetMs;
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 87af550efb35076ba3d66eead0146340c9edbe8c..157a86a7139196220dddd912142f326c28c3a9e2 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -176,7 +176,7 @@ public class EepGet {
     public static void main(String args[]) {
         String proxyHost = "127.0.0.1";
         int proxyPort = 4444;
-        int numRetries = 5;
+        int numRetries = 0;
         int markSize = 1024;
         int lineLen = 40;
         long inactivityTimeout = INACTIVITY_TIMEOUT;
@@ -360,7 +360,7 @@ public class EepGet {
 
     private static void usage() {
         System.err.println("eepget [-p 127.0.0.1[:4444]] [-c] [-o outputFile]\n" +
-                           "       [-n #retries] (default 5)\n" +
+                           "       [-n #retries] (default 0)\n" +
                            "       [-m markSize] (default 1024)\n" +
                            "       [-l lineLen]  (default 40)\n" +
                            "       [-t timeout]  (default 60 sec)\n" +
@@ -1312,18 +1312,32 @@ public class EepGet {
         return buf.toString();
     }
 
+    /**
+     *  After fetch, the received value from the server, or null if none.
+     *  Before fetch, and after some errors, may be the value passed in the constructor.
+     */
     public String getETag() {
         return _etag;
     }
     
+    /**
+     *  After fetch, the received value from the server, or null if none.
+     *  Before fetch, and after some errors, may be the value passed in the constructor.
+     */
     public String getLastModified() {
         return _lastModified;
     }
     
+    /**
+     *  @return true if the server returned 304
+     */
     public boolean getNotModified() {
         return _notModified;
     }
     
+    /**
+     *  After fetch, the received value from the server, or null if none.
+     */
     public String getContentType() {
         return _contentType;
     }
diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java
index 54a93b2a04f2799c4986c1579bf6c9851b5b8cb0..340b836a4694fda43bc87c9fdeda50177032fcad 100644
--- a/core/java/src/net/i2p/util/FortunaRandomSource.java
+++ b/core/java/src/net/i2p/util/FortunaRandomSource.java
@@ -27,13 +27,18 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
     private double _nextGaussian;
     private boolean _haveNextGaussian;
 
+    /**
+     *  May block up to 10 seconds or forever
+     */
     public FortunaRandomSource(I2PAppContext context) {
         super(context);
         _fortuna = new AsyncFortunaStandalone(context);
         byte seed[] = new byte[1024];
+        // may block for 10 seconds
         if (initSeed(seed)) {
             _fortuna.seed(seed);
         } else {
+            // may block forever
             SecureRandom sr = new SecureRandom();
             sr.nextBytes(seed);
             _fortuna.seed(seed);
diff --git a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
index ba292394a75ad1edc95e3d0795939f660572dc01..cffff089c8661e85782df4eda32e8f82f66423f9 100644
--- a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
+++ b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
@@ -337,7 +337,7 @@ public class I2PSSLSocketFactory {
             return enabledArr;
         }
         if (log.shouldLog(Log.DEBUG)) {
-            List<String> foo = new ArrayList(selected);
+            List<String> foo = new ArrayList<String>(selected);
             Collections.sort(foo);
             log.debug("Selected: " + foo);
         }
diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java
index 1d24e34ef45138de296eb4be2df26400698c9688..f695b08a274148f76a3bd72ad856f96227c03313 100644
--- a/core/java/src/net/i2p/util/LogWriter.java
+++ b/core/java/src/net/i2p/util/LogWriter.java
@@ -14,139 +14,24 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Queue;
 
 /**
- * Log writer thread that pulls log records from the LogManager, writes them to
- * the current logfile, and rotates the logs as necessary.  This also periodically
- * instructs the LogManager to reread its config file.
+ * File-based log writer thread that pulls log records from the LogManager,
+ * writes them to the current logfile, and rotates the logs as necessary.
  *
  */
-class LogWriter implements Runnable {
-    /** every 10 seconds? why? Just have the gui force a reread after a change?? */
-    private final static long CONFIG_READ_INTERVAL = 50 * 1000;
-    final static long FLUSH_INTERVAL = 29 * 1000;
-    private final static long MIN_FLUSH_INTERVAL = 2*1000;
-    private final static long MAX_FLUSH_INTERVAL = 5*60*1000;
-    private long _lastReadConfig;
-    private long _numBytesInCurrentFile;
+class LogWriter extends LogWriterBase {
     // volatile as it changes on log file rotation
     private volatile Writer _currentOut;
     private int _rotationNum = -1;
     private File _currentFile;
-    private final LogManager _manager;
+    private long _numBytesInCurrentFile;
 
-    private volatile boolean _write;
     private static final int MAX_DISKFULL_MESSAGES = 8;
     private int _diskFullMessageCount;
-    private LogRecord _last;
-    // ms
-    private volatile long _flushInterval = FLUSH_INTERVAL;
-    
-    public LogWriter(LogManager manager) {
-        _manager = manager;
-        _lastReadConfig = Clock.getInstance().now();
-    }
-
-    public void stopWriting() {
-        _write = false;
-    }
-
-    /**
-     *  @param ms
-     *  @since 0.9.18
-     */
-    public void setFlushInterval(long interval) {
-        _flushInterval = Math.min(MAX_FLUSH_INTERVAL, Math.max(MIN_FLUSH_INTERVAL, interval));
-    }
-    
-    public void run() {
-        _write = true;
-        try {
-            // Don't rotate and open until needed
-            //rotateFile();
-            while (_write) {
-                flushRecords();
-                if (_write)
-                    rereadConfig();
-            }
-            //System.err.println("Done writing");
-        } catch (Exception e) {
-            System.err.println("Error writing the log: " + e);
-            e.printStackTrace();
-        }
-        closeFile();
-    }
-
-    public void flushRecords() { flushRecords(true); }
-
-    public void flushRecords(boolean shouldWait) {
-        try {
-            // zero copy, drain the manager queue directly
-            Queue<LogRecord> records = _manager.getQueue();
-            if (records == null) return;
-            if (!records.isEmpty()) {
-                if (_last != null && _last.getDate() < _manager.getContext().clock().now() - 30*60*1000)
-                    _last = null;
-                LogRecord rec;
-                int dupCount = 0;
-                while ((rec = records.poll()) != null) {
-                    if (_manager.shouldDropDuplicates() && rec.equals(_last)) {
-                        dupCount++;
-                    } else {
-                        if (dupCount > 0) {
-                            writeRecord(dupMessage(dupCount, _last, false));
-                            _manager.getBuffer().add(dupMessage(dupCount, _last, true));
-                            dupCount = 0;
-                        }
-                        writeRecord(rec);
-                    }
-                    _last = rec;
-                }
-                if (dupCount > 0) {
-                    writeRecord(dupMessage(dupCount, _last, false));
-                    _manager.getBuffer().add(dupMessage(dupCount, _last, true));
-                }
-                try {
-                    if (_currentOut != null)
-                        _currentOut.flush();
-                } catch (IOException ioe) {
-                    if (_write && ++_diskFullMessageCount < MAX_DISKFULL_MESSAGES)
-                        System.err.println("Error writing the router log - disk full? " + ioe);
-                }
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-        } finally {
-            if (shouldWait) {
-                try { 
-                    synchronized (this) {
-                        this.wait(_flushInterval); 
-                    }
-                } catch (InterruptedException ie) { // nop
-                }
-            }
-        }
-    }
-
-    /**
-     *  Return a msg with the date stamp of the last duplicate
-     *  @since 0.9.3
-     */
-    private String dupMessage(int dupCount, LogRecord lastRecord, boolean reverse) {
-        String arrows = reverse ? "&darr;&darr;&darr;" : "^^^";
-        return LogRecordFormatter.getWhen(_manager, lastRecord) + ' ' + arrows + ' ' +
-               _(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + '\n';
-    }
-    
-    private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
 
-    /**
-     *  gettext
-     *  @since 0.9.3
-     */
-    private String _(int a, String b, String c) {
-        return Translate.getString(a, b, c, _manager.getContext(), BUNDLE_NAME);
+    public LogWriter(LogManager manager) {
+        super(manager);
     }
 
     /**
@@ -161,34 +46,11 @@ class LogWriter implements Runnable {
         return rv;
     }
 
-    private void rereadConfig() {
-        long now = Clock.getInstance().now();
-        if (now - _lastReadConfig > CONFIG_READ_INTERVAL) {
-            _manager.rereadConfig();
-            _lastReadConfig = now;
-        }
+    protected void writeRecord(LogRecord rec, String formatted) {
+    	writeRecord(rec.getPriority(), formatted);
     }
 
-    private void writeRecord(LogRecord rec) {
-        String val = LogRecordFormatter.formatRecord(_manager, rec, true);
-        writeRecord(val);
-
-        // we always add to the console buffer, but only sometimes write to stdout
-        _manager.getBuffer().add(val);
-        if (rec.getPriority() >= Log.CRIT)
-            _manager.getBuffer().addCritical(val);
-        if (_manager.getDisplayOnScreenLevel() <= rec.getPriority()) {
-            if (_manager.displayOnScreen()) {
-                // wrapper log already does time stamps, so reformat without the date
-                if (_manager.getContext().hasWrapper())
-                    System.out.print(LogRecordFormatter.formatRecord(_manager, rec, false));
-                else
-                    System.out.print(val);
-            }
-        }
-    }
-
-    private synchronized void writeRecord(String val) {
+    protected synchronized void writeRecord(int priority, String val) {
         if (val == null) return;
         if (_currentOut == null) {
             rotateFile();
@@ -212,6 +74,25 @@ class LogWriter implements Runnable {
         }
     }
 
+    protected void flushWriter() {
+        try {
+            if (_currentOut != null)
+                _currentOut.flush();
+        } catch (IOException ioe) {
+            if (_write && ++_diskFullMessageCount < MAX_DISKFULL_MESSAGES)
+                System.err.println("Error writing the router log - disk full? " + ioe);
+        }
+    }
+
+    protected void closeWriter() {
+        Writer out = _currentOut;
+        if (out != null) {
+            try {
+                out.close();
+            } catch (IOException ioe) {}
+        }
+    }
+
     /**
      * Rotate to the next file (or the first file if this is the first call)
      *
@@ -236,7 +117,7 @@ class LogWriter implements Runnable {
                 //System.exit(0);
             }
         }
-        closeFile();
+        closeWriter();
         try {
             _currentOut = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8"));
         } catch (IOException ioe) {
@@ -245,15 +126,6 @@ class LogWriter implements Runnable {
         }
     }
 
-    private void closeFile() {
-        Writer out = _currentOut;
-        if (out != null) {
-            try {
-                out.close();
-            } catch (IOException ioe) {}
-        }
-    }
-
     /**
      * Get the next file in the rotation
      *
diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java
new file mode 100644
index 0000000000000000000000000000000000000000..8c2430c43566e285349e236d22bef80d272c1436
--- /dev/null
+++ b/core/java/src/net/i2p/util/LogWriterBase.java
@@ -0,0 +1,173 @@
+package net.i2p.util;
+
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain 
+ * with no warranty of any kind, either expressed or implied.  
+ * It probably won't make your computer catch on fire, or eat 
+ * your children, but it might.  Use at your own risk.
+ *
+ */
+
+import java.util.Queue;
+
+/**
+ * Log writer thread that pulls log records from the LogManager and writes them to
+ * the log.  This also periodically instructs the LogManager to reread its config
+ * file.
+ *
+ */
+abstract class LogWriterBase implements Runnable {
+    /** every 10 seconds? why? Just have the gui force a reread after a change?? */
+    private final static long CONFIG_READ_INTERVAL = 50 * 1000;
+    final static long FLUSH_INTERVAL = 29 * 1000;
+    private final static long MIN_FLUSH_INTERVAL = 2*1000;
+    private final static long MAX_FLUSH_INTERVAL = 5*60*1000;
+    private long _lastReadConfig;
+    protected final LogManager _manager;
+
+    protected volatile boolean _write;
+    private LogRecord _last;
+    // ms
+    private volatile long _flushInterval = FLUSH_INTERVAL;
+
+    public LogWriterBase(LogManager manager) {
+        _manager = manager;
+        _lastReadConfig = Clock.getInstance().now();
+    }
+
+    public abstract String currentFile();
+    /**
+     * Write the provided LogRecord to the writer.
+     * @param rec the LogRecord to write.
+     * @param formatted a String pre-formatted from rec, may be ignored.
+     */
+    protected abstract void writeRecord(LogRecord rec, String formatted);
+    /**
+     * Write a single String verbatim to the writer.
+     * @param priority the level to log the line at.
+     * @param line the String to write.
+     */
+    protected abstract void writeRecord(int priority, String line);
+    protected abstract void flushWriter();
+    protected abstract void closeWriter();
+
+    public void stopWriting() {
+        _write = false;
+    }
+
+    /**
+     *  @param interval ms
+     *  @since 0.9.18
+     */
+    public void setFlushInterval(long interval) {
+        _flushInterval = Math.min(MAX_FLUSH_INTERVAL, Math.max(MIN_FLUSH_INTERVAL, interval));
+    }
+
+    public void run() {
+        _write = true;
+        try {
+            while (_write) {
+                flushRecords();
+                if (_write)
+                    rereadConfig();
+            }
+        } catch (Exception e) {
+            System.err.println("Error writing the log: " + e);
+            e.printStackTrace();
+        }
+        closeWriter();
+    }
+
+    public void flushRecords() { flushRecords(true); }
+
+    public void flushRecords(boolean shouldWait) {
+        try {
+            // zero copy, drain the manager queue directly
+            Queue<LogRecord> records = _manager.getQueue();
+            if (records == null) return;
+            if (!records.isEmpty()) {
+                if (_last != null && _last.getDate() < _manager.getContext().clock().now() - 30*60*1000)
+                    _last = null;
+                LogRecord rec;
+                int dupCount = 0;
+                while ((rec = records.poll()) != null) {
+                    if (_manager.shouldDropDuplicates() && rec.equals(_last)) {
+                        dupCount++;
+                    } else {
+                        if (dupCount > 0) {
+                            writeRecord(_last.getPriority(), dupMessage(dupCount, _last, false));
+                            _manager.getBuffer().add(dupMessage(dupCount, _last, true));
+                            dupCount = 0;
+                        }
+                        writeRecord(rec);
+                    }
+                    _last = rec;
+                }
+                if (dupCount > 0) {
+                    writeRecord(_last.getPriority(), dupMessage(dupCount, _last, false));
+                    _manager.getBuffer().add(dupMessage(dupCount, _last, true));
+                }
+                flushWriter();
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        } finally {
+            if (shouldWait) {
+                try { 
+                    synchronized (this) {
+                        this.wait(_flushInterval); 
+                    }
+                } catch (InterruptedException ie) { // nop
+                }
+            }
+        }
+    }
+
+    /**
+     *  Return a msg with the date stamp of the last duplicate
+     *  @since 0.9.3
+     */
+    private String dupMessage(int dupCount, LogRecord lastRecord, boolean reverse) {
+        String arrows = reverse ? "&darr;&darr;&darr;" : "^^^";
+        return LogRecordFormatter.getWhen(_manager, lastRecord) + ' ' + arrows + ' ' +
+               _(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + '\n';
+    }
+    
+    private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
+
+    /**
+     *  gettext
+     *  @since 0.9.3
+     */
+    private String _(int a, String b, String c) {
+        return Translate.getString(a, b, c, _manager.getContext(), BUNDLE_NAME);
+    }
+
+    private void rereadConfig() {
+        long now = Clock.getInstance().now();
+        if (now - _lastReadConfig > CONFIG_READ_INTERVAL) {
+            _manager.rereadConfig();
+            _lastReadConfig = now;
+        }
+    }
+
+    private void writeRecord(LogRecord rec) {
+        String val = LogRecordFormatter.formatRecord(_manager, rec, true);
+        writeRecord(rec, val);
+
+        // we always add to the console buffer, but only sometimes write to stdout
+        _manager.getBuffer().add(val);
+        if (rec.getPriority() >= Log.CRIT)
+            _manager.getBuffer().addCritical(val);
+        if (_manager.getDisplayOnScreenLevel() <= rec.getPriority()) {
+            if (_manager.displayOnScreen()) {
+                // wrapper and android logs already do time stamps, so reformat without the date
+                if (_manager.getContext().hasWrapper() || SystemVersion.isAndroid())
+                    System.out.print(LogRecordFormatter.formatRecord(_manager, rec, false));
+                else
+                    System.out.print(val);
+            }
+        }
+    }
+}
diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java
index 56c97bb82152d2b22e75923693df956af34a42fb..9c522ddd0b2d5a1431922cf08c1b2baf240042ec 100644
--- a/core/java/src/net/i2p/util/RandomSource.java
+++ b/core/java/src/net/i2p/util/RandomSource.java
@@ -145,6 +145,9 @@ public class RandomSource extends SecureRandom implements EntropyHarvester {
         }
     }
 
+    /**
+     *  May block up to 10 seconds
+     */
     public void loadSeed() {
         byte buf[] = new byte[1024];
         if (initSeed(buf))
@@ -172,12 +175,31 @@ public class RandomSource extends SecureRandom implements EntropyHarvester {
         }
     }
  
+    /**
+     *  May block up to 10 seconds
+     */
     public final boolean initSeed(byte buf[]) {
         boolean ok = false;
+
+        final byte[] tbuf = new byte[buf.length];
+        Thread t = new I2PThread(new SecureRandomInit(tbuf), "SecureRandomInit", true);
+        t.start();
         try {
-            SecureRandom.getInstance("SHA1PRNG").nextBytes(buf);
-            ok = true;
-        } catch (NoSuchAlgorithmException e) {}
+            t.join(10*1000);
+            synchronized(tbuf) {
+                for (int i = 0; i < tbuf.length; i++) {
+                    if (tbuf[i] != 0) {
+                        ok = true;
+                        break;
+                    }
+                }
+                if (ok)
+                    System.arraycopy(tbuf, 0, buf, 0, buf.length);
+                else
+                    System.out.println("INFO: SecureRandom init failed or took too long");
+            }
+        } catch (InterruptedException ie) {}
+
         // why urandom?  because /dev/random blocks
         ok = seedFromFile(new File("/dev/urandom"), buf) || ok;
         // we merge (XOR) in the data from /dev/urandom with our own seedfile
@@ -186,6 +208,31 @@ public class RandomSource extends SecureRandom implements EntropyHarvester {
         return ok;
     }
     
+    /**
+     *  Thread to prevent hanging on init,
+     *  presumably due to /dev/random blocking,
+     *  which is common in VMs.
+     *
+     *  @since 0.9.18
+     */
+    private static class SecureRandomInit implements Runnable {
+        private final byte[] buf;
+
+        public SecureRandomInit(byte[] buf) {
+            this.buf = buf;
+        }
+
+        public void run() {
+            byte[] buf2 = new byte[buf.length];
+            try {
+                SecureRandom.getInstance("SHA1PRNG").nextBytes(buf2);
+                synchronized(buf) {
+                    System.arraycopy(buf2, 0, buf, 0, buf.length);
+                }
+            } catch (NoSuchAlgorithmException e) {}
+        }
+    }
+
     /**
      *  XORs the seed into buf
      *
diff --git a/core/java/src/org/bouncycastle/oldcrypto/macs/package.html b/core/java/src/org/bouncycastle/oldcrypto/macs/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..56de5a39402f186a83c554dfe08f6220db614941
--- /dev/null
+++ b/core/java/src/org/bouncycastle/oldcrypto/macs/package.html
@@ -0,0 +1,14 @@
+<html>
+<body>
+<p>
+This is from some very old version of bouncycastle, part of package org.bouncycastle.crypto.
+Android bundled something similar in pre-Gingerbread, but upgraded to a later, incompatible version
+in Gingerbread. As of Java 1.4 these are in javax.crypto - more or less.
+To avoid having to make two different versions of our Android app, we rename to org.bouncycastle.oldcrypto.
+</p><p>
+Ref: <a href="http://docs.oracle.com/javase/1.5.0/docs/api/javax/crypto/package-summary.html">javax.crypto</a>
+and
+<a href="http://code.google.com/p/android/issues/detail?id=3280">this android issue</a>.
+</p>
+</body>
+</html>
diff --git a/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java b/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
index 5ab9d99efab484ad5f5079c369cdcba228671861..c12a9f1f8e8a033461c1cb492d5451769babc877 100644
--- a/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
+++ b/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
@@ -66,8 +66,10 @@ public class PrecomputationTestVectors {
         BufferedReader file = null;
         int row = 0;
         try {
-            file = new BufferedReader(new InputStreamReader(
-                    PrecomputationTestVectors.class.getResourceAsStream(fileName)));
+            InputStream is = PrecomputationTestVectors.class.getResourceAsStream(fileName);
+            if (is == null)
+                throw new IOException("Resource not found: " + fileName);
+            file = new BufferedReader(new InputStreamReader(is));
             String line;
             while ((line = file.readLine()) != null) {
                 if (line.equals(" },")) {
diff --git a/debian/NEWS b/debian/NEWS
index 38e309017af4f41b97b450cb5177e6d283cfd843..4f163c621e5ee6785811412b26770051d036c181 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,8 +4,8 @@ i2p (0.8.6-5) stable; urgency=low
   Instead the file /etc/i2p/wrapper.config is used with the changes that used to
   be in wrapper.service have been moved to the initscript. If you have changed
   the amount of memory set aside for I2P, you'll need to make that change to
-  /etc/i2p/wrapper.config. 
- 
+  /etc/i2p/wrapper.config.
+
   The I2P router is now split into four different packages: i2p, i2p-doc,
   i2p-router, and libjbigi.
 
diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p
new file mode 100644
index 0000000000000000000000000000000000000000..3c20c88f4db93b4a33233cc18e360592aa1a9e6f
--- /dev/null
+++ b/debian/apparmor/i2p
@@ -0,0 +1,63 @@
+# Last Modified: Thu Jan 29 03:17:01 2015
+# vim:syntax=apparmor et ts=4 sw=4
+
+#include <abstractions/base>
+#include <abstractions/fonts>
+#include <abstractions/nameservice>
+#include <abstractions/ssl_certs>
+#include <abstractions/user-tmp>
+
+network inet stream,
+network inet6 stream,
+
+# Needed for Java
+@{PROC}                                                 r,
+@{PROC}/[0-9]*/net/if_inet6                             r,
+@{PROC}/[0-9]*/net/ipv6_route                           r,
+@{PROC}/[0-9]*/status                                   r,
+/dev/random                                             r,
+/dev/urandom                                            r,
+/sys/devices/system/cpu/                                r,
+/sys/devices/system/cpu/**                              r,
+
+/etc/ssl/certs/java/**                                  r,
+/etc/timezone                                           r,
+/usr/share/javazi/**                                    r,
+
+/etc/java-*-openjdk/**                                  r,
+/usr/lib/jvm/default-java/jre/bin/java                  rix,
+/usr/lib/jvm/java-*-openjdk-*/jre/bin/java              rix,
+/usr/lib/jvm/java-*-openjdk-*/jre/lib/i386/client/classes.jsa m,
+/usr/lib/jvm/java-*-openjdk-*/jre/bin/keytool           rix,
+
+# Oracle Java is needed on the Raspberry Pi and is included in Raspbian's repositories
+/usr/lib/jvm/jdk-*-oracle-*/jre/bin/java                rix,
+/usr/lib/jvm/jdk-*-oracle-*/jre/bin/keytool             rix,
+
+# needed for I2P's graphs
+/etc/fonts/**                                            r,
+/usr/share/java/java-atk-wrapper.jar                     r,
+
+# I2P specific
+/etc/default/i2p                                        r,
+/usr/share/i2p/**                                       r,
+# Used by some plugins
+/usr/share/java/eclipse-ecj-*.jar                       r,
+
+# Tanuki java wrapper
+/etc/i2p/wrapper.config                                 r,
+/usr/sbin/wrapper                                       rix,
+/usr/share/java/wrapper*.jar                            r,
+
+/{,var/}tmp/                                            rwm,
+owner /{,var/}tmp/**                                    rwklm,
+
+# Prevent spamming the logs
+deny /dev/tty                                           rw,
+deny @{PROC}/[0-9]*/fd/                                 r,
+deny /usr/sbin/                                         r,
+deny /var/cache/fontconfig/                             wk,
+
+# Used by some versions of the Tanuki wrapper, not needed by I2P
+deny /usr/share/java/hamcrest*.jar                      r,
+deny /usr/share/java/junit*.jar                         r,
diff --git a/debian/apparmor/system_i2p b/debian/apparmor/system_i2p
new file mode 100644
index 0000000000000000000000000000000000000000..9af33b524220017f7429a22ca47c63ef59704f0d
--- /dev/null
+++ b/debian/apparmor/system_i2p
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor et
+#include <tunables/global>
+
+profile system_i2p {
+  #include <abstractions/i2p>
+
+  owner /{,lib/live/mount/overlay/}var/lib/i2p/** rwkl,
+  owner /{,lib/live/mount/overlay/}var/log/i2p/* rw,
+
+  owner /{,var/}run/i2p/{i2p,routerjvm}.pid rw,
+  owner /{,var/}run/i2p/router.ping rw,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/system_i2p>
+}
diff --git a/debian/apparmor/usr.bin.i2prouter b/debian/apparmor/usr.bin.i2prouter
new file mode 100644
index 0000000000000000000000000000000000000000..b33d796316d1099032b91e8e0d1a4ce8c99b72f2
--- /dev/null
+++ b/debian/apparmor/usr.bin.i2prouter
@@ -0,0 +1,48 @@
+# Last Modified: Thu Jan 29 03:17:01 2015
+# vim:syntax=apparmor et ts=8 sw=4
+
+#include <tunables/global>
+
+/usr/bin/i2prouter {
+  #include <abstractions/i2p>
+  capability sys_ptrace,
+
+  /usr/bin/i2prouter                    r,
+
+  @{PROC}/[0-9]*/stat                   r,
+  @{PROC}/[0-9]*/cmdline                r,
+  @{PROC}/uptime                        r,
+  @{PROC}/sys/kernel/pid_max            r,
+
+  /bin/{,b,d}ash                        rix,
+  /bin/cat                              rix,
+  /bin/grep                             rix,
+  /bin/mkdir                            rix,
+  /bin/ps                               rix,
+  /bin/rm                               rix,
+  /bin/sed                              rix,
+  /bin/sleep                            rix,
+  /bin/uname                            rix,
+  /bin/which                            rix,
+
+  /usr/bin/{,g,m}awk                    rix,
+  /usr/bin/cut                          rix,
+  /usr/bin/dirname                      rix,
+  /usr/bin/expr                         rix,
+  /usr/bin/id                           rix,
+  /usr/bin/ldd                          rix,
+  /usr/bin/tail                         rix,
+  /usr/bin/tr                           rix,
+
+  @{HOME}/.java/fonts/**                r,
+  owner  @{HOME}/.i2p/                  rw,
+  owner  @{HOME}/.i2p/**                rwk,
+
+  # Prevent spamming the logs
+  deny owner @{HOME}/.java/             wk,
+  deny @{HOME}/.fontconfig/             wk,
+  deny @{HOME}/.java/fonts/**           wk,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.i2prouter>
+}
diff --git a/debian/changelog b/debian/changelog
index d713f79e126aa85fe20055ec8a4c2328604d20ac..9843907ba245645825c6c956be5030a51c90cfd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,87 @@
-i2p (0.9.16-1) UNRELEASED; urgency=medium
+i2p (0.9.18-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Confine with AppArmor
 
- -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 30 Oct 2014 20:07:50 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 22 Feb 2015 00:00:00 +0000
+
+i2p (0.9.17-1) unstable; urgency=medium
+
+  * New Upstream Version
+    Changes
+    - Signed news
+    - ECDSA default for new server tunnels
+    - Reseeding now SSL-only by default
+    Bug Fixes
+    - Fix SSU sending corrupt ack-only packets with partial bitfields
+    - Fix SSU inbound connection fail from non-DSA router
+    - Don't select incompatible peers if we are a non-DSA router
+    - Fix EdDSA signature verification bug
+    - Set I2NP lookup type flags in all cases, not just when a reply tunnel is used
+    - Stop i2ptunnel server acceptor thread after close
+    - Fix bug preventing some plugins from stopping completely
+    - Fix SAM v3 bug causing failures in incoming connections
+    Other
+    - Add a warning in the console sidebar if ECDSA not supported
+    - Log warnings for Java 6 that we will eventually require Java 7
+    - Don't let proxied routers auto-floodfill
+    - Don't resend SSU acks that are too old
+    - Don't publish direct info in SSU address if introducers are required
+    - New default opentrackers in i2psnark
+    - Add support for specifiying data directory per-torrent in i2psnark
+    - Changes in streaming accept() error behavior
+    - Minor blockfile format changes
+    - New option for persistent random key to preserve peer ordering across restarts
+    - Translation updates
+    - Update GeoIP data
+
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 30 Nov 2014 22:20:06 +0000
+
+i2p (0.9.16-1) unstable; urgency=medium
+
+  * New Upstream Version
+    - Add support for stronger Router Info signatures
+    - Encrypt RI lookups and responses on faster boxes
+    - Require I2CP authorization for all messages when enabled (requires 0.9.11
+      or higher client)
+    - Disable TLSv3 and older ciphers for reseeding and other uses of SSL
+    - Use ECDSA by default for i2ptunnel IRC, SOCKS-IRC, and standard client
+      tunnels
+    - Don't prefer floodfills in some countries
+    - New column sorting, set-all priority buttons, and upload ratio display in
+      i2psnark
+    - Increase i2psnark tunnel default to 3 hops
+    - Implement bundling of multiple fragments in a single SSU message for
+      efficiency
+    - New add-to-addressbook links on netdb leaseset page
+    - Implement I2NP DatabaseLookupMessage search type field to improve lookup
+      efficiency
+    - CPUID fixes and updates for recent processors
+    - i2psnark fix magnet links with %-encoding
+    - Improve handling of SSU socket closing out from under us (hopefully fix
+      100% CPU)
+    - SSU bitfield handling fixes
+    - Fix HTTP header issues in i2psnark
+    - Fix rare NPE when building garlic message
+    - Fix console lockups (hopefully)
+    - Fix i2ptunnel js confirm-delete
+    - Move router data structures from i2p.jar to router.jar (breaks i2pcontrol
+      plugin)
+    - New router keys now stored in router.keys.dat (privKeys.dat format)
+      instead of router.keys
+    - Improve handling of unsupported encryption throughout
+    - More error checking of client I2CP messages by the router
+    - Initial work on hooks for pluggable transports
+    - Enforce request timestamp in tunnel build messages
+    - Re-enable message status in streaming, but treat no leaseset as a soft
+      failure for now
+    - Return unused DH keypairs to the pool for efficiency
+    - Raise failsafe tagset limit and improve deletion strategy when hit
+    - Change eepsite Jetty threadpool and queue configuration
+    - NTCP establishment refactoring in prep for NTCP2 and PT
+    - Jetty 8.1.16-v20140903
+    - Translation updates
+    - Update GeoIP data
 
 i2p (0.9.15-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c11c9edb22c943f868b6af274858ae10c1c76e9e..6e24840d0dfd5111812ba41be4aa4c5958640242 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: i2p
 Maintainer: Kill Your TV <killyourtv@i2pmail.org>
 Section: net
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Priority: optional
 Bugs: mailto:killyourtv@i2pmail.org
 Homepage: https://geti2p.net
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,ant-optional
  ,debconf
  ,default-jdk | openjdk-7-jdk | openjdk-6-jdk
+ ,dh-apparmor
  ,gettext
  ,libgmp3-dev
 # uncomment the next line for official builds
@@ -71,7 +72,7 @@ Architecture: all
 Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
- openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
+ openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
@@ -86,7 +87,7 @@ Suggests: tor
  ,mail-reader
  ,news-reader
  ,polipo
- ,privox
+ ,privoxy
  ,robert
  ,syndie
  ,www-browser
diff --git a/debian/i2p.config b/debian/i2p.config
index dab3fe2ac48ac0c9bfa18c1106e46c9cf6dd1452..efaf7b45438f0b2a269c1c47735b883217ae8e17 100755
--- a/debian/i2p.config
+++ b/debian/i2p.config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 # I2P package configuration script
 
 conffile="/etc/default/i2p"
@@ -7,24 +9,30 @@ conffile="/etc/default/i2p"
 
 # Load config file if it exists
 if [ -e $conffile ]; then
-        . $conffile
-
-        # wrapper.config always takes priority
-        MEMORYLIMIT=$(sed -e '/^wrapper\.java\.maxmemory/!d' -e 's/^wrapper\.java\.maxmemory\ *=\ *//' /etc/i2p/wrapper.config)
+    . $conffile
 
+    # wrapper.config always takes priority
+    MEMORYLIMIT=$(awk -F= '/^wrapper\.java\.maxmemory/{print $2}' /etc/i2p/wrapper.config)
 
-        db_set i2p/daemon "$RUN_DAEMON"
-        db_set i2p/user "$I2PUSER"
-        db_set i2p/memory "$MEMORYLIMIT"
+    db_set i2p/daemon "$RUN_DAEMON"
+    db_set i2p/user "$I2PUSER"
+    db_set i2p/memory "$MEMORYLIMIT"
+    db_set i2p/aa "$CONFINE_WITH_APPARMOR"
 fi
 
 db_input medium i2p/daemon || true
 db_go
+
 db_get i2p/daemon || true
 if [ "$RET" = "true" ]; then
-        db_input medium i2p/user || true
-        db_go
+    db_input medium i2p/user || true
+    db_go
 fi
 
 db_input medium i2p/memory || true
 db_go
+
+db_input medium i2p/aa || true
+db_go
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/debian/i2p.dirs b/debian/i2p.dirs
new file mode 100644
index 0000000000000000000000000000000000000000..f69395602c4ff6b1aec4b837ce74fb96ed580544
--- /dev/null
+++ b/debian/i2p.dirs
@@ -0,0 +1 @@
+etc/apparmor.d/abstractions
diff --git a/debian/i2p.init b/debian/i2p.init
index 526bec58aafa24763eef3796e93b480bb63b0690..eac736f702d7c7905be37071fdcbe22b9ce1f25e 100755
--- a/debian/i2p.init
+++ b/debian/i2p.init
@@ -32,6 +32,7 @@ WRAPPERLOG="/var/log/i2p/wrapper.log"
 RUN_DAEMON="False"
 NICE=0
 I2PUSER="i2psvc"
+USE_AA="yes"
 
 I2P_ARGS="/etc/i2p/wrapper.config \
  wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
@@ -43,32 +44,19 @@ I2P_ARGS="/etc/i2p/wrapper.config \
  wrapper.java.pidfile=$JVMPIDFILE \
  wrapper.daemonize=TRUE"
 
-[ -r /lib/lsb/init-functions ] && . /lib/lsb/init-functions
-[ -r /lib/init/vars.sh ] && . /lib/init/vars.sh
+. /lib/lsb/init-functions
+. /lib/init/vars.sh
 
 
 for ENV_FILE in /etc/environment /etc/default/locale; do
-[ -r "$ENV_FILE" ] || continue
-[ -s "$ENV_FILE" ] || continue
-
- for var in LANG LANGUAGE LC_ALL LC_CTYPE; do
-     value=`egrep "^${var}=" "$ENV_FILE" | tail -n1 | cut -d= -f2`
-     [ -n "$value" ] && eval export $var=$value
-
-# This is commented out for Ubuntu: Ubuntu still creates
-# /etc/environment in the most recent release
-# (currently 'Precise').
-#
-# TODO Add logic to automatically handle this
-#
-# Commented for Ubuntu since PPA packages 0.9-1$DISTRO1.
-# Packages for Debian systems will have this stanza uncommented.
-#
-#     if [ -n "$value" ] && [ "$ENV_FILE" = /etc/environment ]; then
-#         log_warning_msg "/etc/environment has been deprecated for locale information; use /etc/default/locale for $var=$value instead"
-#     fi
-
- done
+    [ -r "$ENV_FILE" ] || continue
+    [ -s "$ENV_FILE" ] || continue
+
+    for var in LANG LANGUAGE LC_ALL LC_CTYPE; do
+        value=`egrep "^${var}=" "$ENV_FILE" | tail -n1 | cut -d= -f2`
+        [ -n "$value" ] && eval export $var=$value
+
+    done
 done
 
 # read config file
@@ -80,10 +68,10 @@ if [ -z "$RUN_DAEMON" ]; then
 fi
 
 case "$RUN_DAEMON" in
-        [NnFf]*)
-                log_action_msg "$DESC daemon disabled in /etc/default/$NAME".
-                exit 0
-                ;;
+    [NnFf]*)
+        log_action_msg "$DESC daemon disabled in /etc/default/$NAME".
+        exit 0
+        ;;
 esac
 
 # We need the wrapper. If it's not found, abort.
@@ -111,8 +99,29 @@ do_start()
     fi
     chown -Rf $I2PUSER:$I2PUSER  $I2PTEMP $RUN > /dev/null 2>&1
     chown -f -R $I2PUSER:i2psvc /var/log/$NAME > /dev/null 2>&1
-    TZ=UTC start-stop-daemon --start --quiet -c $I2PUSER --pidfile $PIDFILE --exec $DAEMON -n $NICE -- \
-        $I2P_ARGS || return 2
+    if [ "$USE_AA" = "yes" ] && \
+       [ -x /usr/sbin/aa-status ] && \
+       [ -x /usr/sbin/aa-exec ] && \
+       [ -e /etc/apparmor.d/system_i2p ] && \
+       /usr/sbin/aa-status --enabled ; then
+            AA="--startas /usr/sbin/aa-exec"
+            AA_ARGS="--profile=system_i2p -- $DAEMON"
+    else
+            AA=""
+            AA_ARGS=""
+    fi
+
+    TZ=UTC start-stop-daemon --start --quiet --chuid $I2PUSER --pidfile $PIDFILE $AA --exec $DAEMON --nicelevel $NICE -- \
+        $AA_ARGS $I2P_ARGS || return 2
+
+    # FIXME Temporary hack
+    # Files from /usr/share/i2p should have been copied, if need be, well before the 15 seconds are up.
+    if [ ! -f /var/lib/i2p/i2p-config/.perms ] && [ $I2PUSER = "i2psvc" ]; then
+        sleep 15
+        find /var/lib/i2p/ -type d -exec chmod 770 {} \;
+        find /var/lib/i2p/ -type f -exec chmod 660 {} \;
+        touch /var/lib/i2p/i2p-config/.perms
+    fi
 }
 
 do_stop()
@@ -124,7 +133,8 @@ do_stop()
     start-stop-daemon --stop --quiet --oknodo --retry=0/60/KILL/20 --exec $DAEMON
 
     rm -rf "$I2PTEMP" > /dev/null 2>&1
-    [ -d "$RUN" ] && rmdir --ignore-fail-on-non-empty "$RUN" > /dev/null 2>&1
+    [ -d "$RUN" ] && rm -f "$RUN/*" > /dev/null 2>&1
+    [ -d "$RUN" ] && rmdir "$RUN" > /dev/null 2>&1
 }
 
 do_dump()
diff --git a/debian/i2p.install b/debian/i2p.install
index 49485c28e5bbb8a53585322dc232670358f7ceef..314c225da7975134d2c37f09237d39922a0992e0 100644
--- a/debian/i2p.install
+++ b/debian/i2p.install
@@ -1,3 +1,6 @@
 pkg-temp/i2prouter usr/bin
 pkg-temp/wrapper.config etc/i2p
 pkg-temp/locale usr/share/i2p
+debian/apparmor/i2p etc/apparmor.d/abstractions
+debian/apparmor/usr.bin.i2prouter etc/apparmor.d
+debian/apparmor/system_i2p etc/apparmor.d
diff --git a/debian/i2p.postinst b/debian/i2p.postinst
index 1cf9ef87553a62f54bea65f7769370cc2513bcfa..328926704056ce969a45ac1c3dccc1f7c38cae36 100755
--- a/debian/i2p.postinst
+++ b/debian/i2p.postinst
@@ -6,7 +6,7 @@ I2PHOME=/var/lib/i2p
 I2PSYSUSER=i2psvc
 
 conffile="/etc/default/i2p"
-systemdservice="/lib/systemd/system/i2p.service"
+#systemdservice="/lib/systemd/system/i2p.service"
 
 # Source debconf library -- we have a Depends line
 # to make sure it is there...
@@ -25,6 +25,7 @@ case "$1" in
             echo >> $conffile
             echo "RUN_DAEMON=" >> $conffile
             echo "I2PUSER=" >> $conffile
+            echo "CONFINE_WITH_APPARMOR=" >> $conffile
             echo "# The next value is also wrapper.java.maxmemory in /etc/i2p/wrapper.config" >> $conffile
             echo "MEMORYLIMIT=" >> $conffile
         fi
@@ -35,6 +36,8 @@ case "$1" in
         I2PUSER="$RET"
         db_get i2p/memory
         MEMORYLIMIT="$RET"
+        db_get i2p/aa
+        CONFINE_WITH_APPARMOR="$RET"
 
         cp -a -f $conffile $conffile.tmp
 
@@ -46,6 +49,8 @@ case "$1" in
             echo "I2PUSER=" >> $conffile
         test -z "$MEMORYLIMIT" || grep -Eq '^ *MEMORYLIMIT=' $conffile || \
             echo "MEMORYLIMIT=" >> $conffile
+        test -z "$CONFINE_WITH_APPARMOR" || grep -Eq '^ *CONFINE_WITH_APPARMOR=' $conffile || \
+            echo "CONFINE_WITH_APPARMOR=" >> $conffile
 
         if [ -z $RUN_DAEMON ]; then
             RUN_DAEMON="false"
@@ -57,22 +62,23 @@ case "$1" in
         sed -e "s/^ *RUN_DAEMON=.*/RUN_DAEMON=\"$RUN_DAEMON\"/" \
             -e "s/^ *I2PUSER=.*/I2PUSER=\"$I2PUSER\"/" \
             -e "s/^ *MEMORYLIMIT=.*/MEMORYLIMIT=\"$MEMORYLIMIT\"/" \
+            -e "s/^ *CONFINE_WITH_APPARMOR=.*/CONFINE_WITH_APPARMOR=\"$CONFINE_WITH_APPARMOR\"/" \
             < $conffile > $conffile.tmp
         mv -f $conffile.tmp $conffile
 
-        if [ -e "$systemdservice" ]; then
-            sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp"
-            mv -f "$systemdservice.tmp" "$systemdservice"
-            chmod 0644 -f "$systemdservice"
-            if [ -x /bin/systemctl ]; then
-                    systemctl --system daemon-reload
-                    if [ $RUN_DAEMON = 'true' ]; then
-                            systemctl enable i2p.service
-                    else
-                            systemctl disable i2p.service
-                    fi
-            fi
-        fi
+#        if [ -e "$systemdservice" ]; then
+#            sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp"
+#            mv -f "$systemdservice.tmp" "$systemdservice"
+#            chmod 0644 -f "$systemdservice"
+#            if grep -q 'systemd' /proc/1/comm > /dev/null 2>&1; then
+#                systemctl --system daemon-reload
+#                if [ $RUN_DAEMON = 'true' ]; then
+#                    systemctl enable i2p.service
+#                else
+#                    systemctl disable i2p.service
+#                fi
+#            fi
+#        fi
 
         sed -e "s/^ *wrapper\.java\.maxmemory=.*/wrapper\.java\.maxmemory=$MEMORYLIMIT/" \
             < /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp
@@ -117,3 +123,4 @@ esac
 #DEBHELPER#
 
 exit 0
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/debian/i2p.templates b/debian/i2p.templates
index 8ca20a0a99f109b8d18b067e0a01bab27b60f69d..7449c90d1a451309b5d67843c8ea2f62f6df54fd 100644
--- a/debian/i2p.templates
+++ b/debian/i2p.templates
@@ -33,3 +33,10 @@ _Description: Memory that can be allocated to I2P:
  .
  High bandwidth routers, as well as routers with a lot of active torrents / plugins, may
  need to have this value increased.
+
+Template: i2p/aa
+Type: boolean
+Default: true
+_Description: Run I2P daemon confined with AppArmor
+ With this option enabled I2P will be sandboxed with AppArmor, restricting which files and
+ directories may be accessed by I2P.
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 86eca0ab43742ffb9b1395d5bb3c07dd402bf19f..8a71d236ddde88b7434e87eff680e227094b6bcd 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -71,7 +71,7 @@ Debian wrapper.config to try to prevent confusion.
  
  # Priority at which to run the wrapper.  See "man nice" for valid priorities.
  #  nice is only used if a priority is specified.
-@@ -172,75 +163,8 @@
+@@ -177,75 +168,8 @@
         exit 1
  fi
  
@@ -147,7 +147,7 @@ Debian wrapper.config to try to prevent confusion.
  if [ -n "$FIXED_COMMAND" ]
  then
      COMMAND="$FIXED_COMMAND"
-@@ -1014,7 +938,6 @@
+@@ -1019,7 +943,6 @@
          if [ "X$pid" = "X" ]
          then
              eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@@ -155,7 +155,7 @@ Debian wrapper.config to try to prevent confusion.
          else
              eval echo ' running: PID:$pid'
          fi
-@@ -1817,7 +1740,7 @@
+@@ -1822,7 +1745,7 @@
  }
  
  showsetusermesg()  {
@@ -164,7 +164,7 @@ Debian wrapper.config to try to prevent confusion.
  }
  
  checkifstartingasroot() {
-@@ -1825,7 +1748,7 @@
+@@ -1830,7 +1753,7 @@
          echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
          showsetusermesg
          echo
@@ -173,7 +173,7 @@ Debian wrapper.config to try to prevent confusion.
          exit 1
      fi
  }
-@@ -1890,24 +1813,10 @@
+@@ -1895,24 +1818,10 @@
              status
              ;;
  
@@ -367,16 +367,16 @@ Debian wrapper.config to try to prevent confusion.
 @@ -185,7 +185,7 @@
  msgstr ""
  
- #: ../i2prouter:1820
+ #: ../i2prouter:1825
 -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
- #: ../i2prouter:1825
+ #: ../i2prouter:1830
 @@ -193,5 +193,5 @@
  msgstr ""
  
- #: ../i2prouter:1828
+ #: ../i2prouter:1833
 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000000000000000000000000000000000000..fdfbcf5c2c9f1f6583760075970c429d217e4936
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,77 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# oselotti, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"PO-Revision-Date: 2014-09-07 08:58+0000\n"
+"Last-Translator: oselotti\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "Tulisiko I2P-reititin käynnistää järjestelmän käynnistyksen yhteydessä?"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "I2P-reititin voi toimia taustapalveluna, joka käynnistyy automaattisesti tietokoneen käynnistyessä. Tämä on suositeltu asetus."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "I2P daemon käyttäjä:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr "Oletuksena I2P on säädetty toimimaan taustapalveluna i2psvc-käyttäjällä. Käytettäessä **olemassa olevaa** I2P-profiilia, voidaan eri käyttäjänimi syöttää tähän. Esimerkiksi, jos edellinen I2P-asennus oli /home/user/i2p, voidaan tähän syöttää 'user'."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr "Erittäin tärkeää: jos joku muu käyttäjä kuin oletusarvo 'i2psvc' syötetään tähän, käyttäjän *TÄYTYY* olla ennestään olemassa."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr "Muisti, joka voidaan varata I2P:n käyttöön:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr "Oletuksena I2P voi käyttää maksimissaan vain 128MB RAM-muistia."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr "Suurikaistaiset reitittimet, sekä reitittimet, joilla on paljon aktiivisia torrenteja / lisäosia, saattavat tarvita tämän arvon korotettuna."
diff --git a/debian/po/id.po b/debian/po/id.po
new file mode 100644
index 0000000000000000000000000000000000000000..8ecc5742cab54d414cb05bf707f7e1adc260e71e
--- /dev/null
+++ b/debian/po/id.po
@@ -0,0 +1,77 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"PO-Revision-Date: 2014-08-13 03:23+0000\n"
+"Last-Translator: Khairul Agasta <khairuldroids@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "Apakah router I2P perlu dimuali saat boot?"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "Router I2P dapat dijalankan sebagai daemon yang memulai secara otomatis ketika komputer Anda booting. Ini adalah konfigurasi yang direkomendasikan."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "I2P pengguna daemon:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr "Dengan default, I2P dikonfigurasikan untuk berjalan dibawah akun i2psvc ketika menjalankan sebagai daemon. Untuk menggunakan profil I2P **yang ada** Anda perlu memasukkan nama akun berbeda disini. Sebagai contoh, jika sebelumnya Anda memasang I2P pada /home/user/i2p, maka Anda harus memasukkan 'user' disini."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr "Sangat penting: Jika pengguna selain default 'i2psvc' dimasukkan disini, nama pengguna yang dipilih *HARUS* yang sudah ada."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr "Memori yang dapat dialokasikan ke I2P:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr "Dengan default, I2P hanya akan diizinkan menggunakan RAM hingga 128MB."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr "Router bandwidth tinggi, seperti halnya router dengan banyak torrent / pengaya yang aktif, Anda mungkin perlu menambahkan value ini."
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000000000000000000000000000000000000..532a967fabb410a636c1a926f4c3b3ba2dab29bf
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,77 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Nathan Follens, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"PO-Revision-Date: 2015-01-17 23:29+0000\n"
+"Last-Translator: Nathan Follens\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "Moet de I2P-router worden gestart bij het opstarten?"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "De I2P-router kan als een daemon draaien die automatisch start wanneer je computer opstart. Dit is de aanbevolen configuratie."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "I2P-daemon gebruiker:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr "Standaard is I2P ingesteld om onder de account i2psvc te draaien wanneer het draait als daemon. Om een **bestaand** I2P-profiel te gebruiken kan je hier een andere accountnaam ingeven. Bijvoorbeeld, als je vorige I2P-installatie zich bevond in /home/user/i2p, kan je hier 'user' ingeven."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr "Zeer belangrijk: als hier een gebruiker anders dan 'i2psvc' wordt ingegeven, *MOET* de gekozen gebruikersnaam reeds bestaan."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr "Geheugen dat aan I2P kan toegerekend worden:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr "Standaard is I2P toegestaan maximum 128MB van het RAM te gebruiken."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr "Voor hoge bandbreedte-routers, evenals routers met veel actieve torrents / plugins, is het mogelijk dat deze waarde verhoogd moet worden."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 0000000000000000000000000000000000000000..ad870d1d6ba101edb4aab2b71047f48b3fc18bf8
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# blueboy, 2014
+# Victor Maximiliano <VicBrd09@mail2tor.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"PO-Revision-Date: 2014-09-19 18:04+0000\n"
+"Last-Translator: blueboy\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "O roteador I2P deve inicializar junto com o sistema?"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "O roteador I2P pode rodar como um daemon que inicia automaticamente quando o sistema carrega. Esse é a configuração recomendada."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "Usuário I2P daemon:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr "Por padrão o I2P é configurado para funcionar sobre a conta i2psvc quando funcionando como um daemon. Para usar uma conta I2P **existente** você deve digitar um nome de conta diferente aqui. Por exemplo, se a sua instalação anterior do I2P estava em /home/user/i2p, você deve digitar 'user' aqui."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr "Muito importante: Se um outro usuário além do padrão \"i2psvc\" é colocado aqui, o nome de usuário escolhido já deve existir."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr "Memória que pode ser alocada para o roteador I2P:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr "Por omissão, será permitido ao roteador I2P usar apenas até 128 MB de RAM."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr "Roteadores de alta velocidade, assim como roteadores com uma porção de torrents / plugins ativos, talvez precisem que esse valor seja aumentado."
diff --git a/debian/po/sq.po b/debian/po/sq.po
new file mode 100644
index 0000000000000000000000000000000000000000..11d0170f9208ee083f142c6ee8f6b25ccc272f32
--- /dev/null
+++ b/debian/po/sq.po
@@ -0,0 +1,77 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Shpetim <shpetim@privacysolutions.no>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"PO-Revision-Date: 2014-08-12 00:40+0000\n"
+"Last-Translator: Shpetim <shpetim@privacysolutions.no>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/I2P/language/sq/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "Duhet router'i i I2P'së të startojë në boot? "
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "Router'i i I2P'së mund të punojë edhe si një daemon, që starton automatikisht kur kompjuteri boot'et. Ky është konfikurimi rekomandues. "
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "I2P përdorues i daemon'it:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr "Zakonisht I2P është konfiguruar të punojë ndër llogarinë i2psvc kur është duke punuar si një deamon. Për të përdorur një profil **ekzistues** të I2P'së mund ta shtypni një emër tjetër llogarie këtu. Për shembull, nëse instalimi i kaluar është në shtëpi/përdorues/i2p, mund të hyni si \"përdorues\" këtu. "
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr "Shumë e rëndësishme: Nëse një përdorues përveq default'i i 'i2psvc' është entruar këtu, emri i zgjedhur *DUHET* tashmë të ekzistojë. "
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr "Kujtesat që mund të ndahen te  I2P:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr "Normalisht, I2P do ti lejohet të përdorë vetëm deri në 128Mb të RAM'it."
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 694e80342b339c1c44b0e061163c835d6591782c..e2f6ea99275eddbd944c493dbc52094532c5382e 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: i2p\n"
 "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-12-27 22:25+0000\n"
+"POT-Creation-Date: 2015-02-18 22:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,3 +74,17 @@ msgid ""
 "High bandwidth routers, as well as routers with a lot of active torrents / "
 "plugins, may need to have this value increased."
 msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:5001
+msgid "Run I2P daemon confined with AppArmor"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:5001
+msgid ""
+"With this option enabled I2P will be sandboxed with AppArmor, restricting "
+"which files and directories may be accessed by I2P."
+msgstr ""
diff --git a/debian/rules b/debian/rules
index 447268238a05741316c9000a96c284318baadec7..5377586612b0869ccc13f6a42b5136c69e809864 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,11 @@ createcopyright:
 override_dh_compress:
 	dh_compress -X.xsl -X.xml
 
+override_dh_install:
+	dh_install --list-missing
+	dh_apparmor --profile-name=system_i2p -pi2p
+	dh_apparmor --profile-name=usr.bin.i2prouter -pi2p
+
 override_dh_installchangelogs:
 	dh_installchangelogs history.txt
 
diff --git a/history.txt b/history.txt
index ff226665e6bab0a3f2193cc32210574054e1435b..4863b4ab3731550eeee2cc46f82dec5736208093 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,269 @@
+2015-04-01 zzz
+ * I2CP: Allow larger client clock skew (ticket #1503)
+ * i2psnark: Fix changing data directory on Windows (ticket #1503)
+
+2015-03-31 zzz
+ * API: Fix some client-side APIs to honor defaults in Properties;
+   add javadocs to specify where we do and don't (ticket #1491)
+ * i2ptunnel: Fix multiple SSL outproxies in HTTP client
+
+2015-03-29 zzz
+ * I2CP: Prevent NPE (ticket #1503)
+
+2015-03-25 zzz
+ * i2ptunnel HTTP client: Replace all getBytes() calls
+   with a Writer or getBytes("UTF-8") (ticket #457)
+
+2015-03-24 zzz
+ * Streaming: Throw I2PSocketException when connection is reset,
+   display new error page in HTTP client (ticket #643)
+
+2015-03-23 zzz
+ * Javadoc: Add missing package.html files (ticket #1109)
+ * Summary bar: linkify news headings, remove 'show news' link
+
+2015-03-22 zzz
+ * Console: Better status feedback on manual reseed from URL
+ * NetDB: Don't become floodfill w/o ECDSA support
+ * Reseed: Better status feedback and cleanup in summary bar
+
+2015-03-21 zzz
+ * Console: Support plugin installation from local file
+
+2015-03-20 zzz
+ * Reseed:
+  - Move multipart form support from susimail to jetty-i2p.jar
+    so console can use it
+  - Finish manual reseed from local file
+
+2015-03-19 zzz
+ * Reseed (ticket #1369):
+  - Add form to manually reseed from zip or su3 URL
+  - Add form to manually reseed from local zip or su3 file
+  - Add form to create reseed zip file to share
+  - Backend support and refactoring in reseed code
+
+2015-03-18 zzz
+ * NetDB:
+  - Send exploratory lookups directly to the floodfill if
+    we are already connected to him
+  - Don't encrypt RI lookups when overloaded
+  - Don't explore when overloaded
+  - Don't publish non-ff RI on exit if we are coming right back
+ * Router: Allow disabling the setting of some System properties, for embedded applications
+ * StatisticsManager: Publish dummy LS count if we just started
+ * Streaming: Reduce min RTO again
+ * Tunnels: Drop instead of reject requests on high job lag
+ * UPnP: Update to cyberlink 3.0
+
+2015-03-16 zzz
+ * Apache Tomcat 6.0.43
+ * NetDB: Send RI lookups directly to the floodfill if
+   we are already connected to him
+ * Router:
+   - Republish RI early if capabilities change
+   - Increase exploratory tunnel quantity if floodfill
+ * Throttle: Reject tunnels based on job lag
+
+2015-03-15 zzz
+ * Job Queue:
+   - Fix overload dropping
+   - Add drop count to job stats
+   - Decrease overload threshold again
+ * NetDb: Track flood success
+
+2015-03-13 zzz
+ * i2psnark:
+   - Auto-reduce tunnel quantity based on peer count
+   - Increase max tunnels
+ * Job Queue:
+   - Drop garlic message decryption jobs on overload
+   - Decrease overload threshold
+
+2015-03-13 dg
+ * Router: create router.integratedPeers (floodfills) stat, and 
+   allow graphing of it.
+
+2015-03-08 zzz
+ * i2psnark: Increase min and default bandwidth
+ * Throttle: Tweak messages during probabalistic rejection
+ * Transport: Add missing bogons to IP validity check
+
+* 2015-02-22 0.9.18 released
+
+2015-02-18 kytv
+ * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country
+   database from 2015-02-04.
+
+2015-02-15 dg
+ * FloodfillMonitorJob: 
+   - Use lifetime average value for job lag
+   - Change the job lag limit to less than 25ms
+   - Consider and set the limit of backlogged tunnels to less than 5
+
+2015-02-10 dg
+ * I2PSnark, Jetty, SAM, crypto: findbugs resource leaks.
+
+2015-02-07 zzz
+ * SSU: Limit range for valid clock skew
+ * Transport: Ban routers if they are too old and we are non-DSA
+
+2015-02-06 zzz
+ * NetDB: Reduce max job lag for floodfill
+ * NTCP: Block IP for a while when incoming connection is dropped before
+   receiving a message. Possible workaround for tickets #551, #1075, #1411.
+ * Transport:
+   - Decrease DH refiller initial delay and increase buffer size
+     to reduce chance of running out on high-bandwidth routers
+   - Add event log for reachability change
+
+2015-02-01 zzz
+ * Crypto: Catch IAE in generateCertificate()
+ * NetDB: Don't flood an RI back to itself. While Java ffs self-flood,
+   other implementations may not.
+ * OCMOSJ: Pick a OB tunnel at random, not with the OBEP closest
+   to the lease, as that may be hurting connection reliability.
+ * Router: Call warmupCrypto() earlier in the initialization
+
+2015-01-31 zzz
+ * Console:
+   - Don't display invalid IPv6 addresses as options on /confignet
+   - Disable changing log path
+ * NetDb:
+   - Encrypt lookups for 32-bit x86 also
+   - Disable floodfill in laptop mode
+ * PRNG: Don't hang forever at startup waiting for SecureRandom init
+ * Transport: Set 4 MBps max bw due to bloom filter
+
+2015-01-30 zzz
+ * HTTP Proxy: More error page changes
+ * NTCP: Throttle event pumper if looping too fast (tickets #551, #1075, #1411)
+
+2015-01-29 zzz
+ * SSU:
+   - Fix replaceExternalAddress churn when firewalled
+   - Sort introducers in router address, so we won't force a republish
+     due to a different ordering of the same introducers
+   - Don't publish an address if we need introducers but don't have any,
+     so the user won't see a 'firewalled with inbound NTCP enabled' message
+   - Fix transition from firewalled to non-firewalled
+
+2015-01-28 zzz
+ * UPnP:
+  - Rescan for devices periodically and when reachability changes (tickets #661, #959)
+  - Callback when device removed
+  - Consolidate callbacks
+  - Clear ignored devices after primary device removed
+    to allow one to be promoted on rescan
+  - Don't put "I2P" in registered protocol name
+  - Add uptime to UPnP info
+  - HTML escaping
+  - Remove static log on Android
+
+2015-01-11 zzz
+ * i2psnark: Skip incompatible welterde tracker if we are ECDSA
+ * I2PTunnel: Add option for multihoming optimization
+
+2015-01-10 zzz
+ * NetDB: Stubs for bandwidth estimation during reseed (ticket #935)
+
+2015-01-09 zzz
+ * NetDB: Publish RI faster when costs change (ticket #1437)
+
+2015-01-08 zzz
+ * Console, i2ptunnel, proxy: Renaming of various things to "hidden services"
+
+2015-01-07 zzz
+ * ClientAppConfig: Start i2ptunnel sooner (ticket #1162)
+ * NetDB: Possible fixes for reseed completion not recognized (ticket #1384)
+ * Router:
+   - Add startup/shutdown state machine
+   - Don't reset uptime after a soft restart
+ * Startup: Accept tunnels after 10 minutes instead of 20 (ticket #1152)
+ * Tunnels:
+   - Cleanup, catch more cases of zero-hop configuration
+   - Temporarily increase exploratory tunnel quantity at startup,
+     so that netdb refresh will work better
+
+2015-01-05 zzz
+ * Blocklist:
+   - Rewrite to read and merge multiple files
+   - Include in update, use version in base dir too
+   - Increase limits
+   - Bug fixes
+ * EepGet: Change command line default to 0 retries
+ * Latency reduction all over:
+   - SSU: Reduce ack delay
+   - Streaming: Reduce min RTO and flusher delay
+   - Tunnels: Reduce GW batching time
+ * Streaming:
+   - Add API for sending/receiving payload in ping/pong
+   - Fix PcapWriter
+ * UrlLauncher:
+   - Configure browser with routerconsole.browser (ticket #1159)
+   - Convert to ClientApp interface
+
+2015-01-03 zzz
+ * I2CP: Use configured leaseset keys if available
+ * I2PTunnel: Persist leaseset keys
+
+2014-12-15 zzz
+ * Console: Prevent two-word translations from splitting across lines in summary bar
+ * Crypto: EdDSA cleanups
+ * i2psnark: Unchoke new peer sooner
+ * SSU: reduce log level of uncaught errors processing I2NP message
+ * SU3:
+   - Don't require specification of sig type when signing
+   - Implement 'extract -k'
+   - Fix getContentOffset()
+   - Fail on excess data after signature
+ * Tunnels: Raise concurrent build limit
+
+2014-12-08 zzz
+ * HTTP Proxy: Fix parsing of ECDSA address helper
+ * NetDB: Increase lookup throttle time
+
+2014-12-05 zzz
+Prop from i2p.i2p.zzz.test2:
+ * Console:
+   - Show b32 for local leasesets also on netdb LS tab
+ * Data:
+   - Disallow duplicate keys in a Mapping
+   - Add RouterInfo.getVersion()
+ * I2NP:
+   - Move some data structures away from ByteArray; offsets were always zero
+     - New BuildRequestRecord constructors
+     - BuildRequestRecord field becomes final byte[222]
+     - IV becomes byte[16]
+     - Build record becomes EncryptedBuildRecord
+   - Remove extra copy in BuildRequestRecord.encryptRecord()
+   - Remove unused BuildRequestRecord.readOurIdentityMatches()
+   - DatabaseStoreMessage: Mask the unused bits in the type field for future use
+ * i2psnark: Reduce auto-stop threshold for update torrent
+ * I2PTunnel: Reduce i2ptunnel threads, more thread pooling.
+   - Move client pool from static inI2PTunnelClientBase to TCG.
+   - Use client pool for some server threads
+   - Run some things inline that were formerly threads
+ * KeyGenerator: main() test improvements
+ * Logger: Configurable flush interval
+ * Plugins: Another fix for restarting a ClientApp plugin
+ * Profiles: Change slice selection argument from an int to an enum for clarity
+ * SusiMail:
+   - Add save-as button
+   - Fix encoding for filename in Content-Disposition header
+ * Transport:
+   - Disallow standard I2P application ports as the router port
+   - Increase default class O conn. limits to 350 NTCP, 1050 SSU
+ * Update: Use last-modified instead of last-checked for the next
+   if-modified-since fetch, to fix failing to fetch the latest news
+
+* 2014-11-30 0.9.17 released
+
+2014-11-28 kytv
+ * Updated PO files from Transifex
+ * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country
+   database from 2014-11-05.
+
 2014-11-26 zzz
  * BuildRequestor: Reduce delay when client build can't find
    a paired tunnel (ticket #1412)
diff --git a/installer/install.xml b/installer/install.xml
index cde35c91b302e58e0eb59002976fe4e14ac461d4..8f63d6b67ed1651048636f54d7a313d6b1371f93 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.9.16</appversion>
+        <appversion>0.9.18</appversion>
         <authors>
             <author name="I2P" email="https://geti2p.net/"/>
         </authors>
@@ -129,6 +129,7 @@
               and the izpack docs for some guidance.
              -->
             <parsable targetfile="$INSTALL_PATH/wrapper.config" type="plain" />
+            <parsable targetfile="$INSTALL_PATH/scripts/home.i2p.i2prouter" type="plain"> <os family="unix" /> </parsable>
             <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell"> <os family="unix" /> </parsable>
             <parsable targetfile="$INSTALL_PATH/eepget" type="shell"> <os family="unix" /> </parsable>
             <parsable targetfile="$INSTALL_PATH/eepget.bat" type="shell" os="windows" />
diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt
index 2262b015beb1261e2f0b121faf30bd5fd8236778..6b994876231a48eeca26dab0639dafc9b618f502 100644
--- a/installer/resources/blocklist.txt
+++ b/installer/resources/blocklist.txt
@@ -5,9 +5,18 @@
 # When running as a Linux daemon, the configuration directory is /var/lib/i2p
 # and the install directory is /usr/share/i2p .
 #
-# Blocking is now enabled by default.
-# To disable blocking, set router.blocklist.enable=false on configadvanced.jsp,
-# or simply delete this file or remove all the entries below, and restart.
+# The file in the install directory will be overwritten when you update I2P.
+# As of release 0.9.18, the router reads and merges the files in the install directory
+# and the config directory. Additionally, if the advanded configuration
+# router.blocklist.file=/path/to/otherlist.txt is set, this file will be
+# read in and merged as well.
+#
+# If there is no blocklist.txt file in the configuration directory, create it and
+# add entries as desired.
+#
+#
+# Blocking is enabled by default.
+# To disable blocking, set router.blocklist.enable=false on configadvanced.jsp.
 #
 # Add additional entries as desired, sorting not required.
 # This file is only read at router startup.
@@ -16,6 +25,7 @@
 # Please do not block too broadly, it will segment and harm the network.
 # For example, http://www.bluetack.co.uk/config/splist.zip is very broad and includes Tor users, it is not recommended.
 # A more reasonable list: http://www.bluetack.co.uk/config/level1.zip
+# Note: bluetack blocklists now require a subscription. See https://forum.transmissionbt.com/viewtopic.php?f=2&t=15652
 #
 # We have included the bogons from http://www.team-cymru.org/Services/Bogons/http.html ,
 # but you will have to update your blocklist manually if the bogon list changes.
diff --git a/installer/resources/certificates/plugin/str4d_at_mail.i2p.crt b/installer/resources/certificates/plugin/str4d_at_mail.i2p.crt
new file mode 100644
index 0000000000000000000000000000000000000000..7195c261d3048268411326275f80865cf2bade6e
--- /dev/null
+++ b/installer/resources/certificates/plugin/str4d_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFezCCA2OgAwIBAgIEB0a3pTANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc3RyNGRAbWFpbC5p
+MnAwHhcNMTUwMTA0MDYxOTU3WhcNMjUwMTAzMDYxOTU3WjBuMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc3RyNGRAbWFpbC5p
+MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGUObeKxkmQ+KOeASG
+I4Hx0MJc2Q5PMvD7MWZxI/nFr2Rme83O1xxPUDfu2k0pRhbdkA4PaHkfBcfYD8Jj
++TFZlV2slnw6+jdlfbR8Ez2SH+ImPeLQ5moftDxB3H05LmC3fJ/BjRTWuAQsmury
+ySKEH0v1L1eHJQ9OMQieSgLjNzld8UwofsuPqupYU3aVptoO1AkAnqbcjFb++QJ1
+X+abt3xTocgFzCHIpkhBfmobWqy0w7HCg7Lr/Pm+PcLEAJfd51nqWeI+H9C38uzE
+vqCjDohB8ux07gxS9D5ImPqFVzjWe4/dvc/FLl/ELpRGZphWcubPW8Grc7eAMGov
+SRFCVpQnMF0Dx9+NoAvUTpZYuIe8zRtrn3Ifnnl687JQxS379cunZxr5eONDeFdS
+Lf29VSI7FO0t+XNTEx9ThWEWFKk9Y5Q7BJGeR4IirvR7wOdje44Rz5jNEqNNZtaT
+qlvPEmeVUrBIPMzvXaMi8llXN4FvA6LE9u8vwPE19HOj9Z4dwxgVJNJ07NfE2z85
+qUX0BrTSZwS/vprFLrIfhzYv56xo4ImvDxDMc54+OJMnyZZSP/c1eI0dC7iCEBfq
+uaLX8lIyklVB/8UwdS/J++rJNeRrPeujYuRVIW1uG8SIXnhLRoxfbhzS1aotiIsX
+KZSJr4AppiYAxiQdvuLeXH/iFwIDAQABoyEwHzAdBgNVHQ4EFgQU0142G9eAgnVS
+ij8nR1YS5OxM6GgwDQYJKoZIhvcNAQENBQADggIBABL/fL4xkx5IPwq0ptjV6O4l
+ZkeqazPxzzqVrct87w96aDTu3Xq2VYL2lEAOH2sYHCUNXKKU4XlJCrOapXHM81OH
+NPMwIftSAPLUHVkFRIcA/tsLCx9DXrvlHB3pgoyoa7tW/Kn+MwAq+VTvOH60n06z
+e+InFh/Nic8rznbepszF6UUAsMioewxWEOD3sMa35SIYjG/doFCfU8dYpeknKKG0
+OQzE6duv6vo0nhIZQAmzwYkmdkSsoKp75dCSJxgcZCk5gyn8zB2AYY+lrzI2JGGP
+1UTS96fa/iJd74rDXVL5RVsLYbKzIe+qufUoGvq+aMedu0LJSoq2r6j6ebzdbLnP
+SGflktZQEDmyvUbCt3b7V/PsSMICNoqh7oE4cYZ50supfKDPZJ2DBT6woEf3Zk9G
+1jyiy1iYY/HbU80crjgiOoPLcCt6IXiwZT3mqfZx9WMPVVvmxAoDMV0LnP7hZHNI
+KyDPsl6HXccM8gk4kwFDr5krfKz7IOVwKw+HAoWDYRqa0qx6ZBxhQpJsN9L58N49
+aWsGANBHrZjOV1Rgt+C/tHsxeGm3WaqSGCiyOLiROaXmTiw9PaLEXfoFNibzSPXq
+vth2u62pWqp3aYEEuoutZxf/zPiMLl5412tUkz1UAJt0YcCz+LWIPqeyUHijgWxj
+wl3IpsPIn5zAcd9srrdy
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/reseed/cheezybudz_at_mail.i2p.crt b/installer/resources/certificates/reseed/cheezybudz_at_mail.i2p.crt
new file mode 100644
index 0000000000000000000000000000000000000000..fecdf0b96f3c18f6f3dfbf5579bac4d045c5ae12
--- /dev/null
+++ b/installer/resources/certificates/reseed/cheezybudz_at_mail.i2p.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFhTCCA22gAwIBAgIEeCJXkjANBgkqhkiG9w0BAQ0FADBzMQswCQYDVQQGEwJY
+WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
+b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEcMBoGA1UEAwwTY2hlZXp5YnVkekBt
+YWlsLmkycDAeFw0xNDEyMTYyMTU3MTZaFw0yNDEyMTUyMTU3MTZaMHMxCzAJBgNV
+BAYTAlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBB
+bm9ueW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRwwGgYDVQQDDBNjaGVlenli
+dWR6QG1haWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgLkj
+Jsp8pjRi5N/JHHz+MXisgbI9G0vpd3yDhHvae3oF87iiQbxflcdcoH0l5RZL0cAn
+w4amhqoOk2qhf+NSAEkiPWhk7CzPBRwDExEM/gmHYLWXbfnoHGaEls9ORGuDlDmN
+hCFJVrxaZocIOi/7gZ4A+tC8wq+1aoe0Yhr381OW59w9AdUAWjBWibO3V59dEklL
+7HqfOc2v7AMKDLJWgPekj8ZbqA9lRxHM6Djtjz4d9QXeQa8j3xLXTX1QbkvJBBX1
+9Rzi/Nzv622lzoZ/Z/61jW7Bz+h9aJ6qp4on9K4ygUw/VduTOH/1ryQmw87x4MFQ
+Z/Y86lOl7XZxBjtpYpGQW/5LmBe2BCfWgIYe9N5ionNgAe5TNEIDngP9AvJmcTyF
+KcGgOgXQO9EeHEdgf4nC6RbGrb2sBtRjWJv5nOhHRG9tpwYkw/Zc5ZNHOymYpPMg
+wce3me+1psJFt+gXhDcvxpRgTZpXfz91K/nKt3+szcYFluqhJLi6nL1TmXQVn51X
+lGD1bcy1VUof+uKyb223JX5rm9WQ48GzUfy5cK4o+khEo0RLb21FwG5iJwVzhtoN
+xQS1TO6pwLn8Si1ePRwntzlOm8DPIwdUkPBQNJ9DDkcdVia2GgbVM6LH8lrukekq
+soYfwmOTsFRkGo04ujDI/IeMrl3zmJphyQkGx18CAwEAAaMhMB8wHQYDVR0OBBYE
+FJ2MHeHnfCpEuYvC/9eK2ML9ne2eMA0GCSqGSIb3DQEBDQUAA4ICAQA3XUS7Zw1i
+RJWPSu2oLzV7oTtIW5po2Gd5BL3oU6BvlK1zLw/z/soF/LopeHQudBYxYckyv4MG
+gTNS9fcKkVdhNyLI/R2S0nQ/VFhTzuvq8HnnTOpvopA/cXTQlgrhGB2ajIZMYsXe
+lei0V5H23etXTbYZWK6/IgoALk5vowde9lpJEIBhupIafqFg0tAo4LX07/eNxDOp
+nXrShsYhHNaRhglS+0Gqj1UK0WvgMJxQKJm/VLi7jx8vfRkqXs/b76XT+VMQuUJd
+l5llQwpOicQhX/ZTAO+iWrDaO7mz/ZDweLxnfWd3m2JwDJlE9K5l98zdcve96NRZ
+ePnK8vBoAPQ9iHhwFSC5GpirK1KmT/BDLjqEF3H/HgPdPWSh97AUFpBryEIdZk1q
+Czi9DCvwHNpbpI20Fo48+2N7sbvq4onZZqx5V0SjTj/9bHSSDwG9ok1JqWoZmRvo
+p4MIywAJowlvPNc++jSHT3R7segeNUi/UdYCmm70j1av+0aEknmvPtF6atsHJ22X
+5OMBhiPi1pudFWFJFWk4WOjrK/juwHHfHNgFVyziva4q6wPKrPno0gO5pCpfRUld
+QAoSPgo8LAB3dugt5Xfsuone2GhLi1SLQlWFJWHswd/ypWa0FB+xn6Edkc1noOWY
+06dwfEP/gTCAnSplLyrFWxnyHManBxq/bQ==
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt b/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt
deleted file mode 100644
index be1010f9b799023c39bc06895940df2cfeaacc20..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFezCCA2OgAwIBAgIEPSs1SjANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY
-WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
-b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p
-MnAwHhcNMTQwNzIxMDAwNjUwWhcNMjQwNzIwMDAwNjUwWjBuMQswCQYDVQQGEwJY
-WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
-b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p
-MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnYMNclgj1gIJfot6f
-65jbcXpcqf9hhL/uYiU4+uxVevWyJvNHpMzhPWNN4l3HihJJsINsPs/MsZ83Guva
-GW5S/93I617kyjs/ZVpEtfABGewho0m9VCBV2/N1mJpHvvR+9OR+YVuWlTB/8sTG
-2smdRj/dkKvewN5PSTQH350yT18NR/DmZUU1Iwa7vrNw8ol3rP3qx9UGpFN3JE7V
-Q9cA1nktMiFUm76eOPOoln04WDqW2rvArXzvhSApvt0JsLBrZDzM3cx2Rc2UdjIC
-h+Ha+G4CLjszfZfQAFJYPred38Gg6wuXiza/wCBSPiB92i94hIQF/OSeukaMiqwG
-dRAcBT84/U9bddqHlIICw14PkNHOGUyJGjGKWQl/2bLX43ghWkUJmsTXS3iVcOTc
-gb/7MoCRBdL0q2GyEJXuAoKXD9VqD3g+EdcBTQxS9lhZ0iTR7423pg6FP43VMEUC
-HUi/BOX1tCY6iRzD1Su6ISIx7klH/sAWWa+SybLFXWtZJxHXXJICiBHJWRbWgtlu
-5V+at66yg/LNpyfW3Am08gDV0kiWUBN2Ct4TX9PAQmNDisNgi2AzdZHIfX6tRpU8
-UnNcnZGOh4+HXQwJtI0y83C8TsXJUFYfGFWqXN69sMEmgtX8/w+YUqjtb2GcX1HN
-6z9u9lH40JCFHTA/clPqOSQ+MQIDAQABoyEwHzAdBgNVHQ4EFgQU4R6x7ArVpSVs
-b8VTBXmodXzyraEwDQYJKoZIhvcNAQENBQADggIBAJEHLSDBRU2x6EalmN2W952p
-MEO5lGD+ZfUVK0c44t1O53naffwZx9QmDmrC4TjeQrLOpAXLQ8GJHAGeZVmYRgkf
-OioKde5uuqVcxqNxArO8VyYGwsuNVPCaBV+SyIO+EmWogidSIrOP2WsRRS2NBhLV
-2dp3TvMeod9bPwRl00guvv9iqL0UVSpQSlfGkAQTVpyADOaQHOzeoCpmtPOfB6OK
-syB/Z/6HElKoUbvhynaASLgmo3wM93PVJQ2Ho294bQHtDl2qcOksJQvWfCgi7Zrt
-KuHaM/a2kItzI6JmyNFXgsKQSDJ4UvoppppgD7K48zOtSipGuZAADC5w5HdVvIGJ
-1Czva8kTcmC6AMc+4tACGqYZEAEokkeXn+pIIqKVj2eQukT/0dLGGHbKmxp3Z0f2
-pIH2Draq8JPdacr9P/xqEWUuViaOuC5OBjY8Fg3fmVCpwefIuk+DBhbJjEugB0Cu
-brJpqNznoYahkbyAXIA8T+QJYMhoGWmaIcaPWK6K3nArvaxzwJbb9Egyivhyp9Rr
-r2QMEZ+cPO8p1mEhKpL/wGqAzYyla8SJ06PzLc1lQeGiClu1nbZj5AgkZ1DLa8SD
-iO7+e6rS0q1bzc7smE5JzZRiOVqKij/ReKa2uebLLI4wgAhz5ymaD1HfZY+3dV9T
-WX89Xn2UyQf5kHifiDKL
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/reseed/swat_at_mail.i2p.crt b/installer/resources/certificates/reseed/swat_at_mail.i2p.crt
deleted file mode 100644
index 276c8be3622bbfd813831658428fd302be167f38..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/reseed/swat_at_mail.i2p.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFVjCCAz6gAwIBAgIEU71jgDANBgkqhkiG9w0BAQ0FADBtMQswCQYDVQQGEwJY
-WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
-b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEWMBQGA1UEAwwNc3dhdEBtYWlsLmky
-cDAeFw0xNDA3MDkxNTQ1MDRaFw0yNDA3MDgxNTQ1MDRaMG0xCzAJBgNVBAYTAlhY
-MQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1v
-dXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRYwFAYDVQQDDA1zd2F0QG1haWwuaTJw
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjSj53hsbTqtzbnlf5LbR
-HmfdC2br9QZaB9e5IQKprlTptdzqTrt2LRS6ZaJ06BKJgX3AfLflvyeUDUPoyg63
-I9a1kb1AsrcxvMkHXTUwPaO09caO5/CiQ3zx/iuTl4e0MmGe3cz7jsvZNdOVH0ba
-B691GB2UBq2QjobGx01qjWtACCmoQIcEur2ns/l+VzAextBL70dSPN6EJAonQnWc
-JvHf1vhXp5DWasaIovm8haNo48QpCo7NllsAjiONQM9rrJITvzFG9hX9cv/B1Kr4
-LCebTXv58ViXXFsnxYhktAFwP33fn1eCLraJ/BpaDR4+s3ovMC/7S+g5//+sQTd1
-pR/kXx4BmZWZdzs083Z/2skQON75j/qnMhUQqpFCqUImm4lOhlIGbzFJ4GQM6VCR
-V4BbvC3XuDc6vlivLzWpUEU7Kc6YnfGgi2G//ZCj2CAoR7qZs/n9997C8oAvGY5z
-XGVC/GqIFHuFvnDfPDvxGovYjLJ0KrNtAmp2Rb5812glnVdPwbRYRUBg3ICbNey3
-rmGPURDq0aHMTzX4gtM+/hCYYVnkzNMQvYuw9EZLZrK/XdM1a0U4kajZSKKJsTmW
-uQwXSUVjTKQh//yL4zPoELucFk5r7apLePEm6aCeWuY2wVkR8KEFgNanwDckWQAm
-Lk9r2t+Y/l2jS2NqBWFyr+cCAwEAATANBgkqhkiG9w0BAQ0FAAOCAgEAgFSquj/0
-iZYpFI1XarSIVpGMo0WLAmb9GZCn5yoXSeE6eypI/hHhXA4Bjdk2Ae33pXPNcCV8
-oT/gHj8943Wx7CTxty2zHzIsd92/HG2EG6U/HPp5l7yIJQaWoe/9tjQoaBhipZOK
-+MiytkoBWkyXFqXnKQPExiadWB8axHtt66vrikOcSx6Ur3u5DPKybvY4fsuvo4+I
-cLLgoueFm6I1WhmkVmjtm4k2yZ/Z3NEYjg52rv8NuYhRwK2JrQeRzMZv/zt5KhOt
-05woHrzymjfFBu0M8uxX7EGZBIsc8zcEY7JL/NSMArw/QCgLU5bQF6+CsyxWUkt1
-obMRXU1oS9GjC/1F0kw52NOz2qzBn9tZBc1zs8+GLpYBUf9KiUMFOfJpkr706VqC
-orgxRYwncicq+de2PlesxJb3DNPFuAzUNzAqxcVYDoFPAiL1zCEl0nhBrbN+x93X
-ojTfV3UlbMjMkQKveYJxsi5/+jO1dHIkXpzK4bwFwHmJ2RCa6PualWhuXldX6mR+
-APoY6xeoPRlyKk+POrSwU+hywUudyPuFyzDMo8n1w4CyqL+/ky3YsLfGBM1phbb2
-GEnZ0J1HW34Pnie1rzaCak+3RfaZsImCwh1xXl/H7Ka9bLeUIfOuipSSroctdaiG
-84wIiEjxgjW2ldM37gTX2XtE/blB1YPIZ5U=
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/cert.smartcom.org.crt b/installer/resources/certificates/ssl/cert.smartcom.org.crt
deleted file mode 100644
index 960f2657be21aae603a6917266b2c6a67113406e..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/ssl/cert.smartcom.org.crt
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/i2p-netdb.innovatio.no.crt b/installer/resources/certificates/ssl/i2p-netdb.innovatio.no.crt
deleted file mode 100644
index d9bac193b5f320f4ccb7fec979328560ee34e004..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/ssl/i2p-netdb.innovatio.no.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID2zCCApOgAwIBAgIBBzANBgkqhkiG9w0BAQsFADBCMR8wHQYDVQQDExZpMnAt
-bmV0ZGIuaW5ub3ZhdGlvLm5vMRIwEAYDVQQKEwlJbm5vdmF0aW8xCzAJBgNVBAYT
-Ak5PMCIYDzIwMTQwMTIxMDUzMzMxWhgPMjAyNDAxMTkwNTMzMzFaMEIxHzAdBgNV
-BAMTFmkycC1uZXRkYi5pbm5vdmF0aW8ubm8xEjAQBgNVBAoTCUlubm92YXRpbzEL
-MAkGA1UEBhMCTk8wggFSMA0GCSqGSIb3DQEBAQUAA4IBPwAwggE6AoIBMQC9WVet
-EFeKAHmwgTUxJ/bRI4Gtjke3uj897eeZ15Y0SiqdHzypsEIWtXqx4G3W801xZzhv
-UiAculvwRY4kpv3DnQE4sNTzbkAlvC6z4+CpFM2mhZ7o+YmozrIsNmQNCsvlxqJV
-AD1mzqTFl/OB7LVtLmpSSd36IQFGmsh24XXa4pVH33e+NCZIGsdVwGsa4GoRuC9a
-s/DiLI+x6zYRoY9cfOF2DuuOfKNMjSl65QUe4uHZCsRTb1q08NnPIidEFHr94kZH
-Hph+MQs6MUVK1eT4yYt084S3cEWmWBQZVyAvWQ9q8EW+MoniOM7bBG2Bn9wu2F5x
-kAKWTYfKSStW5CKSox9VSoopiUAtEIqhwgFGTISqhQyfOfyY97X2M47wvyWsl6dE
-NxTgdvLD/o24rejBAgMBAAGjeDB2MAwGA1UdEwEB/wQCMAAwIQYDVR0RBBowGIIW
-aTJwLW5ldGRiLmlubm92YXRpby5ubzATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNV
-HQ8BAf8EBQMDByAAMB0GA1UdDgQWBBTaTuBpTAinNiT9PfKNRdIn3HrwxTANBgkq
-hkiG9w0BAQsFAAOCATEAsYtojwAHiFwUqvCMIMJa5YN0Ms/QpjqZiENuGBpxvmVF
-WVImX4s8K/qoBAKED8uKcRbMQd0FeDea7kMisJt5cblDzYuSv6wfeLXYkaT8/9H2
-X1pXhO/eghJ2U42RTgBkaW3mCI8ohk/GehU4tEXnbWRPHt6XDoSYDJdf2X8BPcgB
-ZE10owLCw9c80QTuU+LCvbt8/F2USyNplUrogJGThzxrxZvxjGq6EcDj0iA0RRoG
-5CUNrCB+JgFc+4bagI3E5B0skk/wn3Nl7mM8/Nf8b1QENmc8eYBZx2InA9769DHL
-tNxzvE+OeMNlKy4M9WvLieIh6KmpYhHBG8ubJT8X+bZpJkh4rH6RzVYiXeCpX2iL
-eoeSriGO0+8CJTBRbd5cXYd/COT0iAomMTelhcGVTA==
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/i2p.mooo.com2.crt b/installer/resources/certificates/ssl/i2p.mooo.com2.crt
new file mode 100644
index 0000000000000000000000000000000000000000..839767b3b2d97b8d68a1ce1abaa3335b32b4788c
--- /dev/null
+++ b/installer/resources/certificates/ssl/i2p.mooo.com2.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDvTCCAqWgAwIBAgIJAOeW0ejPrHimMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV
+BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQHDARub25lMQ0wCwYDVQQKDARu
+b25lMQ0wCwYDVQQLDARub25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkq
+hkiG9w0BCQEWBG5vbmUwHhcNMTUwMjA4MTczMzA5WhcNMTkwMzE5MTczMzA5WjB1
+MQswCQYDVQQGEwJVUzENMAsGA1UECAwEbm9uZTENMAsGA1UEBwwEbm9uZTENMAsG
+A1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTEVMBMGA1UEAwwMaTJwLm1vb28uY29t
+MRMwEQYJKoZIhvcNAQkBFgRub25lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAqxej7oRl9GOb8benIBCENrJXoow1iWhI9M+2nU0SaonrCDql5M2YMlwd
+HzYUWtFbRjz2NinjB0fgFq9cfzHfr1Sc8k/OeGg1jvNfqt8wWo9tryQNjiHtDQUZ
+6lQ5T13I+lj0CBasowgbApKQfrYjvaeuTaVYTfP8IVA60hoUQ+sy9JN+Unsx3/0Y
+PLLd98+bT27qYuBNRB1g/ifUTd9Wosj2PevGBlCxYDaUjmCG4Q8kcQr87KvM6RTu
+3AV61s/Wyy1j2YemlGG/ZhJ44YnlVMSu1vTjt9HInVf3lRRx/+RzbQO3lqeVC8LC
+Bq3KbSlfJVx4vHslfHwBFw9A4rmD1QIDAQABo1AwTjAdBgNVHQ4EFgQUsSUvX0ED
+yivB67iksVwZ+b8vLtQwHwYDVR0jBBgwFoAUsSUvX0EDyivB67iksVwZ+b8vLtQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAde4wts7Q8TylFEc38ftJ
+2f285fFIR7P1SSbBcHPK2eBwLEg0zJyFrCeiHuEpPrn+d5GqL2zOskjfcESGmDBT
+aFajj8jPBJj/AmpkdWJG6a1YKro5tu9wrlenGwHOHu2/Cl0IJvafxrOs2x4G+2Nl
+5Hcw/FIy8mK7eIch4pACfi0zNMZ6KMCKfX9bxPrQo78WdBfVjbrIBlgyOQJ5NJEF
+JlWvS7Butv7eERi4I2huN5VRJSCFzjbuO+tjP3I8IB6WgdBmTeqq8ObtXRgahBuD
+ZmkvqVSfIzK5JN4GjO8FOdCBomuwm9A92kgmAptwQwAHM9qCDJpH8L07/7poxlGb
+iA==
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/i2pseed.zarrenspry.info.crt b/installer/resources/certificates/ssl/i2pseed.zarrenspry.info.crt
new file mode 100644
index 0000000000000000000000000000000000000000..e855d6edfadad7f62382044823aa9a70eff8d1df
--- /dev/null
+++ b/installer/resources/certificates/ssl/i2pseed.zarrenspry.info.crt
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkzCCA3ugAwIBAgIJAKsW7idQxp0aMA0GCSqGSIb3DQEBCwUAMIHfMQswCQYD
+VQQGEwJVSzEgMB4GA1UECAwXaTJwc2VlZC56YXJyZW5zcHJ5LmluZm8xIDAeBgNV
+BAcMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSAwHgYDVQQKDBdpMnBzZWVkLnph
+cnJlbnNwcnkuaW5mbzEgMB4GA1UECwwXaTJwc2VlZC56YXJyZW5zcHJ5LmluZm8x
+IDAeBgNVBAMMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSYwJAYJKoZIhvcNAQkB
+FhdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzAeFw0xNDEyMjgxOTI3MDdaFw0xOTAy
+MDUxOTI3MDdaMIHfMQswCQYDVQQGEwJVSzEgMB4GA1UECAwXaTJwc2VlZC56YXJy
+ZW5zcHJ5LmluZm8xIDAeBgNVBAcMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSAw
+HgYDVQQKDBdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzEgMB4GA1UECwwXaTJwc2Vl
+ZC56YXJyZW5zcHJ5LmluZm8xIDAeBgNVBAMMF2kycHNlZWQuemFycmVuc3ByeS5p
+bmZvMSYwJAYJKoZIhvcNAQkBFhdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANrEncHwS+7R0Ti/jZa2Ex7ujglV
+huYO59nLxeAOpEQwn6V41X5+L0hmhM0zuYavuP1jzKfF/Cn0CG1PqkGbEnXrTOGf
+4gMj2wy/UVVFXaPQwldi+CEiNo6nI5S+T/upg5VK6M5/ahYbfIbX5xF27QNPV5qW
+RnM0VK4gIQkFFtpiI0dFcEU9VYe+cg7a4Jvxc5LzqaIBZHWMX6alPfBT70LkYiiQ
+76IRw5oBmqZjfIdiudRhFkezMkDomKSgLR2/0HJbekq2WeLXJLMPM1rdpCYldBEi
+t6Zng9uAJa1mA6Al4RhO1aQEPj9Vo5h+Vj6FHJAJJcb+YW6wLKBkJVGLF4UCAwEA
+AaNQME4wHQYDVR0OBBYEFL538Fr1l/9YQgG+iZvJUuOzAaVaMB8GA1UdIwQYMBaA
+FL538Fr1l/9YQgG+iZvJUuOzAaVaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAKq7KEnR0V43PsA5D23Lhawy5W/BDs4RO3LkYSxi+zR4EAMC8RhafrmG
+6IZVp+ykplZtFK3Kkw1osakcvmHRLoPCXPWLibXtWMEpmH4GhWJKf5Ct1kY0VkEE
+ALP7vCtjDm5l6WBaNOZYv25wwg5wgjyhzfJtLxzyRRPOjUuv0M3FFwJEAauzoo+4
+nle91IHNcWPIq1kgWUwWBHpLgZ2RpSOZS9MBOCkjHwQhoebhpgwSPgUHvBJ7FoLb
+AeAdwpgPdIQ9gZEZEPfCPfG/Qp60yLAhkT2CF7F1h47VYe8LGBDbd1HGpSwjulq/
+lnvV4zDIoKhbQhUpxwgHo79nxcgddOA=
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/netdb.i2p2.no2.crt b/installer/resources/certificates/ssl/netdb.i2p2.no2.crt
new file mode 100644
index 0000000000000000000000000000000000000000..7c792d99b69276c2537b5c730281e8482eae0905
--- /dev/null
+++ b/installer/resources/certificates/ssl/netdb.i2p2.no2.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID1TCCAr2gAwIBAgIJAOd9wIt+w/I5MA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
+VQQGEwJOTzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwET3NsbzEMMAoGA1UECgwD
+STJQMQwwCgYDVQQLDANJMlAxFjAUBgNVBAMMDW5ldGRiLmkycDIubm8xHzAdBgkq
+hkiG9w0BCQEWEG1lZWhAaTJwbWFpbC5vcmcwHhcNMTQxMjA2MjM1OTM1WhcNMjAw
+NTI4MjM1OTM1WjCBgDELMAkGA1UEBhMCTk8xDTALBgNVBAgMBE9zbG8xDTALBgNV
+BAcMBE9zbG8xDDAKBgNVBAoMA0kyUDEMMAoGA1UECwwDSTJQMRYwFAYDVQQDDA1u
+ZXRkYi5pMnAyLm5vMR8wHQYJKoZIhvcNAQkBFhBtZWVoQGkycG1haWwub3JnMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmtRtAALMImh0G0X+AtMpJNBa
+HduNkg5t+0juitKRboXXAp5k7yN9qnimlBxlAicNb+QubcDuL+WV91NKz43dd6Xp
+SAewqMFRPUAki8uYzoh+hQEfzyd3NmadUKquYZsYwomhHnraOmLZLbxD6ED3FEwl
+hGBJwYnhyMZUCgB5+DEEHg8RdLz+H0bMrwz3e7/0lMtH6lM1lIHz0KBULWLp7Om0
+sk3rmmhPUIXqfoY8X3vClI74o0KcslMVaF4rt3lAHdoi3lwA6Qbdqq9nC9rPWHUS
+USQQ/MKsNfDTGsHkbW2l0VgNvJkw92DwHTXSJrsEqgkdV/B1hHxCKgL44c/CbwID
+AQABo1AwTjAdBgNVHQ4EFgQUCkebDZE05yKMbXORa6gO+aLdCscwHwYDVR0jBBgw
+FoAUCkebDZE05yKMbXORa6gO+aLdCscwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAQEAfHO0g5M//X5xDIuXGCeqQMUrF3r1N45a+0kqo2b/rd9USueNGrJl
+KE7MfDgShy2d4strZ1m0M4StW0RlUUZ4V4FYwzcknF6VXbOQK3BTrAeOwuxsrHoT
+abrMZ36ABYur5WakOYtPyQ5oXFUAIpGBe9LH7q3XLegSOfftvc2xdJ+VK0n4MEfY
+GfaRGMNW/pxGYLWvao3soOJMtp6cQ5KIYGuX92DMon/UgPBqEygeUj7aIqjhRss0
+b0dUZQyHccAG+e5NeTF2ifHCEh2rZY18VGxPL7KLrCQigu5lif1TTv5CDO5rKrHl
+TuTOsnooMxUH4ThIVI9cxXk6bzRMehLghA==
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/netdb.rows.io.crt b/installer/resources/certificates/ssl/netdb.rows.io.crt
new file mode 100644
index 0000000000000000000000000000000000000000..5d99233cf546cf0428c4d12cf625ed6a1a031a49
--- /dev/null
+++ b/installer/resources/certificates/ssl/netdb.rows.io.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFszCCA52gAwIBAgIRALWZzF745GPT8GVUcZ0RMg0wCwYJKoZIhvcNAQELMG0x
+CzAJBgNVBAYTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnltb3VzIE5ldHdvcmsxDDAK
+BgNVBAsTA0kyUDELMAkGA1UEBxMCWFgxCzAJBgNVBAkTAlhYMRYwFAYDVQQDEw1u
+ZXRkYi5yb3dzLmlvMB4XDTE0MTIyMDE2NDIwNVoXDTE2MTIxOTE2NDIwNVowbTEL
+MAkGA1UEBhMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEMMAoG
+A1UECxMDSTJQMQswCQYDVQQHEwJYWDELMAkGA1UECRMCWFgxFjAUBgNVBAMTDW5l
+dGRiLnJvd3MuaW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCTZyJF
+Im9pnc7OO5DfQy4SuotUztO5BJX7xniTqD4fKLQQXzZFeT4XHrkDste8TsTzUfxt
+CWDEBH3af5cpnwWMT28rlRw2DlPr+LnAgt7VjFXdhFZr1N5VfNlTI1K3OiZ/DRlB
+92CoTypyx4ebNfLtZfh+TPLOdg5UqROpHIrybsUj2IaG3IpGHJK8FuH79b/X5oVI
+FlDZJs5QsJEARzq2QMJd6fnNqkCBSSjNpeL7TtDar9EKa6+O7s351kH8MVFNSogB
+F0Hqu8LYaRC1L1JCz5lsOYKepp3MMIOdDOhy+FTd8NuNZXYkUTdTNI4dB6w4Z6o+
+xlnHEPpezIAAlPXLiupvlEi0om69/TMS+pLDBLAOlCZ2YaXS18UrSbmYYlekg40J
+nEeALt8ZdsU/is7Q6SJZ3UltFIPCuMD+ixvaIvakkhNiqEWPxdg0XxAK1ZJYFup+
+2aVtPLQIzWePkG/VbdA5cxQKNtRwOgvCoKIE29nUbxuq2PCmMhLAfXHeieSzP5c7
+Q8A23qX94hwCIePj1YA9uNtStjECfVS1wjyXV4M1tTFUdSJv4aVtFjtya7PY+6SG
+Srz11SqBWSqyJ/C14Su0QY/HquglzMRnkJ49Scwb+79hl7kPslO1iIgPLE5S2fIW
+ZwJ/4AgGb6BZT8XPEYYANEA5y7KGanYNo8KdYwIDAQABo1IwUDAOBgNVHQ8BAf8E
+BAMCAKQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAYBgNV
+HREEETAPgg1uZXRkYi5yb3dzLmlvMAsGCSqGSIb3DQEBCwOCAgEAMjQSHPR/p9If
+mJA1y489D1NB2CxfwO+CgAIs9HA7OsdneQBZTldMgBHoQGifkpD1uSl8DHoZqnJ8
+wo5YWcT1rYkP+V1jGfZj92VvfQL0/R4G4hWdQwYY0CcXN8ixS36UDQVSFKb4zvNG
+j9iIN57WToEmxp5noHguKrpViwhXCMCpAXr3ZIv/Fd+QACNEXuvdZgbtwfOTPLKh
+ZlkUPgVHiQopeQnZhZCT3aLZ5lndrUtWlQYiGN/OolVyRie+ysuxjRR4L5brt4Rz
+hrwFBswbQZlgxJ3Nod9/wEdEJWP4+X69ggzOkBB+PgpOFpuDlJxNTcPA/WFIlsm0
+CzCv/o8Vg+MMWFPMwEZrk6UQXXACr1AEF+MUnZq3o5JaLvHoUcikewbZPcTCNvDp
+nqT1RN9vq/MGdlRfPJkF028IXPz7T9DXXPXhJvv+FAfnOkREeUYpzBIftyYf92ol
+l63z0FooVUTKWYPvFFgl5ShNnINTMVXPCZp8j7myLGSLOAFFwiaL1OtvftgxXfzC
+B7Qj42SNhFUrHmO9fH3H2ptm/iW/Xe5eqgeb6MVGQ/eQJpdp0AvpDa50/AYNt1Iq
+CcMKmBgzUezrIN24XXW/LZwazlc7I8e5RzgbEgXEDBZu21TApTKlmOqEYle8294W
+fWThMdwk1kTrWxLooiVrS5A1hXqADqE=
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/reseed.info.crt b/installer/resources/certificates/ssl/reseed.info.crt
deleted file mode 100644
index 31302c52bd6b87aeca9f40071cda8bfafbba7d6f..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/ssl/reseed.info.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRDCCAiwCCQDCm/Zrmali9zANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTELMAkGA1UEBxMCSEgxDDAKBgNVBAoTA0ky
-UDEPMA0GA1UECxMGcmVzZWVkMRQwEgYDVQQDEwtyZXNlZWQuaW5mbzAeFw0xMjEw
-MjcxODU3NDNaFw0xNjEyMDUxODU3NDNaMGQxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-EwpTb21lLVN0YXRlMQswCQYDVQQHEwJISDEMMAoGA1UEChMDSTJQMQ8wDQYDVQQL
-EwZyZXNlZWQxFDASBgNVBAMTC3Jlc2VlZC5pbmZvMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAt9nz0iUvjdX4Hkhfk0FbBOeEP4i/FG3V4VrEdQfcviSF
-XgzGYeRtGsvrFWP/5+6bcGnOkIy/jrKJfij3AjKJh8gTzqiNNNnV8VcHwFSNp+hZ
-D4BM+UHPACV1Pjd3HQe6f0+LvcTs3HQgIkNkwUyqRuXOm/5Mk6SWSu1740aSwHCj
-Kk0x1FByzI0YBvXCPX6TVk6sJqKkQyLzK0CSGSeqUq8GvGCq+jT9k62Su7ooxCwi
-GzxaFjMdVYxuI8cuT5Cni+SUw1Ia8vhESnIy6slwzk37xNI80VuMvRT6rD2KcXDH
-mK7ml1qL0rJWoF5AE+x/nen4V41mouv1W9rk3wTlTQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAr6RBviBDW4bnPDTcdtstTDdaYX9yzoh+zzeGB0dUR26GKoOjpSItb
-B9nrsW1eJ2wbblfGBUoXhcmNByKHXXHejMhmurHjdei2BuLbTsknN8DPKXu5UF9z
-cg4cKQkxgzXOcNYlaF4+sfwFXDHJ4we/8vduVgkyo8R66543/Sh/nIMvq2slRT4w
-wIBOVcMb2XxlbdwHW9XALAz9sto+4GH9GAC24f8ngluOpHijMnOOIo4dHibQ5hM9
-KcDpHezP0ugMTAxS2NmtVahwAqa2IjpqR7aEQ2wLvxQzDqrXo93L93+b2FKRUQXH
-Duud/n/w0kVV3DaIGikOsJayoanR+9HD
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/www.cacert.org.crt b/installer/resources/certificates/ssl/www.cacert.org.crt
deleted file mode 100644
index e7dfc82947e30af0637575869fba5eef4c683b7d..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/ssl/www.cacert.org.crt
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
-BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
-MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
-ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
-8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
-zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
-fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
-w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
-G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
-epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
-laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
-QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
-fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
-YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
-ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
-gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
-MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
-IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
-dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
-czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
-dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
-aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
-AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
-b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
-ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
-nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
-18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
-gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
-Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
-sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
-SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
-CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
-GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
-zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
-omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
------END CERTIFICATE-----
diff --git a/installer/resources/clients.config b/installer/resources/clients.config
index bb370c47e0c7e8604c263681faf585c1a4d82357..bcc055620725857acc51549f91762eae305bd126 100644
--- a/installer/resources/clients.config
+++ b/installer/resources/clients.config
@@ -39,6 +39,7 @@ clientApp.1.startOnLoad=false
 clientApp.2.main=net.i2p.i2ptunnel.TunnelControllerGroup
 clientApp.2.name=Application tunnels
 clientApp.2.args=i2ptunnel.config
+clientApp.2.delay=35
 clientApp.2.startOnLoad=true
 
 # run our own eepsite with a seperate jetty instance
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index c72a265158f0684253379f1550196eb9dbdb26e0..adf3baf8ed7a8b17dcde16ff5697a6ecbc055e0b 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -4,8 +4,10 @@ certificates/r31453.ovh.net
 certificates/75.145.125.59.crt
 certificates/forum.i2p2.de.crt
 certificates/cowpuncher.drollette.com.crt
+certificates/ssl/www.cacert.org.crt
 certificates/ssl/i2p.feared.eu.crt
 certificates/ssl/reseed.pkol.de.crt
+certificates/ssl/cert.smartcom.org.crt
 # old translated proxy error pages
 docs/ahelper-conflict-header_ar.ht
 docs/ahelper-conflict-header_de.ht
@@ -86,3 +88,7 @@ certificates/www.cacert.org.crt
 certificates/ssl/i2pprojekt.de.crt
 # no longer used
 certificates/ssl/netdb.i2p2.de.crt
+certificates/ssl/cloudflare.com.crt
+certificates/ssl/webpack.de.crt
+certificates/reseed/sindu_at_mail.i2p.crt
+certificates/ssl/i2p-netdb.innovatio.no.crt
diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html
index f04c20e48f01c8346779886f87cf457af472f7fc..d9900bb4ea3a52d6d76e9772ac6ec8225636e488 100644
--- a/installer/resources/eepsite/docroot/help/index.html
+++ b/installer/resources/eepsite/docroot/help/index.html
@@ -1,6 +1,6 @@
 <html>
  <head>
-  <title>I2P Anonymous Webserver | Welcome to your eepsite</title>
+  <title>I2P Hidden Service Website</title>
   <link rel="shortcut icon" href="favicon.ico" />
     <link rel="stylesheet" type="text/css" href="lib/eepsite.css" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -8,7 +8,7 @@
  <body>
 <div class="fairylights">
 <div class="main">
- <h1>I2P Anonymous Webserver</h1>
+ <h1>I2P Hidden Service Website</h1>
 <div class="langbar">
 <!-- Some of these languages listed here are yet to be translated -->
 <a href="index.html"><img src="lib/us.png" title="English" alt="English"></a>
@@ -24,66 +24,65 @@
 </div>
 <h2>Quick Guide to Anonymous Webserving on I2P</h2>
 
- <p>This is your eepsite, your own anonymous I2P webserver - simply edit the files under <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows)  
+ <p>This is your own anonymous I2P webserver ("eepsite") - simply edit the files under <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows)  
  and they'll be reachable by others once you follow the instructions below.
- In I2P, eepsites are addressed using a 'key', which is represented as a really long Base64 string.
+ In I2P, hidden services are addressed using a 'key', which is represented as a really long Base64 string.
  (The 'key' is somewhat analogous to an IP address, and
- is shown on the eepsite's I2PTunnel
+ is shown on the hidden service
  <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">configuration page</a>).
- The instructions below detail how to assign a name like "mysite.i2p" to your key and start up your eepsite.</p>
- <p>You can reach your eepsite locally via 
+ The instructions below detail how to assign a name like "mysite.i2p" to your key and start up your website.</p>
+ <p>You can reach your site locally via 
  <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>.
 </p>
 
- <h2>How to set up and announce your eepsite</h2>
- Your eepsite is stopped by default.
+ <h2>How to set up and announce your hidden service website</h2>
+ Your website is stopped by default.
  After you start it, it will be difficult for other people to find because it
  doesn't have a name and they don't have your really long Base64 key.
  You could just tell people that really long key, but thankfully I2P has an address book
- and several easy ways to tell people about your eepsite. Here's detailed instructions.
+ and several easy ways to tell people about your website. Here's detailed instructions.
  <ul>
- <li>Pick a name for your eepsite (<i>something</i>.i2p). Use all lower-case.
+ <li>Pick a name for your website (<i>something</i>.i2p). Use all lower-case.
      You may wish to check first in your own router's address book
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router&amp;filter=none">here</a>,
      or the file <code>i2p/hosts.txt</code> to see if your name is already taken.
-     Enter the new name for your eepsite on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>
+     Enter the new name for your website on the
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>
      where it says "Website name". This will replace the default "mysite.i2p".
-     Also, check the "Auto Start" box. Your eepsite will now start every time you start your router.
+     Also, check the "Auto Start" box. Your website will now start every time you start your router.
      Be sure to click "Save".</li>
- <li>Click the start button for your eepsite on the
+ <li>Click the start button for your website on the
      <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">main i2ptunnel configuration page</a>.
-     You should now see "eepsite" listed under "Local Destinations" on the left side of the
+     You should now see it listed under "Hidden Services and Clients" on the left side of the
      <a href="http://127.0.0.1:7657/index.jsp">I2P Router Console</a>.
-     Your eepsite is now running.</li>
+     Your website is now running.</li>
  <li>Highlight the entire "Local destination" key on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>.
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>.
      and copy it for
-     later pasting. Make sure you get the whole thing - it's over 500 characters and it must end in "AAAA".</li>
+     later pasting. Make sure you get the whole thing - it's over 500 characters.</li>
  <li>Enter the name and paste in the destination key into your
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">master address book</a>.
      Click "Add" to add the destination to your address book.</li>
- <li>In your browser, enter in your eepsite name (<i>something</i>.i2p) and you should
+ <li>In your browser, enter in your website name (<i>something</i>.i2p) and you should
  be right back here. Hopefully it worked.</li>
- <li>Before you tell the world about your new eepsite, you should add some content.
+ <li>Before you tell the world about your new website, you should add some content.
  Go to <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows) and replace the index.html redirect page with your own content. Virtual folders work, so you can host files from a sub directory without explicitly needing to provide a page with links to files. If you need a template for a basic site, feel free to borrow and adapt <a href="pagetemplate.html">this page</a> and <a href="lib/">content</a>!</li>
 </ul>
 <h2>Register your own .I2P Domain</h2><ul>
- <li>Now it's time to add your eepsite to an I2P address book hosted by a site
+ <li>Now it's time to add your website to an I2P address book hosted by a site
      such as <a href="http://stats.i2p/">stats.i2p</a> or <a href="http://no.i2p/">no.i2p</a>.
      That is, you must enter
-     your eepsite name and key into a web interface on one or more of these sites.
+     your website name and key into a web interface on one or more of these sites.
      Here is <a href="http://stats.i2p/i2p/addkey.html">the key entry form at stats.i2p</a>.
      Again, your key is the entire "Local destination" key on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>.
-     Be sure you get the whole thing, ending with "AAAA".
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>.
+     Be sure you get the whole thing.
      Don't forget to click "add a key".
      Check to see if it reports the key was added.
      Since many routers periodically get address book updates from these sites, within several hours others will be able to find your website by simply typing <i>something</i>.i2p into their browser.</li>
 </ul><h2>Adding Addressbook Subscriptions</h2><ul>
  <li>Speaking of address book updates, this would be a good time to add some more addressbooks
      to your own <a href="http://127.0.0.1:7657/susidns/subscriptions.jsp">subscription list</a>. Go to your subscriptions configuration page and add a couple of these for an automatically updated list of new hosts:<ul>
-     <li><a href="http://tino.i2p/hosts.txt">http://tino.i2p/hosts.txt</a></li>
      <li><a href="http://stats.i2p/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a></li>
      <li><a href="http://i2host.i2p/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a></li>
      <li><a href="http://no.i2p/export/alive-hosts.txt">http://no.i2p/export/alive-hosts.txt</a></li></ul>
@@ -94,7 +93,7 @@
      or <code>http://i2host.i2p/cgi-bin/i2hostjump?<i>something</i>.i2p</code>
      into your browser.
      Once it's working, then you can tell others to use it.</li>
- <li>Some people check eepsite lists such as
+ <li>Some people check website lists such as
  <a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p/status.php</a> or <a href="http://perv.i2p">perv.i2p</a> for new eepsites, so you may start getting a few visitors. But there are plenty of other ways to tell people. Here are a few ideas:
      <ul>
      <li>Post a message on the <a href="http://forum.i2p/viewforum.php?f=16">Eepsite announce forum</a>
diff --git a/installer/resources/eepsite/docroot/help/index_de.html b/installer/resources/eepsite/docroot/help/index_de.html
index 585f64f618142142fd0477a38fc550abcaa3e495..914c75c032f9f0ee5ee7f9645bc0c51d76f3a1ef 100644
--- a/installer/resources/eepsite/docroot/help/index_de.html
+++ b/installer/resources/eepsite/docroot/help/index_de.html
@@ -91,7 +91,7 @@ Ziele“ angezeigt.</li>
 <li>Heben Sie in der „<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">Konfiguration</a>“
 den gesamten Schlüssel für Ihre Eepsite hervor und kopieren Sie ihn in die
 Zwischenablage. Stellen Sie sicher, auch tatsächlich die gesamte, über
-500 Zeichen lange Zeichenkette, die auf „AAAA“ endet, „erwischt“ zu
+500 Zeichen lange Zeichenkette, „erwischt“ zu
 haben.
 <br>
 <br></li>
@@ -121,8 +121,7 @@ und benennen Sie dieses Dokument von <em>„index.html“</em> in <em>„hilfe.h
 einzutragen. Das heißt, Sie müssen Namen und Schlüssel Ihrer Eepsite
 und eine optionale Beschreibung in ein Formular auf einer oder mehreren
 dieser Seiten eingeben. Wie schon oben gesagt: Ihr Schlüssel ist der <em>vollständige</em> Schlüssel, wie er in der <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a>-Konfiguration für die „<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">Eepseite</a>“
-im Feld „Lokales Ziel“ angegeben ist (... über 500 Zeichen, endet
-auf „AAAA“). Bestätigen Sie Ihre Angaben mit einem klick auf „Submit“.
+im Feld „Lokales Ziel“ angegeben ist (... über 500 Zeichen). Bestätigen Sie Ihre Angaben mit einem klick auf „Submit“.
 Überprüfen Sie ob Ihr Schlüssel tatsächlich hinzugefügt wurde.
 <br>
 <br></li>
diff --git a/installer/resources/eepsite/docroot/help/index_es.html b/installer/resources/eepsite/docroot/help/index_es.html
index 0ffd46164ff3d56a7baa0324aed7fc2e3870ecf7..6695ae9a382ab1d99358f7aa4564359cc876fd0d 100644
--- a/installer/resources/eepsite/docroot/help/index_es.html
+++ b/installer/resources/eepsite/docroot/help/index_es.html
@@ -58,7 +58,7 @@
  <li>Selecciona completamente la clave "Destino local/Local destination" en la página
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration</a>.
      y cópiala para pegarla después.
-     Asegúrate de que la has copiado entera - son más de 500 caracteres y debe acabar en "AAAA".</li>
+     Asegúrate de que la has copiado entera - son más de 500 caracteres.</li>
  <li>Escribe el nombre y pega la clave de destino en tu 
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">libreta de direcciones maestras</a>.
      Pulsa "Add/Añadir" para añadir la destinación a tu libreta de direcciones.</li>
@@ -78,7 +78,7 @@
      Aquí tienes <a href="http://stats.i2p/i2p/addkey.html">el formulario en stats.i2p</a>.
      De nuevo, tu clave es la "Destinación local/Local destination" completa en la página
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration</a>.
-     Asegúrate de obtener la destinación completa, terminada en "AAAA".
+     Asegúrate de obtener la destinación completa.
      No olvides en pulsar "add a key/añadir una clave".
      Comprueba que ha indicado que la clave ha sido añadida.
      Ya que muchos ruters periódicamente obtienen las direcciones de estas webs, en unas cuantas horas
diff --git a/installer/resources/eepsite/docroot/help/index_fr.html b/installer/resources/eepsite/docroot/help/index_fr.html
index 499dde0f49b68b4518f6355ef1dd5d6ab0f1f470..efb60fa4b29ed6ff518f6af668138c13c0db63bc 100644
--- a/installer/resources/eepsite/docroot/help/index_fr.html
+++ b/installer/resources/eepsite/docroot/help/index_fr.html
@@ -58,7 +58,7 @@
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">page de configuration eepsite i2ptunnel</a> surlignez la clé "Destination locale" en entier
  puis copi
  ez-la afin de la coller plus tard.
-     Soyez certain de copier la clé en entier - elle est longue de plus de 500 caractères et se termine par "AAAA".</li>
+     Soyez certain de copier la clé en entier - elle est longue de plus de 500 caractères.</li>
  <li>Entrez le nom et collez la clé de destination dans votre
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">carnet d'adresses principal</a>.
      Cliquez sur "Ajouter" pour ajouter la destination à votre carnet d'adresses.
@@ -77,7 +77,7 @@
      De nouveau, votre clé est la "Destination locale" disponible en entier sur 
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.js
  p?tunnel=3">l'eepsite page de configuration i2ptunnel.</a>
-     Prenez toute la clé, souvenez qu'elle se termine en "AAAA".
+     Prenez toute la clé.
      N'oubliez pas de cliquer sur le bouton de validation (ex: "submit").
      Vérifiez que le site montre que la clé a été correctement ajoutée.
      Sachant que beaucoup de routeurs récupèrent périodiquement des mises à jour de carnets d'adresses depuis ces sites, en quelques heures d'autres utilisateurs seront capables de trouver et d'accéder à votre eepsite simplement en tapant <i>quelquechose</i>.i2p dans leurs navigateurs web.</li>
diff --git a/installer/resources/eepsite/docroot/help/index_nl.html b/installer/resources/eepsite/docroot/help/index_nl.html
index 8572db44759e142284fe805ce09acc1ac01c7ec3..1bff4cfb76515dbf6c7e9bb91aba1dc7058501b3 100644
--- a/installer/resources/eepsite/docroot/help/index_nl.html
+++ b/installer/resources/eepsite/docroot/help/index_nl.html
@@ -60,7 +60,7 @@
  <li>Selecteer de gehele "Lokale destination" tekst op de 
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuratie pagina</a>.
      en kopieer het op het klipbord.
-     Zorg ervoor dat je het helemaal hebt - het is meer dan 500 karakters lang en eindigt met "AAAA".
+     Zorg ervoor dat je het helemaal hebt - het is meer dan 500 karakters lang.
      <li>Voer de naam in en plak je destination in je
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">hoofd adresboek</a>.
      Klik "Toevoegen" om de destination aan je adresboek toe te voegen.</li>
@@ -75,7 +75,7 @@
      Hier is het <a href="http://stats.i2p/i2p/addkey.html">invoer formulier op stats.i2p</a>.
      De key is de "Lokale destination" sleutel op de 
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuratie pagina</a>.
-     Zorg ervoor dat je het geheel plakt, de destination eindigt met "AAAA".
+     Zorg ervoor dat je het geheel plakt, de destination.
      Lees de voorwaarden en klik op de "Submit" button.
      Het kan een aantal uren duren (afhankelijk van de voorwaarden van de gebruikte site en de subscription update instellingen van andere routers) waarna anderen je eepsite kunnen vinden door het invoeren van <i>mijnsite</i>.i2p in hun browser.</li>
 </ul><h2>Adresboek Subscriptions Toevoegen</h2><ul>
diff --git a/installer/resources/eepsite/docroot/help/index_ru.html b/installer/resources/eepsite/docroot/help/index_ru.html
index 9a5d94c5096b051adbeef97e6419fc091e628414..5cfbf2b5c960e04946554c058ef9ff2e8ee1c142 100644
--- a/installer/resources/eepsite/docroot/help/index_ru.html
+++ b/installer/resources/eepsite/docroot/help/index_ru.html
@@ -43,7 +43,7 @@
 
 <li>Кликните <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">в менеджере туннелей</a> на кнопке запуска вашего сайта. Вы должны увидеть запись «i2p-сайт» в списке «Локальные туннели» в левой части <a href="http://127.0.0.1:7657/index.jsp">консоли маршрутизатора</a>. С этого момента Ваш сайт запущен.</li>
      
-<li>Выделите всю строчку «Локальный адрес назначения» на <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">странице настроек туннеля вашего I2P-сайта</a> и скопируйте её. Убедитесь, что Вы скопировали строку целиком – ее длина больше 500 символов, строка должна заканчиваться на «AAAA»</li>
+<li>Выделите всю строчку «Локальный адрес назначения» на <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">странице настроек туннеля вашего I2P-сайта</a> и скопируйте её. Убедитесь, что Вы скопировали строку целиком – ее длина больше 500 символов.</li>
 
 <li>Введите имя и вставьте ключ в Вашу <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">основную адресную книгу</a>. Нажмите «Добавить» для добавления адреса в адресную книгу.</li>
  
@@ -54,7 +54,7 @@
 
 <h2>Зарегистрируйте свой .I2P домен</h2><ul>
  
-	<li>Теперь пора добавить Ваш сайт в адресные книги, расположенные на сайтах-каталогах, например <a href="http://stats.i2p/">stats.i2p</a>. Введите имя и ключ своего сайта через веб-интерфейс нескольких таких сайтов-каталогов. Вот <a href="http://stats.i2p/i2p/addkey.html">форма для ввода ключа на сайте stats.i2p</a>. Напоминаем, ключ — это вся строка «Локальный адрес назначения» на <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">странице настройки туннеля «I2P webserver»</a>. Проверьте, что Вы скопировали его целиком, включая  «AAAA» на конце. Не забудьте нажать «Add a key». Дождитесь пока система отрапортует, что ключ был добавлен. Поскольку многие маршрутизаторы периодически обновляют свои адресные книги, обращаясь к этим сайтам-каталогам, уже через несколько часов кто-нибудь откроет Ваш сайт, просто набрав <i>something</i>.i2p в адресной строке браузера.</li>
+	<li>Теперь пора добавить Ваш сайт в адресные книги, расположенные на сайтах-каталогах, например <a href="http://stats.i2p/">stats.i2p</a>. Введите имя и ключ своего сайта через веб-интерфейс нескольких таких сайтов-каталогов. Вот <a href="http://stats.i2p/i2p/addkey.html">форма для ввода ключа на сайте stats.i2p</a>. Напоминаем, ключ — это вся строка «Локальный адрес назначения» на <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">странице настройки туннеля «I2P webserver»</a>. Проверьте, что Вы скопировали его целиком, включая. Не забудьте нажать «Add a key». Дождитесь пока система отрапортует, что ключ был добавлен. Поскольку многие маршрутизаторы периодически обновляют свои адресные книги, обращаясь к этим сайтам-каталогам, уже через несколько часов кто-нибудь откроет Ваш сайт, просто набрав <i>something</i>.i2p в адресной строке браузера.</li>
 </ul>
 
 <h2>Добавление подписок в адресную книгу</h2><ul>
diff --git a/installer/resources/eepsite/docroot/help/index_sv.html b/installer/resources/eepsite/docroot/help/index_sv.html
index fad62fe6663e547cf87c5361c80ba5c18061f87c..43f57b7a78682bfefee2a108551d4c6189644ca2 100644
--- a/installer/resources/eepsite/docroot/help/index_sv.html
+++ b/installer/resources/eepsite/docroot/help/index_sv.html
@@ -61,7 +61,7 @@
  <li>Markera hela "Local destination"-nyckeln på
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsitekonfigurationssidan för i2ptunnel</a>
      och kopiera den för att senare klistra in den.
-     Säkerställ att du får med hela texten - det är mer än 500 bokstäver och den måste sluta på "AAAA".</li>
+     Säkerställ att du får med hela texten - det är mer än 500 bokstäver.</li>
  <li>Skriv in namnet och klistra in destinationsnyckeln i din
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">huvudadressbok</a>.
      Klicka på "Add" för att lägga till destinationen i din adressbok.
@@ -82,7 +82,7 @@
      Här är <a href="http://stats.i2p/i2p/addkey.html">nyckelinmatningsformuläret hos stats.i2p</a>.
      Återigen, din nyckel är hela "Local destination"-nyckeln på
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite-konfigurationssidan för i2ptunnel</a>.
-     Säkerställ att du får med hela texten, som slutar med "AAAA".
+     Säkerställ att du får med hela texten.
      Glöm inte att klicka på "add a key".
      Kolla att den rapporterar att nyckeln lagts till.
      Eftersom många routrar periodiskt skaffar adressboksuppdateringar från dessa sajter
diff --git a/installer/resources/eepsite/docroot/help/index_zh.html b/installer/resources/eepsite/docroot/help/index_zh.html
index 71ff20512c97ed1f8a68c039e3649418437e9a88..924de43d02c363137aae220f8969477fc33d6002 100644
--- a/installer/resources/eepsite/docroot/help/index_zh.html
+++ b/installer/resources/eepsite/docroot/help/index_zh.html
@@ -51,7 +51,7 @@
      您的 eepsite 现在正在运行了.</li>
  <li>在
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel 配置页</a>,突出显示全部的"本地目的地"的密钥.
-     并将它复制以备以后粘贴. 确保您复制到了完整的密钥 - 它有超过 500 个字符,必须以"AAAA"为结束符.</li>
+     并将它复制以备以后粘贴. 确保您复制到了完整的密钥 - 它有超过 500 个字符.</li>
  <li>在您的
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">主地址簿</a>内,输入名称并粘贴目标密钥.
      单击"添加",将目标添加到您的址簿内。</li>
@@ -66,7 +66,7 @@
      这是在stats.i2p的<a href="http://stats.i2p/i2p/addkey.html">密钥输入表格</a>.
      再说一次, 您的密钥是在
      <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel 配置页面</a>上的整个"本地目标"密钥.
-     确保您复制到了以"AAAA"为结束的符完整的密钥.
+     确保您复制到了以"AAAA" or "A=="为结束的符完整的密钥.
      不要忘记点击“添加一个密钥”.
      检查看看是否报告密钥有添加.
      由于许多路由器周期性地从这些网站获取更新地址簿,在几个小时内其他人就能够通过在他们的浏览器里简单的输入 <i>something</i>.i2p 来找到您的网站.</li>
diff --git a/installer/resources/geoip.txt b/installer/resources/geoip.txt
index 41c337872a2dd4dda923b9edcc9f0ca77c6c2e5a..3c4024d3438b88d211b038796f146b5a2739f85c 100644
--- a/installer/resources/geoip.txt
+++ b/installer/resources/geoip.txt
@@ -1,5 +1,5 @@
 # Last updated based on Maxmind GeoLite Country
-# dated 2014-10-07
+# dated 2015-02-04
 # Script borrowed from Tor
 #
 # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
@@ -19,7 +19,7 @@
 16859136,16875519,JP
 16875520,16908287,TH
 16908288,16909055,CN
-16909056,16909311,AU
+16909056,16909311,US
 16909312,16941055,CN
 16941056,16973823,TH
 16973824,17039359,CN
@@ -42,9 +42,11 @@
 18219008,18350079,IN
 18350080,18874367,CN
 18874368,18907135,MY
-18907136,18939903,HK
+18907136,18923519,SG
+18923520,18939903,HK
 18939904,19005439,JP
-19005440,19136511,TW
+19005440,19005440,CN
+19005441,19136511,TW
 19136512,19202047,HK
 19202048,19267583,PH
 19267584,19398655,IN
@@ -239,7 +241,9 @@
 83965952,83967999,CZ
 83968000,83972863,DE
 83972864,83973119,GB
-83973120,83976191,DE
+83973120,83974143,DE
+83974144,83974399,GB
+83974400,83976191,DE
 83976192,83978239,CH
 83978240,83980287,IQ
 83980288,83982335,CH
@@ -255,7 +259,16 @@
 84049920,84082687,RO
 84082688,84148223,RU
 84148224,84410367,DE
-84410368,84434943,RU
+84410368,84421631,RU
+84421632,84421759,MX
+84421760,84421887,PA
+84421888,84422015,BR
+84422016,84422143,CL
+84422144,84422271,AR
+84422272,84422399,CO
+84422400,84422527,PL
+84422528,84422655,IT
+84422656,84434943,RU
 84434944,84443135,IT
 84443136,84451327,LB
 84451328,84457471,RU
@@ -308,7 +321,9 @@
 85387264,85389311,SE
 85389312,85391359,DE
 85391360,85393407,NL
-85393408,85395967,EU
+85393408,85395455,EU
+85395456,85395711,TR
+85395712,85395967,EU
 85395968,85396223,BE
 85396224,85396479,EU
 85396480,85397503,ES
@@ -373,22 +388,13 @@
 86245376,86376447,OM
 86376448,86409215,AE
 86409216,86441983,HU
-86441984,86442255,FR
-86442256,86442271,GB
-86442272,86442359,FR
-86442360,86442367,BE
-86442368,86442399,ES
-86442400,86442415,FR
-86442416,86442431,GB
-86442432,86442495,FR
+86441984,86442495,FR
 86442496,86442499,ES
 86442500,86442507,FR
 86442508,86442511,ES
-86442512,86442583,FR
-86442584,86442591,ES
+86442512,86442591,FR
 86442592,86442599,IT
-86442600,86442603,ES
-86442604,86442687,FR
+86442600,86442687,FR
 86442688,86442691,ES
 86442692,86442699,FR
 86442700,86442700,ES
@@ -402,531 +408,174 @@
 86442752,86443007,GB
 86443008,86443047,FR
 86443048,86443051,ES
-86443052,86443055,GB
-86443056,86443103,FR
-86443104,86443135,GB
-86443136,86443183,FR
-86443184,86443199,PL
-86443200,86443295,FR
-86443296,86443311,ES
-86443312,86443363,FR
-86443364,86443367,IT
-86443368,86443423,FR
-86443424,86443427,IT
-86443428,86443431,IE
-86443432,86443451,FR
+86443052,86443451,FR
 86443452,86443455,ES
-86443456,86443487,NL
-86443488,86443503,ES
-86443504,86443507,IT
-86443508,86443535,FR
+86443456,86443535,FR
 86443536,86443539,ES
-86443540,86443567,FR
-86443568,86443575,IE
-86443576,86443823,FR
-86443824,86443839,PT
-86443840,86443887,FR
-86443888,86443903,DE
-86443904,86443995,FR
-86443996,86443999,PT
-86444000,86444079,FR
-86444080,86444095,GB
-86444096,86444119,FR
+86443540,86444119,FR
 86444120,86444123,ES
-86444124,86444127,FR
-86444128,86444143,BE
-86444144,86444287,FR
+86444124,86444287,FR
 86444288,86444291,NL
-86444292,86444303,FR
-86444304,86444307,DE
-86444308,86444311,PL
-86444312,86444315,FR
+86444292,86444315,FR
 86444316,86444323,ES
-86444324,86444351,FR
-86444352,86444367,NL
-86444368,86444387,FR
+86444324,86444387,FR
 86444388,86444391,NL
-86444392,86444395,FR
-86444396,86444399,GB
-86444400,86444447,FR
-86444448,86444479,ES
-86444480,86444519,FR
+86444392,86444519,FR
 86444520,86444523,ES
-86444524,86444527,FR
-86444528,86444543,ES
-86444544,86444555,FR
-86444556,86444559,PL
-86444560,86444563,FR
+86444524,86444563,FR
 86444564,86444567,NL
 86444568,86444575,FR
 86444576,86444579,ES
-86444580,86444587,FR
-86444588,86444599,IT
-86444600,86444607,FR
-86444608,86444623,IT
-86444624,86444639,FR
-86444640,86444655,GB
-86444656,86444687,FR
+86444580,86444687,FR
 86444688,86444691,ES
-86444692,86444703,FR
-86444704,86444719,ES
-86444720,86444799,FR
-86444800,86444815,PL
-86444816,86444835,FR
+86444692,86444835,FR
 86444836,86444839,NL
 86444840,86444843,ES
-86444844,86444875,FR
-86444876,86444879,CH
+86444844,86444879,FR
 86444880,86444883,NL
 86444884,86444895,FR
 86444896,86444903,NL
-86444904,86444959,FR
-86444960,86444967,GB
-86444968,86445059,FR
+86444904,86445059,FR
 86445060,86445063,NL
-86445064,86445071,FR
-86445072,86445087,PL
-86445088,86445111,FR
+86445064,86445111,FR
 86445112,86445115,NL
-86445116,86445119,FR
-86445120,86445151,ES
-86445152,86445215,FR
-86445216,86445231,CH
-86445232,86445235,IT
-86445236,86445251,FR
+86445116,86445251,FR
 86445252,86445255,NL
-86445256,86445291,FR
-86445292,86445295,DE
-86445296,86445343,FR
-86445344,86445351,FI
-86445352,86445423,FR
-86445424,86445431,GB
-86445432,86445519,FR
-86445520,86445527,ES
-86445528,86445559,FR
+86445256,86445559,FR
 86445560,86445563,NL
-86445564,86445711,FR
-86445712,86445727,PL
-86445728,86445743,FR
-86445744,86445759,DE
-86445760,86445891,FR
-86445892,86445895,ES
-86445896,86445939,FR
-86445940,86445943,NL
-86445944,86445983,FR
-86445984,86445999,IT
-86446000,86446027,FR
-86446028,86446031,IT
-86446032,86446039,FR
-86446040,86446043,IE
-86446044,86446063,FR
-86446064,86446079,IT
-86446080,86446143,FR
-86446144,86446175,NL
-86446176,86446335,FR
-86446336,86446367,IE
-86446368,86446399,GB
-86446400,86446407,FR
+86445564,86446407,FR
 86446408,86446408,DE
 86446409,86446411,FR
 86446412,86446412,DE
 86446413,86446427,FR
 86446428,86446431,DE
-86446432,86446463,FR
-86446464,86446495,ES
-86446496,86446527,CH
-86446528,86446551,FR
-86446552,86446555,NL
-86446556,86446611,FR
-86446612,86446615,ES
-86446616,86446619,FR
+86446432,86446619,FR
 86446620,86446620,DE
 86446621,86446655,FR
-86446656,86446671,GB
-86446672,86446675,FR
-86446676,86446679,BE
+86446656,86446663,ES
+86446664,86446679,FR
 86446680,86446683,ES
-86446684,86446711,FR
-86446712,86446719,DE
+86446684,86446719,FR
 86446720,86446727,NL
-86446728,86446735,FR
-86446736,86446743,ES
-86446744,86446779,FR
-86446780,86446783,PL
-86446784,86446887,FR
-86446888,86446895,IT
-86446896,86446983,FR
+86446728,86446983,FR
 86446984,86446991,IT
-86446992,86447011,FR
-86447012,86447015,ES
-86447016,86447023,FR
-86447024,86447027,IE
-86447028,86447031,FR
-86447032,86447039,ES
-86447040,86447047,PT
-86447048,86447071,FR
+86446992,86447071,FR
 86447072,86447087,DE
 86447088,86447095,FR
 86447096,86447103,ES
-86447104,86447147,FR
-86447148,86447151,ES
-86447152,86447231,FR
-86447232,86447239,PL
-86447240,86447255,FR
+86447104,86447255,FR
 86447256,86447263,PL
-86447264,86447267,FR
-86447268,86447271,IE
-86447272,86447279,FR
+86447264,86447279,FR
 86447280,86447280,DE
 86447281,86447287,FR
 86447288,86447288,DE
-86447289,86447339,FR
-86447340,86447343,IT
-86447344,86447355,FR
-86447356,86447359,CH
-86447360,86447847,FR
-86447848,86447855,ES
-86447856,86448287,FR
-86448288,86448319,GB
-86448320,86448351,ES
-86448352,86448487,FR
-86448488,86448495,GB
-86448496,86448511,FR
-86448512,86448527,IT
-86448528,86448671,FR
-86448672,86448687,DE
-86448688,86448803,FR
+86447289,86448559,FR
+86448560,86448575,GB
+86448576,86448803,FR
 86448804,86448807,FI
 86448808,86448851,FR
 86448852,86448855,IT
 86448856,86448859,PT
-86448860,86449167,FR
-86449168,86449183,ES
-86449184,86449291,FR
-86449292,86449295,PL
-86449296,86449311,FR
+86448860,86449311,FR
 86449312,86449343,ES
 86449344,86449363,FR
 86449364,86449367,DE
-86449368,86449375,FR
-86449376,86449379,PL
-86449380,86449383,FR
-86449384,86449387,DE
-86449388,86449471,FR
-86449472,86449475,GB
-86449476,86449499,FR
+86449368,86449499,FR
 86449500,86449503,ES
-86449504,86449563,FR
-86449564,86449567,PL
-86449568,86449599,FR
-86449600,86449631,ES
-86449632,86449867,FR
-86449868,86449871,DE
-86449872,86449883,FR
+86449504,86449883,FR
 86449884,86449884,DE
-86449885,86450019,FR
-86450020,86450023,IT
-86450024,86450047,FR
-86450048,86450079,IT
-86450080,86450111,FR
-86450112,86450115,IT
-86450116,86450119,FR
-86450120,86450127,IT
-86450128,86450143,FR
-86450144,86450159,ES
-86450160,86450167,FR
-86450168,86450171,DE
-86450172,86450235,FR
+86449885,86450235,FR
 86450236,86450239,GB
-86450240,86450339,FR
-86450340,86450343,NL
-86450344,86450351,DE
-86450352,86450371,FR
-86450372,86450375,BE
-86450376,86450439,FR
-86450440,86450447,ES
-86450448,86450527,FR
-86450528,86450559,PT
-86450560,86450591,BE
-86450592,86450607,FR
-86450608,86450615,CZ
-86450616,86450671,FR
-86450672,86450687,GB
-86450688,86450847,FR
-86450848,86450863,PT
-86450864,86450867,FR
-86450868,86450871,ES
-86450872,86450943,FR
-86450944,86450975,IT
-86450976,86451167,FR
+86450240,86451167,FR
 86451168,86451175,NL
-86451176,86451183,PL
-86451184,86451199,ES
-86451200,86451259,FR
-86451260,86451263,IT
-86451264,86451359,FR
-86451360,86451363,ES
-86451364,86451375,FR
-86451376,86451391,LT
-86451392,86451407,IT
-86451408,86451411,IE
-86451412,86451463,FR
-86451464,86451467,CH
-86451468,86451663,FR
-86451664,86451667,DE
-86451668,86451675,FR
-86451676,86451687,PL
-86451688,86451695,DE
-86451696,86451887,FR
-86451888,86451895,ES
-86451896,86451903,FR
-86451904,86451967,NL
-86451968,86452055,FR
-86452056,86452059,NL
-86452060,86452067,FR
+86451176,86452067,FR
 86452068,86452071,ES
-86452072,86452215,FR
-86452216,86452223,IT
-86452224,86452263,FR
-86452264,86452267,ES
-86452268,86452279,FR
-86452280,86452283,ES
-86452284,86452287,DE
-86452288,86452291,IT
-86452292,86452299,FR
+86452072,86452299,FR
 86452300,86452303,IT
-86452304,86452399,FR
-86452400,86452415,GB
-86452416,86452671,FR
+86452304,86452671,FR
 86452672,86452735,GB
-86452736,86452943,FR
-86452944,86452959,GB
-86452960,86453031,FR
-86453032,86453039,ES
-86453040,86453135,FR
-86453136,86453151,PT
-86453152,86453199,FR
+86452736,86453199,FR
 86453200,86453203,ES
-86453204,86453215,FR
-86453216,86453231,BE
-86453232,86453247,FR
-86453248,86453251,IT
-86453252,86453311,FR
+86453204,86453311,FR
 86453312,86453315,ES
-86453316,86453379,FR
-86453380,86453383,ES
-86453384,86453391,FR
-86453392,86453399,GB
-86453400,86453503,FR
-86453504,86453631,GB
-86453632,86453791,FR
-86453792,86453807,FI
-86453808,86453823,FR
-86453824,86453836,IT
+86453316,86453836,FR
 86453837,86453838,PT
-86453839,86453839,IT
-86453840,86453847,FR
-86453848,86453851,ES
-86453852,86454015,FR
-86454016,86454047,PL
-86454048,86454119,FR
-86454120,86454123,DE
-86454124,86454187,FR
+86453839,86454187,FR
 86454188,86454191,IT
-86454192,86454271,FR
-86454272,86454279,GB
+86454192,86454279,FR
 86454280,86454287,ES
 86454288,86454295,IT
-86454296,86454299,FR
-86454300,86454303,DE
-86454304,86454335,FR
+86454296,86454335,FR
 86454336,86454343,DE
-86454344,86454351,FR
-86454352,86454367,CH
-86454368,86454559,FR
-86454560,86454591,CZ
-86454592,86454607,PT
-86454608,86454611,NL
-86454612,86454615,PL
+86454344,86454615,FR
 86454616,86454619,ES
-86454620,86454655,FR
-86454656,86454671,IT
-86454672,86454703,FR
-86454704,86454707,PL
-86454708,86454715,FR
-86454716,86454719,CZ
-86454720,86454823,FR
+86454620,86454823,FR
 86454824,86454831,ES
-86454832,86454863,FR
-86454864,86454867,DE
-86454868,86454927,FR
-86454928,86454943,GB
-86454944,86454959,ES
-86454960,86455103,FR
-86455104,86455135,DE
-86455136,86455167,FR
-86455168,86455199,GB
-86455200,86455231,ES
-86455232,86455263,GB
-86455264,86455439,FR
-86455440,86455455,CH
-86455456,86455519,FR
-86455520,86455551,BE
-86455552,86455623,FR
+86454832,86455591,FR
+86455592,86455595,NL
+86455596,86455623,FR
 86455624,86455624,DE
-86455625,86455839,FR
-86455840,86455871,DE
-86455872,86455967,FR
-86455968,86455999,PL
-86456000,86456015,FI
-86456016,86456087,FR
-86456088,86456091,CZ
-86456092,86456127,FR
-86456128,86456143,GB
-86456144,86456159,FR
-86456160,86456191,NL
-86456192,86456195,FR
-86456196,86456215,DE
-86456216,86456279,FR
-86456280,86456283,DE
-86456284,86456335,FR
-86456336,86456351,IE
+86455625,86456195,FR
+86456196,86456211,DE
+86456212,86456351,FR
 86456352,86456367,CH
 86456368,86456371,FR
 86456372,86456375,ES
-86456376,86456575,FR
-86456576,86456831,DE
-86456832,86457055,FR
-86457056,86457059,NL
+86456376,86457059,FR
 86457060,86457060,DE
 86457061,86457087,FR
 86457088,86457091,DE
 86457092,86457111,FR
 86457112,86457112,DE
-86457113,86457175,FR
-86457176,86457179,GB
-86457180,86457187,FR
+86457113,86457187,FR
 86457188,86457191,ES
-86457192,86457231,FR
-86457232,86457235,PT
-86457236,86457239,PL
-86457240,86457243,DE
-86457244,86457311,FR
-86457312,86457327,CH
-86457328,86457391,FR
-86457392,86457395,BE
-86457396,86457403,FR
+86457192,86457403,FR
 86457404,86457407,ES
 86457408,86457455,FR
 86457456,86457456,DE
-86457457,86457615,FR
-86457616,86457623,IE
-86457624,86457631,FR
-86457632,86457647,ES
-86457648,86457711,FR
-86457712,86457727,ES
-86457728,86457799,FR
+86457457,86457799,FR
 86457800,86457803,ES
-86457804,86457807,FR
-86457808,86457811,ES
-86457812,86458159,FR
-86458160,86458175,DE
-86458176,86466603,FR
-86466604,86466607,ES
-86466608,86466623,FR
-86466624,86466639,ES
-86466640,86466839,FR
+86457804,86466839,FR
 86466840,86466847,NL
-86466848,86466879,FR
-86466880,86466943,GB
+86466848,86466943,FR
 86466944,86466959,DE
-86466960,86467039,FR
-86467040,86467055,IT
-86467056,86467059,GB
-86467060,86467219,FR
-86467220,86467223,DE
-86467224,86467291,FR
-86467292,86467295,LT
-86467296,86467320,FR
+86466960,86467320,FR
 86467321,86467321,FI
-86467322,86467455,FR
-86467456,86467487,GB
-86467488,86467551,FR
+86467322,86467551,FR
 86467552,86467583,PT
-86467584,86467903,FR
-86467904,86467935,GB
-86467936,86467999,FR
+86467584,86467999,FR
 86468000,86468003,PL
-86468004,86468043,FR
-86468044,86468047,DE
-86468048,86468055,FR
+86468004,86468055,FR
 86468056,86468056,DE
 86468057,86468447,FR
 86468448,86468479,CZ
 86468480,86468587,FR
 86468588,86468591,ES
-86468592,86468759,FR
-86468760,86468763,IT
-86468764,86469183,FR
+86468592,86469183,FR
 86469184,86469247,GB
-86469248,86469375,FR
-86469376,86469631,BE
-86469632,86469691,FR
+86469248,86469691,FR
 86469692,86469695,DE
 86469696,86469779,FR
 86469780,86469783,IT
-86469784,86469863,FR
-86469864,86469867,GB
-86469868,86469919,FR
-86469920,86469935,PT
-86469936,86470207,FR
-86470208,86470239,FI
-86470240,86470271,GB
-86470272,86470279,FR
-86470280,86470287,PL
-86470288,86470351,FR
-86470352,86470359,IT
-86470360,86470731,FR
+86469784,86470731,FR
 86470732,86470735,BE
-86470736,86470959,FR
-86470960,86470967,IT
-86470968,86471095,FR
-86471096,86471099,ES
-86471100,86471179,FR
+86470736,86471179,FR
 86471180,86471180,DE
-86471181,86471807,FR
-86471808,86471839,CH
-86471840,86471871,GB
-86471872,86471935,ES
-86471936,86471995,FR
-86471996,86471999,DE
-86472000,86472095,FR
-86472096,86472127,GB
-86472128,86472291,FR
-86472292,86472295,GB
-86472296,86472415,FR
-86472416,86472431,ES
-86472432,86472479,FR
-86472480,86472495,PL
-86472496,86473087,FR
+86471181,86473087,FR
 86473088,86473151,PT
-86473152,86473215,FR
-86473216,86473247,DE
-86473248,86473359,FR
+86473152,86473359,FR
 86473360,86473363,IT
 86473364,86473423,FR
 86473424,86473427,NL
-86473428,86473983,FR
-86473984,86474047,IT
-86474048,86474143,FR
-86474144,86474151,GB
-86474152,86474303,FR
-86474304,86474311,DE
+86473428,86474307,FR
+86474308,86474311,DE
 86474312,86474475,FR
 86474476,86474479,DE
 86474480,86474527,FR
 86474528,86474531,DE
-86474532,86474751,FR
+86474532,86474743,FR
+86474744,86474747,LT
+86474748,86474751,FR
 86474752,86482943,HR
 86482944,86484991,RU
 86484992,86487039,NL
@@ -940,7 +589,7 @@
 86503424,86505471,DE
 86505472,86507519,GB
 86507520,86573055,ES
-86573056,86638591,RO
+86573056,86638591,SA
 86638592,86671359,RU
 86671360,86672895,JE
 86672896,86673151,GB
@@ -1016,8 +665,7 @@
 87425024,87556095,GR
 87556096,87558143,ES
 87558144,87560191,IT
-87560192,87562111,DE
-87562112,87562239,A1
+87560192,87562239,DE
 87562240,87564287,UA
 87564288,87566335,HU
 87566336,87568383,FR
@@ -1035,7 +683,9 @@
 87601152,87621631,DE
 87621632,87623679,LB
 87623680,87625727,KG
-87625728,87627775,NL
+87625728,87626880,NL
+87626881,87626881,GB
+87626882,87627775,NL
 87627776,87629823,ES
 87629824,87631871,IR
 87631872,87633919,DE
@@ -1087,9 +737,12 @@
 87943168,87945215,RU
 87945216,87947263,HU
 87947264,87949311,NL
-87949312,87949567,A1
-87949568,87950079,GB
-87950080,87965695,A1
+87949312,87950847,GB
+87950848,87952383,A1
+87952384,87954687,GB
+87954688,87955455,A1
+87955456,87957503,GB
+87957504,87965695,A1
 87965696,87967743,DE
 87967744,87969791,IT
 87969792,87973887,IM
@@ -1118,7 +771,7 @@
 88940544,88948735,GB
 88948736,88965119,IT
 88965120,88997887,AM
-88997888,89063423,DE
+88997888,89063423,IR
 89063424,89079807,GB
 89079808,89096191,NL
 89096192,89128959,RU
@@ -1148,7 +801,7 @@
 90476544,90478591,FR
 90478592,90480639,VG
 90480640,90482687,YE
-90482688,90484735,SA
+90482688,90484735,GB
 90484736,90488831,NO
 90488832,90497023,BY
 90497024,90499071,NL
@@ -1181,7 +834,7 @@
 90613760,90614271,GB
 90614272,90614783,A1
 90614784,90615807,GB
-90615808,90617855,SI
+90615808,90617855,BA
 90617856,90619903,GB
 90619904,90636287,IL
 90636288,90701823,DK
@@ -1203,7 +856,8 @@
 90734592,90736639,SY
 90736640,90738687,NL
 90738688,90740735,DE
-90740736,90742783,NL
+90740736,90742527,NL
+90742528,90742783,RO
 90742784,90750975,BG
 90750976,90753023,FR
 90753024,90755071,RU
@@ -1221,7 +875,8 @@
 90963968,91226111,SA
 91226112,92274687,IR
 92274688,92536831,RU
-92536832,92602367,NL
+92536832,92585983,NL
+92585984,92602367,SA
 92602368,92604415,BA
 92604416,92606463,PL
 92606464,92608511,GB
@@ -1255,50 +910,17 @@
 92721152,92723199,PL
 92723200,92725247,RU
 92725248,92733439,SY
-92733440,92733503,FR
-92733504,92733535,PL
-92733536,92733743,FR
-92733744,92733751,IT
-92733752,92733775,FR
-92733776,92733783,DE
-92733784,92733791,FR
-92733792,92733807,PT
-92733808,92733927,FR
-92733928,92733931,BE
-92733932,92734255,FR
-92734256,92734271,DE
-92734272,92734307,FR
-92734308,92734311,ES
-92734312,92734515,FR
+92733440,92734515,FR
 92734516,92734519,IT
-92734520,92734639,FR
-92734640,92734655,ES
-92734656,92734671,FR
-92734672,92734687,IT
-92734688,92734735,FR
+92734520,92734735,FR
 92734736,92734739,DE
-92734740,92734879,FR
-92734880,92734895,IT
-92734896,92734943,FR
-92734944,92734975,BE
-92734976,92735263,FR
-92735264,92735295,CZ
-92735296,92735343,FR
-92735344,92735347,GB
-92735348,92735439,FR
-92735440,92735455,ES
-92735456,92735471,FR
-92735472,92735479,IT
-92735480,92735535,FR
-92735536,92735543,PL
-92735544,92735583,FR
-92735584,92735615,FI
+92734740,92735103,FR
+92735104,92735119,GB
+92735120,92735615,FR
 92735616,92735616,DE
 92735617,92735619,FR
 92735620,92735623,ES
-92735624,92735679,FR
-92735680,92735711,NL
-92735712,92735823,FR
+92735624,92735823,FR
 92735824,92735827,ES
 92735828,92735875,FR
 92735876,92735876,DE
@@ -1308,630 +930,116 @@
 92736480,92736480,DE
 92736481,92736571,FR
 92736572,92736575,NL
-92736576,92736863,FR
-92736864,92736895,PL
-92736896,92737247,FR
-92737248,92737279,NL
-92737280,92737343,FR
-92737344,92737375,ES
-92737376,92737407,FR
-92737408,92737439,CH
-92737440,92737471,FR
-92737472,92737503,ES
-92737504,92737631,FR
-92737632,92737647,NL
-92737648,92738479,FR
-92738480,92738487,IT
-92738488,92738511,FR
-92738512,92738515,ES
-92738516,92738559,FR
-92738560,92738591,DE
-92738592,92738611,FR
-92738612,92738615,FI
-92738616,92738663,FR
+92736576,92737751,FR
+92737752,92737759,NL
+92737760,92738271,FR
+92738272,92738303,NL
+92738304,92738663,FR
 92738664,92738679,ES
-92738680,92739355,FR
-92739356,92739359,ES
-92739360,92739503,FR
-92739504,92739507,IT
-92739508,92739839,FR
-92739840,92739903,PT
-92739904,92739967,FR
-92739968,92740031,PL
-92740032,92740095,FR
-92740096,92740127,PL
-92740128,92740287,FR
-92740288,92740351,IE
-92740352,92740447,FR
+92738680,92739199,FR
+92739200,92739215,DE
+92739216,92740447,FR
 92740448,92740455,IT
-92740456,92740639,FR
-92740640,92740671,CZ
-92740672,92740767,FR
-92740768,92740815,PL
-92740816,92740831,FR
-92740832,92740847,ES
-92740848,92741203,FR
+92740456,92741203,FR
 92741204,92741207,IT
-92741208,92741343,FR
-92741344,92741351,IT
-92741352,92741387,FR
+92741208,92741387,FR
 92741388,92741395,IT
-92741396,92741431,FR
-92741432,92741439,IE
-92741440,92741471,FR
-92741472,92741503,CZ
-92741504,92741791,FR
-92741792,92741823,IT
-92741824,92742207,FR
-92742208,92742247,GB
-92742248,92742347,FR
+92741396,92742347,FR
 92742348,92742351,IT
-92742352,92742367,FR
-92742368,92742399,GB
-92742400,92742415,BE
+92742352,92742415,FR
 92742416,92742419,IT
-92742420,92742431,FR
-92742432,92742463,PT
-92742464,92742487,FR
+92742420,92742487,FR
 92742488,92742491,IT
-92742492,92742527,FR
-92742528,92742543,IT
-92742544,92742687,FR
-92742688,92742691,IE
+92742492,92742639,FR
+92742640,92742643,ES
+92742644,92742691,FR
 92742692,92742695,IT
-92742696,92742703,ES
-92742704,92742815,FR
+92742696,92742815,FR
 92742816,92742819,ES
-92742820,92743215,FR
-92743216,92743231,BE
-92743232,92743243,FR
+92742820,92743047,FR
+92743048,92743055,NL
+92743056,92743243,FR
 92743244,92743247,IT
-92743248,92743263,FR
-92743264,92743279,GB
-92743280,92743295,ES
+92743248,92743295,FR
 92743296,92743307,IT
 92743308,92743311,FR
 92743312,92743315,IT
 92743316,92743355,FR
 92743356,92743359,IT
-92743360,92743503,FR
-92743504,92743519,IT
-92743520,92743535,FR
-92743536,92743551,ES
-92743552,92743611,FR
+92743360,92743611,FR
 92743612,92743615,IT
-92743616,92743631,FR
-92743632,92743639,IT
-92743640,92743643,ES
-92743644,92743663,FR
-92743664,92743671,IT
-92743672,92743955,FR
+92743616,92743955,FR
 92743956,92743959,IT
-92743960,92744111,FR
-92744112,92744119,PL
-92744120,92744123,FR
-92744124,92744127,GB
-92744128,92744159,IT
-92744160,92744175,FR
-92744176,92744191,DE
-92744192,92744223,FR
-92744224,92744227,DE
-92744228,92744243,FR
+92743960,92744243,FR
 92744244,92744247,NL
 92744248,92744263,FR
 92744264,92744267,NL
 92744268,92744283,FR
 92744284,92744291,NL
-92744292,92744295,ES
-92744296,92744351,FR
-92744352,92744367,BE
-92744368,92744479,FR
-92744480,92744511,GB
-92744512,92744543,FR
-92744544,92744547,BE
-92744548,92744551,FR
-92744552,92744555,ES
+92744292,92744555,FR
 92744556,92744559,IT
-92744560,92744719,FR
-92744720,92744735,BE
-92744736,92744743,GB
-92744744,92744767,FR
-92744768,92744799,NL
-92744800,92744895,FR
-92744896,92744927,IT
-92744928,92744935,CZ
-92744936,92744943,CH
-92744944,92744959,FR
-92744960,92744975,PL
-92744976,92745071,FR
-92745072,92745087,ES
-92745088,92745375,FR
-92745376,92745391,IT
-92745392,92745399,FR
-92745400,92745407,ES
-92745408,92745439,IE
-92745440,92745471,NL
-92745472,92745503,FR
-92745504,92745535,DE
-92745536,92745663,FR
-92745664,92745695,IT
-92745696,92745807,FR
-92745808,92745823,NL
-92745824,92745871,FR
-92745872,92745887,IT
-92745888,92746303,FR
-92746304,92746335,GB
-92746336,92746383,FR
-92746384,92746399,CZ
-92746400,92746415,FR
+92744560,92744575,NL
+92744576,92746415,FR
 92746416,92746431,ES
-92746432,92746559,FR
-92746560,92746623,GB
-92746624,92746639,BE
-92746640,92747199,FR
-92747200,92747231,GB
-92747232,92747255,FR
-92747256,92747263,PL
-92747264,92747267,NL
-92747268,92747327,FR
-92747328,92747335,BE
-92747336,92747343,FR
-92747344,92747347,ES
-92747348,92747539,FR
-92747540,92747543,CH
-92747544,92747547,FR
-92747548,92747551,ES
-92747552,92747567,FR
-92747568,92747583,BE
-92747584,92747687,FR
-92747688,92747691,NL
-92747692,92747699,FR
-92747700,92747703,FI
-92747704,92747711,FR
+92746432,92747711,FR
 92747712,92747775,GB
-92747776,92748303,FR
-92748304,92748319,CH
-92748320,92748511,FR
-92748512,92748543,IE
-92748544,92748773,FR
+92747776,92748773,FR
 92748774,92748774,PT
-92748775,92748847,FR
-92748848,92748851,BE
-92748852,92748863,FR
-92748864,92748879,ES
-92748880,92749067,FR
+92748775,92749067,FR
 92749068,92749071,GB
-92749072,92749183,FR
-92749184,92749215,IT
-92749216,92749439,FR
-92749440,92749471,DE
-92749472,92749531,FR
-92749532,92749535,ES
-92749536,92749747,FR
+92749072,92749747,FR
 92749748,92749751,ES
-92749752,92750255,FR
-92750256,92750271,PL
-92750272,92750603,FR
-92750604,92750607,LT
-92750608,92750655,FR
-92750656,92750719,GB
-92750720,92750751,FR
-92750752,92750783,ES
-92750784,92750815,GB
-92750816,92750839,FR
-92750840,92750843,PL
-92750844,92750879,FR
-92750880,92750887,CZ
-92750888,92750975,FR
-92750976,92751039,PT
-92751040,92751071,FR
-92751072,92751103,GB
-92751104,92751679,FR
-92751680,92751711,IT
+92749752,92751711,FR
 92751712,92751712,DE
-92751713,92752127,FR
-92752128,92752143,IT
-92752144,92752359,FR
-92752360,92752363,NL
-92752364,92752431,FR
-92752432,92752447,GB
-92752448,92752543,FR
-92752544,92752575,DE
-92752576,92752591,NL
-92752592,92752607,FR
-92752608,92752611,IT
-92752612,92752687,FR
-92752688,92752703,ES
-92752704,92752735,FR
-92752736,92752751,ES
-92752752,92752767,IT
-92752768,92752831,FR
-92752832,92752847,IT
-92752848,92752863,FR
-92752864,92752895,IT
-92752896,92753079,FR
+92751713,92753079,FR
 92753080,92753087,ES
-92753088,92753095,IT
-92753096,92753183,FR
-92753184,92753215,GB
-92753216,92753279,FR
-92753280,92753311,CH
-92753312,92753343,BE
-92753344,92753547,FR
+92753088,92753547,FR
 92753548,92753551,IT
-92753552,92753567,FR
-92753568,92753599,BE
-92753600,92753823,FR
-92753824,92753855,DE
-92753856,92754095,FR
-92754096,92754111,GB
-92754112,92754447,FR
-92754448,92754463,GB
-92754464,92754479,FR
-92754480,92754503,ES
-92754504,92754527,FR
-92754528,92754543,PT
-92754544,92754579,FR
+92753552,92754579,FR
 92754580,92754583,ES
-92754584,92754623,FR
-92754624,92754639,PL
-92754640,92754655,FR
-92754656,92754671,IT
-92754672,92755199,FR
-92755200,92755231,NL
-92755232,92755279,FR
-92755280,92755287,DE
-92755288,92755335,FR
-92755336,92755343,ES
-92755344,92755375,FR
-92755376,92755423,GB
-92755424,92755455,FR
-92755456,92755487,CH
-92755488,92755583,FR
-92755584,92755615,CZ
-92755616,92755871,FR
-92755872,92755887,GB
-92755888,92755903,ES
-92755904,92756095,FR
-92756096,92756127,DE
-92756128,92756175,FR
-92756176,92756191,PL
-92756192,92756479,FR
-92756480,92756495,GB
-92756496,92757199,FR
-92757200,92757215,GB
-92757216,92757311,FR
+92754584,92757311,FR
 92757312,92757375,ES
-92757376,92758127,FR
-92758128,92758143,GB
-92758144,92758223,FR
-92758224,92758239,CH
-92758240,92758271,FR
-92758272,92758287,ES
-92758288,92758399,FR
-92758400,92758415,PL
-92758416,92758655,FR
-92758656,92758687,DE
-92758688,92758799,FR
-92758800,92758803,DE
-92758804,92758807,ES
-92758808,92758811,FR
-92758812,92758815,DE
-92758816,92758863,FR
-92758864,92758879,PL
-92758880,92759031,FR
-92759032,92759039,GB
-92759040,92759119,FR
-92759120,92759135,NL
-92759136,92759167,FR
-92759168,92759183,GB
-92759184,92760495,FR
-92760496,92760511,ES
-92760512,92760559,FR
-92760560,92760575,ES
-92760576,92760715,FR
-92760716,92760719,ES
-92760720,92761215,FR
+92757376,92761215,FR
 92761216,92761343,DE
-92761344,92761759,FR
-92761760,92761763,IT
-92761764,92761939,FR
-92761940,92761943,GB
-92761944,92762127,FR
+92761344,92762127,FR
 92762128,92762135,ES
-92762136,92762319,FR
-92762320,92762335,DE
-92762336,92762383,FR
+92762136,92762383,FR
 92762384,92762391,ES
-92762392,92762655,FR
-92762656,92762687,IT
-92762688,92762839,FR
-92762840,92762847,ES
-92762848,92762879,FR
-92762880,92762911,CH
-92762912,92763311,FR
-92763312,92763327,DE
-92763328,92763331,FR
-92763332,92763339,ES
-92763340,92763391,FR
-92763392,92763519,IE
-92763520,92763647,FR
-92763648,92763679,FI
-92763680,92763711,ES
-92763712,92763775,NL
-92763776,92763839,FR
-92763840,92763903,NL
-92763904,92764287,FR
-92764288,92764303,IE
-92764304,92764431,FR
-92764432,92764447,PL
-92764448,92764463,FR
-92764464,92764479,GB
-92764480,92764511,FR
-92764512,92764543,DE
-92764544,92764595,FR
-92764596,92764599,ES
-92764600,92764799,FR
-92764800,92764807,DE
-92764808,92764863,FR
-92764864,92764911,GB
-92764912,92765295,FR
-92765296,92765311,IT
-92765312,92765351,FR
-92765352,92765359,BE
-92765360,92765391,FR
-92765392,92765395,IT
-92765396,92766015,FR
-92766016,92766047,NL
-92766048,92766079,FR
-92766080,92766143,PT
-92766144,92782687,FR
+92762392,92764223,FR
+92764224,92764287,ES
+92764288,92782687,FR
 92782688,92782719,ES
-92782720,92782731,FR
-92782732,92782735,ES
-92782736,92782811,FR
-92782812,92782815,CH
-92782816,92782847,FR
-92782848,92782879,NL
-92782880,92782943,FR
-92782944,92782975,IT
-92782976,92783291,FR
+92782720,92783291,FR
 92783292,92783295,DE
 92783296,92783543,FR
 92783544,92783547,ES
-92783548,92783715,FR
-92783716,92783719,NL
-92783720,92783723,IT
-92783724,92783727,FR
-92783728,92783731,ES
-92783732,92783735,IT
-92783736,92783911,FR
-92783912,92783919,PT
-92783920,92783999,FR
-92784000,92784031,IT
-92784032,92784159,FR
-92784160,92784191,CH
-92784192,92784223,FR
-92784224,92784239,PL
-92784240,92784255,FR
+92783548,92784159,FR
+92784160,92784191,IT
+92784192,92784239,FR
+92784240,92784243,DE
+92784244,92784255,FR
 92784256,92784263,NL
-92784264,92784291,FR
-92784292,92784295,PL
-92784296,92784299,FR
-92784300,92784303,DE
-92784304,92784467,FR
-92784468,92784471,NL
-92784472,92784479,FR
-92784480,92784511,ES
-92784512,92784639,GB
-92784640,92784671,FR
-92784672,92784703,GB
-92784704,92784807,FR
-92784808,92784815,LT
-92784816,92785363,FR
+92784264,92785363,FR
 92785364,92785367,PT
-92785368,92785407,FR
-92785408,92785439,CH
-92785440,92785599,FR
-92785600,92785607,GB
-92785608,92785615,FR
-92785616,92785631,IT
-92785632,92785663,FR
-92785664,92785679,BE
-92785680,92785687,ES
-92785688,92785695,DE
-92785696,92785791,FR
-92785792,92785823,IT
-92785824,92785871,FR
-92785872,92785887,IT
-92785888,92786183,FR
-92786184,92786187,ES
-92786188,92786191,PT
-92786192,92786199,FR
-92786200,92786207,BE
-92786208,92786239,FR
-92786240,92786255,FI
-92786256,92786311,FR
-92786312,92786319,CZ
-92786320,92786631,FR
-92786632,92786639,BE
-92786640,92786743,FR
-92786744,92786751,DE
-92786752,92786827,FR
+92785368,92785735,FR
+92785736,92785739,DE
+92785740,92786827,FR
 92786828,92786831,IT
-92786832,92786855,FR
-92786856,92786859,PL
-92786860,92786879,FR
-92786880,92786911,DE
-92786912,92786927,GB
-92786928,92786943,ES
-92786944,92786975,FR
-92786976,92786979,GB
-92786980,92786991,FR
-92786992,92786999,IT
-92787000,92787111,FR
-92787112,92787119,IT
-92787120,92787391,FR
-92787392,92787407,BE
-92787408,92787423,FR
-92787424,92787503,ES
-92787504,92787639,FR
-92787640,92787647,DE
-92787648,92787967,FR
-92787968,92788031,ES
-92788032,92788095,FR
-92788096,92788127,PL
-92788128,92788171,FR
-92788172,92788175,ES
-92788176,92788255,FR
-92788256,92788259,PT
-92788260,92788263,FR
-92788264,92788271,GB
-92788272,92788383,FR
-92788384,92788415,CZ
-92788416,92788479,FR
-92788480,92788511,IE
-92788512,92788607,FR
-92788608,92788639,NL
-92788640,92788687,FR
-92788688,92788703,ES
-92788704,92788735,BE
-92788736,92788967,FR
-92788968,92788975,DE
-92788976,92789055,FR
-92789056,92789071,ES
-92789072,92789079,FR
-92789080,92789083,IT
-92789084,92789223,FR
-92789224,92789231,NL
-92789232,92789335,FR
-92789336,92789339,CH
-92789340,92789343,CZ
-92789344,92789383,FR
-92789384,92789387,NL
-92789388,92789391,FR
-92789392,92789395,IT
-92789396,92789399,DE
-92789400,92789423,FR
-92789424,92789427,ES
-92789428,92789475,FR
-92789476,92789479,IT
-92789480,92789499,FR
+92786832,92789499,FR
 92789500,92789503,IT
-92789504,92789743,FR
-92789744,92789759,PL
-92789760,92789919,FR
-92789920,92789951,PL
-92789952,92790239,FR
-92790240,92790271,IE
-92790272,92790283,FR
-92790284,92790287,PL
-92790288,92790367,FR
-92790368,92790371,PT
-92790372,92790463,FR
-92790464,92790495,GB
-92790496,92790511,FR
-92790512,92790527,GB
-92790528,92790575,FR
-92790576,92790591,PT
-92790592,92790703,FR
-92790704,92790719,IT
-92790720,92790799,FR
-92790800,92790803,BE
-92790804,92790815,FR
-92790816,92790847,LT
-92790848,92790863,FI
-92790864,92790959,FR
-92790960,92790975,DE
-92790976,92791039,FR
-92791040,92791167,ES
-92791168,92791183,BE
-92791184,92791215,FR
-92791216,92791223,IT
-92791224,92791231,ES
-92791232,92791263,FR
-92791264,92791279,FI
-92791280,92791283,FR
-92791284,92791295,DE
-92791296,92791327,ES
-92791328,92791359,FR
-92791360,92791391,ES
-92791392,92791423,FR
-92791424,92791455,GB
-92791456,92791487,BE
-92791488,92792319,FR
-92792320,92792383,ES
-92792384,92792415,FR
+92789504,92790271,FR
+92790272,92790275,DE
+92790276,92792107,FR
+92792108,92792111,IT
+92792112,92792119,FR
+92792120,92792127,NL
+92792128,92792415,FR
 92792416,92792431,ES
-92792432,92792511,FR
-92792512,92792575,PT
-92792576,92792703,FR
-92792704,92792767,PL
-92792768,92792799,FR
-92792800,92792831,PT
-92792832,92792959,GB
-92792960,92793023,FR
-92793024,92793055,GB
+92792432,92793055,FR
 92793056,92793087,ES
-92793088,92793215,FR
-92793216,92793247,IT
-92793248,92793263,FR
-92793264,92793279,ES
-92793280,92793887,FR
-92793888,92793919,IT
-92793920,92794143,FR
-92794144,92794159,DE
-92794160,92794175,FR
-92794176,92794207,NL
-92794208,92794367,FR
-92794368,92794399,GB
-92794400,92794503,FR
-92794504,92794511,ES
-92794512,92794879,FR
-92794880,92794895,ES
-92794896,92794943,FR
-92794944,92794975,BE
-92794976,92795103,FR
-92795104,92795111,ES
-92795112,92795123,FR
+92793088,92795123,FR
 92795124,92795127,IT
-92795128,92795171,FR
-92795172,92795175,BE
-92795176,92795179,PL
-92795180,92795619,FR
-92795620,92795623,PL
-92795624,92796463,FR
-92796464,92796479,CZ
-92796480,92796511,FR
-92796512,92796543,DE
-92796544,92796583,FR
-92796584,92796587,PL
-92796588,92796671,FR
-92796672,92796687,GB
-92796688,92796695,FR
-92796696,92796703,BE
-92796704,92796711,PL
-92796712,92796727,FR
-92796728,92796735,IT
-92796736,92797567,FR
-92797568,92797759,PT
-92797760,92797903,FR
-92797904,92797911,NL
-92797912,92797983,FR
-92797984,92797987,GB
-92797988,92798015,FR
-92798016,92798047,ES
-92798048,92798175,FR
-92798176,92798191,IT
-92798192,92798223,FR
-92798224,92798231,CZ
-92798232,92798255,FR
-92798256,92798271,PL
-92798272,92798431,FR
-92798432,92798439,PL
-92798440,92798591,FR
-92798592,92798623,IE
-92798624,92798975,FR
+92795128,92798975,FR
 92798976,93323263,RU
 93323264,93335551,CH
 93335552,93339647,IL
@@ -1952,7 +1060,9 @@
 93419520,93421567,IT
 93421568,93425663,DE
 93425664,93426687,GI
-93426688,93427711,DE
+93426688,93427085,DE
+93427086,93427086,A2
+93427087,93427711,DE
 93427712,93429759,NO
 93429760,93431807,RU
 93431808,93433855,ES
@@ -1976,7 +1086,8 @@
 93693952,93695999,IE
 93696000,93700095,FR
 93700096,93702143,PL
-93702144,93708287,RU
+93702144,93704191,RU
+93704192,93708287,UA
 93708288,93712383,DE
 93712384,93714431,HU
 93714432,93716479,NL
@@ -1986,9 +1097,7 @@
 93765632,93774847,SE
 93774848,93776127,NO
 93776128,93782015,SE
-93782016,93833983,GB
-93833984,93834239,NL
-93834240,93836287,GB
+93782016,93836287,GB
 93836288,93836799,NL
 93836800,93842351,GB
 93842352,93842359,NL
@@ -1997,22 +1106,22 @@
 93880320,93888511,IT
 93888512,93890559,PL
 93890560,93892607,ES
-93892608,93894655,GB
+93892608,93892863,GB
+93892864,93893119,HK
+93893120,93893375,NL
+93893376,93893631,US
+93893632,93893887,GB
+93893888,93894143,US
+93894144,93894655,GB
 93894656,93896703,US
 93896704,93904895,GB
 93904896,93906943,LV
 93906944,93908991,BA
 93908992,93911039,IT
 93911040,93913087,AE
-93913088,93913727,NL
-93913728,93913735,US
-93913736,93914319,NL
-93914320,93914323,AZ
-93914324,93914357,NL
+93913088,93914357,NL
 93914358,93914358,GB
-93914359,93914671,NL
-93914672,93914679,US
-93914680,93914710,NL
+93914359,93914710,NL
 93914711,93914711,GB
 93914712,93914951,NL
 93914952,93914959,US
@@ -2030,16 +1139,12 @@
 93916544,93916591,NL
 93916592,93916599,US
 93916600,93916791,NL
-93916792,93916799,US
+93916792,93916799,CA
 93916800,93916971,NL
 93916972,93916975,US
-93916976,93917871,NL
-93917872,93917879,US
-93917880,93918103,NL
+93916976,93918103,NL
 93918104,93918111,US
-93918112,93918199,NL
-93918200,93918207,US
-93918208,93918215,NL
+93918112,93918215,NL
 93918216,93918223,US
 93918224,93918555,NL
 93918556,93918559,US
@@ -2051,9 +1156,7 @@
 93919264,93919287,US
 93919288,93919391,NL
 93919392,93919395,US
-93919396,93919727,NL
-93919728,93919735,US
-93919736,93919951,NL
+93919396,93919951,NL
 93919952,93919959,US
 93919960,93920059,NL
 93920060,93920063,US
@@ -2061,15 +1164,9 @@
 93920164,93920167,US
 93920168,93920575,NL
 93920576,93920639,US
-93920640,93920855,NL
-93920856,93920863,US
-93920864,93921055,NL
+93920640,93921055,NL
 93921056,93921059,US
-93921060,93921063,NL
-93921064,93921071,GB
-93921072,93921119,NL
-93921120,93921127,US
-93921128,93923095,NL
+93921060,93923095,NL
 93923096,93923103,US
 93923104,93923567,NL
 93923568,93923575,US
@@ -2079,7 +1176,9 @@
 93924408,93924415,JP
 93924416,93925807,NL
 93925808,93925815,KE
-93925816,93927143,NL
+93925816,93926143,NL
+93926144,93926151,BO
+93926152,93927143,NL
 93927144,93927151,JP
 93927152,93927231,NL
 93927232,93927247,CL
@@ -2101,9 +1200,11 @@
 93974528,93976575,CH
 93976576,93978623,GB
 93978624,94011391,ES
-94011392,94044159,RO
+94011392,94027775,RO
+94027776,94035967,IT
+94035968,94044159,RO
 94044160,94109695,SY
-94109696,94175231,RO
+94109696,94175231,SA
 94175232,94178303,SE
 94178304,94178559,NO
 94178560,94179071,SE
@@ -2162,7 +1263,7 @@
 94369792,94371839,TR
 94371840,94502911,IR
 94502912,94568447,OM
-94568448,94633983,RO
+94568448,94633983,SA
 94633984,94896127,RU
 94896128,95158271,IT
 95158272,95166463,RU
@@ -2203,7 +1304,9 @@
 95393664,95393791,QA
 95393792,95394047,GB
 95394048,95395327,AU
-95395328,95395839,GB
+95395328,95395455,GB
+95395456,95395583,DE
+95395584,95395839,GB
 95395840,95398399,DE
 95398400,95398655,GB
 95398656,95399679,DE
@@ -2211,7 +1314,7 @@
 95399808,95399935,DE
 95399936,95400063,CA
 95400064,95400191,DE
-95400192,95400319,CA
+95400192,95400319,US
 95400320,95400447,DE
 95400448,95400703,GB
 95400704,95400831,US
@@ -2247,13 +1350,12 @@
 95405568,95405823,GB
 95405824,95405951,US
 95405952,95406335,DE
-95406336,95407359,GB
+95406336,95407103,GB
+95407104,95407359,DE
 95407360,95407871,US
 95407872,95408639,DE
 95408640,95409151,GB
-95409152,95409663,DE
-95409664,95409919,US
-95409920,95410175,DE
+95409152,95410175,DE
 95410176,95410431,US
 95410432,95410447,CH
 95410448,95410559,DE
@@ -2296,20 +1398,27 @@
 96153600,96155647,PL
 96155648,96157695,CH
 96157696,96165887,RU
-96165888,96166399,FR
-96166400,96166655,GP
-96166656,96168703,FR
+96165888,96168703,GP
 96168704,96168959,MQ
-96168960,96171775,FR
+96168960,96171775,GP
 96171776,96172031,GF
-96172032,96172799,FR
-96172800,96173055,GP
+96172032,96173055,GP
 96173056,96173311,MQ
-96173312,96174079,FR
+96173312,96174079,GP
 96174080,96206847,HU
 96206848,96305151,RU
 96305152,96321535,DE
-96321536,96337919,RU
+96321536,96323583,RU
+96323584,96323711,ZA
+96323712,96323839,KR
+96323840,96323967,EG
+96323968,96324095,RU
+96324096,96324223,PK
+96324224,96324351,VN
+96324352,96324479,SG
+96324480,96324607,RU
+96324608,96324735,IR
+96324736,96337919,RU
 96337920,96403455,IR
 96403456,96468991,AZ
 96468992,96731135,AE
@@ -2317,9 +1426,13 @@
 96739480,96739483,DE
 96739484,96739583,FR
 96739584,96739587,PT
-96739588,96740223,FR
+96739588,96740111,FR
+96740112,96740127,IT
+96740128,96740223,FR
 96740224,96740351,IT
-96740352,96742407,FR
+96740352,96741039,FR
+96741040,96741043,PT
+96741044,96742407,FR
 96742408,96742415,NL
 96742416,96742427,FR
 96742428,96742431,NL
@@ -2329,28 +1442,107 @@
 96744608,96744611,IT
 96744612,96744831,FR
 96744832,96744839,GB
-96744840,96747291,FR
+96744840,96746879,FR
+96746880,96747007,IT
+96747008,96747103,FR
+96747104,96747135,DE
+96747136,96747291,FR
 96747292,96747295,PT
-96747296,96756427,FR
+96747296,96747343,FR
+96747344,96747359,DE
+96747360,96747407,FR
+96747408,96747423,DE
+96747424,96756427,FR
 96756428,96756431,ES
 96756432,96756447,DE
 96756448,96756743,FR
 96756744,96756751,NL
-96756752,96757883,FR
+96756752,96757639,FR
+96757640,96757643,CH
+96757644,96757883,FR
 96757884,96757887,ES
-96757888,96759767,FR
+96757888,96758247,FR
+96758248,96758251,DE
+96758252,96759767,FR
 96759768,96759775,IT
-96759776,96760319,FR
-96760320,96760383,PT
-96760384,96760403,FR
+96759776,96760403,FR
 96760404,96760407,IT
-96760408,96762943,FR
+96760408,96761855,FR
+96761856,96761871,BE
+96761872,96762863,FR
+96762864,96762879,NL
+96762880,96762943,FR
 96762944,96763007,ES
-96763008,96764375,FR
+96763008,96763163,FR
+96763164,96763167,PT
+96763168,96763199,DE
+96763200,96763551,FR
+96763552,96763555,GB
+96763556,96764239,FR
+96764240,96764255,DE
+96764256,96764375,FR
 96764376,96764383,IT
 96764384,96764559,FR
 96764560,96764575,NL
-96764576,96796671,FR
+96764576,96766943,FR
+96766944,96766975,BE
+96766976,96767031,FR
+96767032,96767035,GB
+96767036,96767823,FR
+96767824,96767839,BE
+96767840,96768151,FR
+96768152,96768155,FI
+96768156,96769279,FR
+96769280,96769295,ES
+96769296,96770651,FR
+96770652,96770655,PL
+96770656,96772215,FR
+96772216,96772223,PT
+96772224,96772407,FR
+96772408,96772408,GB
+96772409,96773119,FR
+96773120,96773375,ES
+96773376,96775599,FR
+96775600,96775615,DE
+96775616,96776319,FR
+96776320,96776323,ES
+96776324,96777023,FR
+96777024,96777087,ES
+96777088,96778171,FR
+96778172,96778175,PT
+96778176,96778247,FR
+96778248,96778255,IT
+96778256,96778867,FR
+96778868,96778871,BE
+96778872,96778991,FR
+96778992,96779007,DE
+96779008,96779167,FR
+96779168,96779199,PT
+96779200,96779247,FR
+96779248,96779255,CZ
+96779256,96779839,FR
+96779840,96779903,NL
+96779904,96783299,FR
+96783300,96783303,ES
+96783304,96783311,BE
+96783312,96783327,DE
+96783328,96783519,FR
+96783520,96783551,ES
+96783552,96783887,FR
+96783888,96783903,DE
+96783904,96785135,FR
+96785136,96785151,NL
+96785152,96785407,FR
+96785408,96785423,NL
+96785424,96786431,FR
+96786432,96786495,GB
+96786496,96792751,FR
+96792752,96792767,DE
+96792768,96793583,FR
+96793584,96793599,DE
+96793600,96794471,FR
+96794472,96794479,ES
+96794480,96796671,FR
 96796672,96862207,AZ
 96862208,96894975,GB
 96894976,96897023,CZ
@@ -2436,7 +1628,9 @@
 99028864,99028991,US
 99028992,99029503,GB
 99029504,99029519,IE
-99029520,99031295,DE
+99029520,99030783,DE
+99030784,99031039,US
+99031040,99031295,DE
 99031296,99031551,GB
 99031552,99031679,DE
 99031680,99031807,US
@@ -2481,7 +1675,9 @@
 100329472,100331519,RU
 100331520,100335615,TR
 100335616,100401151,KZ
-100532224,100559551,RO
+100532224,100559255,RO
+100559256,100559263,EG
+100559264,100559551,RO
 100559552,100559615,GB
 100559616,100559743,RO
 100559744,100559871,GB
@@ -2511,16 +1707,28 @@
 100634624,100636671,ES
 100636672,100638719,NL
 100638720,100646911,UA
-100646912,100663295,RU
-100663296,134874866,US
+100646912,100647679,RU
+100647680,100647711,TR
+100647712,100663295,RU
+100663296,134738943,US
+134738944,134739199,CA
+134739200,134874866,US
 134874867,134874867,DO
 134874868,135192575,US
 135192576,135200767,MX
-135200768,135432191,US
+135200768,135430143,US
+135430144,135430399,CA
+135430400,135432191,US
 135432192,135434239,CA
-135434240,135603199,US
+135434240,135441407,US
+135441408,135441663,CA
+135441664,135556607,US
+135556608,135556863,CA
+135556864,135603199,US
 135603200,135604223,CA
-135604224,135607039,US
+135604224,135604479,US
+135604480,135604735,CA
+135604736,135607039,US
 135607040,135607295,CA
 135607296,135776255,US
 135776256,135776511,GU
@@ -2530,15 +1738,19 @@
 135792384,135794687,CA
 135794688,135926527,US
 135926528,135926783,VI
-135926784,136237055,US
+135926784,135945727,US
+135945728,135945983,CA
+135945984,136175615,US
+136175616,136175871,CA
+136175872,136237055,US
 136237056,136239103,CA
 136239104,136404991,US
 136404992,136407039,CA
 136407040,136413183,US
-136413184,136415231,CA
-136415232,136415665,US
+136413184,136415665,CA
 136415666,136415666,FR
-136415667,136699903,US
+136415667,136415743,CA
+136415744,136699903,US
 136699904,136701951,A1
 136701952,139954241,US
 139954242,139954242,ES
@@ -2575,9 +1787,7 @@
 212787200,212788223,PR
 212788224,212788479,US
 212788480,212788735,VI
-212788736,212788863,US
-212788864,212788991,PR
-212788992,212791831,US
+212788736,212791831,US
 212791832,212791839,VI
 212791840,212791935,US
 212791936,212792063,VI
@@ -2593,10 +1803,7 @@
 214698240,214698255,VI
 214698256,214698303,US
 214698304,214698311,VI
-214698312,214699519,US
-214699520,214699647,PR
-214699648,214699775,VI
-214699776,214779135,US
+214698312,214779135,US
 214779136,214779391,PR
 214779392,219187465,US
 219187466,219187467,EU
@@ -2730,7 +1937,9 @@
 266598656,266598911,BR
 266598912,288130047,US
 288130048,288131071,CA
-288131072,288167423,US
+288131072,288153599,US
+288153600,288157695,CA
+288157696,288167423,US
 288167424,288167935,CA
 288167936,288169471,US
 288169472,288169983,CA
@@ -2753,7 +1962,9 @@
 289652736,289653759,NL
 289653760,289657855,GB
 289657856,289658879,AE
-289658880,289669119,GB
+289658880,289660927,GB
+289660928,289665023,ES
+289665024,289669119,GB
 289669120,289734655,FR
 289734656,289746943,GB
 289746944,289748991,US
@@ -2795,7 +2006,7 @@
 289958912,289959423,IT
 289959424,289959935,DK
 289959936,289960447,DE
-289960448,289960959,US
+289960448,289960959,IN
 289960960,289961471,BE
 289961472,289963007,US
 289963008,289964031,FR
@@ -2834,7 +2045,7 @@
 290305024,290306047,US
 290306048,290308095,DK
 290308096,290310143,DE
-290310144,290312191,US
+290310144,290312191,IN
 290312192,290314239,BE
 290314240,290320383,US
 290320384,290324479,FR
@@ -2903,7 +2114,8 @@
 386842624,386846719,NL
 386846720,386862079,US
 386862080,386862335,JP
-386862336,386875391,US
+386862336,386862591,KR
+386862592,386875391,US
 386875392,386879487,NL
 386879488,386887679,US
 386887680,386891775,NL
@@ -3077,7 +2289,9 @@
 391897088,391905279,CA
 391905280,391938047,US
 391938048,391946239,CA
-391946240,392429567,US
+391946240,392390538,US
+392390539,392390539,HK
+392390540,392429567,US
 392429568,392433663,NL
 392433664,392441855,US
 392441856,392445951,IE
@@ -3214,8 +2428,7 @@
 401547264,401555455,CA
 401555456,402096639,US
 402096640,402096895,FR
-402096896,402097151,US
-402097152,402097407,AR
+402096896,402097407,US
 402097408,402097663,KE
 402097664,402097919,SY
 402097920,402098175,MX
@@ -3283,7 +2496,7 @@
 406142976,406147071,US
 406147072,406159359,CA
 406159360,406175743,US
-406183936,406208511,CA
+406175744,406216703,CA
 406216704,406241279,US
 406241280,406257663,PR
 406257664,406274047,US
@@ -3309,7 +2522,9 @@
 409255936,409272319,CA
 409272320,409337855,US
 409337856,409354239,CA
-409354240,409550847,US
+409354240,409509887,US
+409509888,409518079,CA
+409518080,409550847,US
 409550848,409567231,CA
 409567232,409731071,US
 409731072,409862143,CA
@@ -3318,6 +2533,8 @@
 410189824,410648575,US
 410648576,410714111,CA
 410714112,411156479,US
+411156480,411160575,CA
+411160576,411164671,US
 411164672,411168767,CA
 411168768,411303935,US
 411303936,411369471,NL
@@ -3343,8 +2560,10 @@
 411983872,411988735,US
 411988736,411988991,EU
 411988992,411989247,GB
-411989248,412221439,US
-412221440,412237823,CA
+411989248,412057599,US
+412057600,412073983,CA
+412073984,412221439,US
+412221440,412254207,CA
 412254208,412483583,US
 412483584,412549119,CA
 412549120,412614655,US
@@ -3672,7 +2891,7 @@
 469729280,469762047,IN
 469762048,520093695,US
 520093696,520257535,PL
-520257536,520290303,RO
+520257536,520290303,IR
 520290304,520292351,TR
 520292352,520294399,NL
 520294400,520296447,RU
@@ -3688,7 +2907,8 @@
 520325120,520327167,FR
 520327168,520329215,DE
 520329216,520330239,SE
-520330240,520330751,NL
+520330240,520330495,NL
+520330496,520330751,US
 520330752,520331263,SE
 520331264,520339455,IT
 520339456,520343551,UA
@@ -3706,25 +2926,34 @@
 520491648,520491775,IS
 520491776,520492031,IE
 520492032,520493055,GB
-520493056,520494079,IT
+520493056,520493311,BE
+520493312,520493823,IT
+520493824,520494079,FI
 520494080,520494335,FR
-520494336,520494591,IT
+520494336,520494591,CZ
 520494592,520494847,CH
 520494848,520495103,DK
-520495104,520495871,IT
+520495104,520495359,SE
+520495360,520495615,BE
+520495616,520495871,SE
 520495872,520496383,DE
-520496384,520496895,IT
+520496384,520496639,TR
+520496640,520496767,CZ
+520496768,520496895,TR
 520496896,520497151,ES
 520497152,520497407,FR
-520497408,520497919,IT
+520497408,520497919,CH
 520497920,520498175,FR
 520498176,520498431,CH
 520498432,520498687,SE
-520498688,520499199,FR
-520499200,520500223,IT
+520498688,520499711,FR
+520499712,520500223,DK
 520500224,520500479,LU
 520500480,520500735,DE
-520500736,520501759,IT
+520500736,520500991,LT
+520500992,520501247,AT
+520501248,520501503,LU
+520501504,520501759,NO
 520501760,520502271,GB
 520502272,520502783,IT
 520502784,520503295,GB
@@ -3787,9 +3016,7 @@
 520988672,520990719,DE
 520990720,520992767,RU
 520994816,521011199,BG
-521011200,521020415,RO
-521020416,521021439,MD
-521021440,521039871,RO
+521011200,521039871,RO
 521039872,521043967,IR
 521043968,521057279,RO
 521057280,521058303,MD
@@ -3820,7 +3047,8 @@
 521555968,521558015,NL
 521558016,521560063,CY
 521560064,521562111,PL
-521562112,521564159,GB
+521562112,521563135,GB
+521563136,521564159,NL
 521564160,521565183,GR
 521565184,521565439,GB
 521565440,521565695,US
@@ -3830,7 +3058,9 @@
 521601024,521666559,RU
 521666560,521668607,GB
 521668608,521670655,CH
-521670656,521672703,HU
+521670656,521670911,HU
+521670912,521671935,DE
+521671936,521672703,HU
 521672704,521674751,RU
 521674752,521676799,GB
 521676800,521678847,ES
@@ -3855,7 +3085,8 @@
 521711616,521713663,SK
 521713664,521715711,HU
 521715712,521717759,LV
-521717760,521719807,IR
+521717760,521718783,IQ
+521718784,521719807,IR
 521719808,521721855,UA
 521721856,521723903,GB
 521723904,521725951,SA
@@ -3896,7 +3127,8 @@
 521953280,521961471,RU
 521961472,521969663,CZ
 521969664,521977855,UA
-521977856,521994239,RU
+521977856,521986047,RU
+521986048,521994239,UA
 521994240,522002431,KG
 522002432,522010623,IR
 522010624,522018815,AE
@@ -3904,9 +3136,7 @@
 522027008,522059775,RU
 522059776,522125311,CZ
 522125312,522133503,MD
-522133504,522134783,NL
-522134784,522134911,US
-522134912,522135551,NL
+522133504,522135551,NL
 522135552,522137599,IT
 522137600,522141695,CH
 522141696,522143743,RU
@@ -3928,8 +3158,9 @@
 522719232,522721279,UA
 522721280,522741759,RU
 522741760,522743807,UA
-522743808,522747903,RU
-522747904,522764287,UA
+522743808,522763263,RU
+522763264,522763519,UA
+522763520,522764287,RU
 522780672,522782719,RU
 522782720,522784767,UA
 522784768,522786815,BG
@@ -4106,10 +3337,20 @@
 529727488,529793023,HR
 529793024,529793279,CZ
 529793280,529794303,RU
-529794304,529795071,CZ
-529795072,529796095,RU
-529796096,529805311,CZ
-529805312,529817599,RU
+529794304,529794559,CZ
+529794560,529796095,RU
+529796096,529797119,UA
+529797120,529798143,RU
+529798144,529798399,CZ
+529798400,529798655,RU
+529798656,529798911,KZ
+529798912,529799167,UA
+529799168,529799423,RU
+529799424,529799679,UA
+529799680,529800191,RU
+529800192,529800703,UA
+529800704,529801215,CZ
+529801216,529817599,RU
 529817600,529818623,CZ
 529818624,529826303,RU
 529826304,529826815,CZ
@@ -4216,7 +3457,9 @@
 531415040,531423231,RU
 531423232,531425279,NO
 531425280,531427327,FR
-531427328,531427703,GB
+531427328,531427559,GB
+531427560,531427567,IT
+531427568,531427703,GB
 531427704,531427711,IT
 531427712,531428263,GB
 531428264,531428271,IT
@@ -4224,7 +3467,9 @@
 531428352,531428359,IT
 531428360,531428495,GB
 531428496,531428503,IT
-531428504,531429135,GB
+531428504,531428847,GB
+531428848,531428855,IT
+531428856,531429135,GB
 531429136,531429143,IT
 531429144,531429167,GB
 531429168,531429175,IT
@@ -4238,16 +3483,20 @@
 531429408,531429415,IT
 531429416,531429599,GB
 531429600,531429607,IT
-531429608,531429855,GB
-531429856,531429863,IT
-531429864,531430319,GB
+531429608,531430319,GB
 531430320,531430327,IT
-531430328,531430823,GB
+531430328,531430751,GB
+531430752,531430759,IT
+531430760,531430791,GB
+531430792,531430799,IT
+531430800,531430823,GB
 531430824,531430831,IT
 531430832,531430847,GB
 531430848,531430855,IT
-531430856,531431423,GB
-531431424,531496959,RO
+531430856,531430903,GB
+531430904,531430911,IT
+531430912,531431423,GB
+531431424,531496959,RU
 531496960,531628031,PL
 531628032,531660799,TR
 531660800,531693567,BA
@@ -4276,7 +3525,9 @@
 532209664,532210687,DE
 532210688,532211711,RU
 532211712,532212223,LU
-532212224,532213759,RU
+532212224,532212479,RU
+532212480,532212735,NL
+532212736,532213759,RU
 532213760,532214015,GB
 532214016,532221951,RU
 532221952,532223999,IT
@@ -4316,14 +3567,23 @@
 532347904,532348671,GB
 532348672,532348927,NL
 532348928,532365311,IE
-532365312,532365567,LU
-532365568,532365823,NL
+532365312,532365823,NL
 532365824,532366079,DE
 532366080,532366207,NL
 532366208,532366239,AR
 532366240,532366271,PA
-532366272,532371455,DE
-532371456,532373503,NL
+532366272,532367359,DE
+532367360,532368383,US
+532368384,532368639,NL
+532368640,532369919,DE
+532369920,532372479,NL
+532372480,532372735,LU
+532372736,532372895,FR
+532372896,532372959,SE
+532372960,532372991,RU
+532372992,532373247,NL
+532373248,532373343,DE
+532373344,532373503,NL
 532373504,532375551,RU
 532375552,532377599,IT
 532377600,532381695,DE
@@ -4380,7 +3640,13 @@
 533331968,533397503,UA
 533397504,533463039,KW
 533463040,533479423,RU
-533479424,533481471,DE
+533479424,533479519,DE
+533479520,533479551,FI
+533479552,533479743,DE
+533479744,533479775,FI
+533479776,533480031,DE
+533480032,533480063,FI
+533480064,533481471,DE
 533481472,533483519,NO
 533483520,533485567,FR
 533485568,533487615,LU
@@ -4443,7 +3709,9 @@
 533970944,533987327,SE
 533987328,534118399,DE
 534118400,534151167,KW
-534151168,534183935,DE
+534151168,534163455,DE
+534163456,534167551,ES
+534167552,534183935,DE
 534183936,534249471,AE
 534249472,534253567,GB
 534253568,534257663,FR
@@ -4481,7 +3749,8 @@
 534513280,534513407,NL
 534513408,534513663,SE
 534513664,534514687,US
-534514688,534515711,DE
+534514688,534515455,DE
+534515456,534515711,SE
 534515712,534515967,GB
 534515968,534516735,US
 534516736,534516991,GB
@@ -4504,10 +3773,16 @@
 534519552,534519807,NL
 534519808,534521855,US
 534521856,534522367,DE
-534522368,534523391,NL
+534522368,534522879,NL
+534522880,534523135,DE
+534523136,534523391,NL
 534523392,534523903,DE
-534523904,534530047,US
-534530048,534544383,DE
+534523904,534527999,US
+534528000,534530047,DE
+534530048,534538239,ES
+534538240,534540287,US
+534540288,534542335,NL
+534542336,534544383,DE
 534544384,534546431,RO
 534546432,534548479,DE
 534548480,534550527,PL
@@ -4773,8 +4048,7 @@
 621330432,621346815,PL
 621346816,621355007,RU
 621355008,621357055,UA
-621357056,621360895,RU
-621360896,621361151,DE
+621357056,621361151,RU
 621361152,621363199,GB
 621363200,621381631,RU
 621381632,621383679,FR
@@ -4830,7 +4104,7 @@
 621975552,621977599,RU
 621977600,621981695,FR
 621981696,621983743,US
-621983744,621985791,RS
+621983744,621985791,GB
 621985792,621987839,US
 621987840,621989887,DK
 621989888,621992959,SE
@@ -4861,7 +4135,7 @@
 622415872,622417919,MK
 622417920,622419967,IM
 622419968,622428159,UA
-622428160,622460927,RO
+622428160,622460927,GB
 622460928,622477311,AZ
 622477312,622479359,AL
 622479360,622481407,GB
@@ -4880,12 +4154,11 @@
 622512128,622514175,DE
 622514176,622518271,NO
 622518272,622518527,GB
-622518528,622519295,NL
-622519296,622520319,FR
+622518528,622520319,NL
 622520320,622522367,RU
 622522368,622524415,FR
 622524416,622526463,ES
-622526464,622591999,DE
+622526464,622591999,IR
 622592000,622624767,OM
 622624768,622626815,NO
 622626816,622630911,DK
@@ -4900,7 +4173,7 @@
 622868480,622870527,FR
 622870528,622874623,AZ
 622874624,622878719,IT
-622878720,622880767,FR
+622878720,622878975,FR
 622880768,622882815,IT
 622882816,622886911,IR
 622886912,622919679,GR
@@ -4976,7 +4249,6 @@
 623804160,623804415,NL
 623804416,623806463,RU
 623806464,623808511,NL
-623808512,623810559,RU
 623810560,623812607,ES
 623812608,623820799,SE
 623820800,623821823,NL
@@ -5003,7 +4275,7 @@
 624029696,624033791,SE
 624033792,624164863,DE
 624164864,624427007,UA
-624427008,624492543,RO
+624427008,624492543,SA
 624492544,624558079,UA
 624558080,624562175,SK
 624562176,624564223,TR
@@ -5011,17 +4283,9 @@
 624566272,624568319,RU
 624568320,624570367,BE
 624570368,624574463,DE
-624574464,624574535,NL
-624574536,624574543,US
-624574544,624574559,NL
-624574560,624574567,US
-624574568,624574715,NL
+624574464,624574715,NL
 624574716,624574719,US
-624574720,624574855,NL
-624574856,624574863,US
-624574864,624575039,NL
-624575040,624575047,US
-624575048,624575063,NL
+624574720,624575063,NL
 624575064,624575071,US
 624575072,624575135,NL
 624575136,624575143,US
@@ -5031,31 +4295,25 @@
 624575680,624575743,US
 624575744,624575759,NL
 624575760,624575767,BE
-624575768,624575895,NL
-624575896,624575903,US
-624575904,624576111,NL
+624575768,624576111,NL
 624576112,624576119,US
 624576120,624576127,NL
 624576128,624576131,US
-624576132,624576287,NL
-624576288,624576295,US
-624576296,624576471,NL
+624576132,624576471,NL
 624576472,624576479,US
 624576480,624576487,NL
 624576488,624576495,CA
 624576496,624576887,NL
 624576888,624576895,GB
-624576896,624577135,NL
-624577136,624577139,GB
-624577140,624577151,NL
+624576896,624577151,NL
 624577152,624577215,GB
 624577216,624577307,NL
 624577308,624577311,US
 624577312,624577483,NL
 624577484,624577487,US
-624577488,624578719,NL
-624578720,624578723,GB
-624578724,624578887,NL
+624577488,624577863,NL
+624577864,624577871,US
+624577872,624578887,NL
 624578888,624578895,US
 624578896,624578951,NL
 624578952,624578955,US
@@ -5073,31 +4331,15 @@
 624579624,624579627,US
 624579628,624580132,NL
 624580133,624580133,GB
-624580134,624580135,NL
-624580136,624580143,US
-624580144,624580151,NL
+624580134,624580151,NL
 624580152,624580159,ES
-624580160,624580231,NL
-624580232,624580239,US
-624580240,624580263,NL
-624580264,624580271,US
-624580272,624580495,NL
-624580496,624580503,US
-624580504,624580559,NL
-624580560,624580567,US
-624580568,624581071,NL
+624580160,624581071,NL
 624581072,624581087,US
 624581088,624581135,NL
 624581136,624581139,US
-624581140,624581199,NL
-624581200,624581207,GB
-624581208,624581535,NL
-624581536,624581543,US
-624581544,624581599,NL
+624581140,624581599,NL
 624581600,624581631,US
-624581632,624581927,NL
-624581928,624581935,US
-624581936,624582123,NL
+624581632,624582123,NL
 624582124,624582127,US
 624582128,624582139,NL
 624582140,624582147,US
@@ -5105,11 +4347,7 @@
 624582288,624582295,US
 624582296,624582399,NL
 624582400,624582403,US
-624582404,624582615,NL
-624582616,624582623,US
-624582624,624582631,NL
-624582632,624582639,US
-624582640,624582759,NL
+624582404,624582759,NL
 624582760,624582767,GB
 624582768,624583239,NL
 624583240,624583247,GB
@@ -5121,19 +4359,15 @@
 624584384,624584391,US
 624584392,624584415,NL
 624584416,624584423,US
-624584424,624586183,NL
-624586184,624586191,US
-624586192,624586279,NL
+624584424,624586279,NL
 624586280,624586287,US
-624586288,624587111,NL
+624586288,624586479,NL
+624586480,624586487,DE
+624586488,624587111,NL
 624587112,624587119,US
 624587120,624587583,NL
 624587584,624587599,US
-624587600,624587871,NL
-624587872,624587903,US
-624587904,624587935,NL
-624587936,624587943,US
-624587944,624588383,NL
+624587600,624588383,NL
 624588384,624588391,US
 624588392,624588399,GB
 624588400,624588927,NL
@@ -5142,790 +4376,207 @@
 624589160,624589167,IT
 624589168,624589199,NL
 624589200,624589215,KE
-624589216,624589375,NL
-624589376,624589383,US
-624589384,624589719,NL
+624589216,624589719,NL
 624589720,624589727,US
 624589728,624589783,NL
 624589784,624589791,US
 624589792,624589967,NL
 624589968,624589975,US
 624589976,624590847,NL
-624590848,624640527,FR
+624590848,624625848,FR
+624625849,624625849,CA
+624625850,624640527,FR
 624640528,624640543,GB
-624640544,624640551,FR
-624640552,624640559,IE
-624640560,624640575,BE
-624640576,624640735,FR
-624640736,624640739,GB
-624640740,624640759,FR
+624640544,624640759,FR
 624640760,624640767,NL
-624640768,624640775,ES
-624640776,624640847,FR
-624640848,624640851,ES
-624640852,624640903,FR
-624640904,624640907,CZ
-624640908,624640927,FR
-624640928,624640931,ES
-624640932,624640935,FR
-624640936,624640939,FI
-624640940,624640943,FR
-624640944,624640951,ES
+624640768,624640951,FR
 624640952,624640959,PT
-624640960,624640967,NL
-624640968,624640991,FR
-624640992,624640999,CH
-624641000,624641023,FR
-624641024,624641055,GB
-624641056,624641063,FR
-624641064,624641067,GB
-624641068,624641119,FR
-624641120,624641127,PL
-624641128,624641195,FR
-624641196,624641199,PL
-624641200,624641207,DE
-624641208,624641223,FR
-624641224,624641231,PT
-624641232,624641311,FR
-624641312,624641319,BE
-624641320,624641323,ES
-624641324,624641367,FR
-624641368,624641371,DE
-624641372,624642055,FR
-624642056,624642063,PL
-624642064,624642079,BE
-624642080,624642127,FR
-624642128,624642159,GB
-624642160,624642231,FR
-624642232,624642235,ES
-624642236,624642255,FR
-624642256,624642271,IT
-624642272,624642379,FR
-624642380,624642383,FI
-624642384,624642495,FR
-624642496,624642511,ES
-624642512,624642591,FR
-624642592,624642623,DE
-624642624,624642679,FR
-624642680,624642683,IT
-624642684,624642719,FR
-624642720,624642723,IT
-624642724,624642743,FR
-624642744,624642751,GB
-624642752,624642767,FR
-624642768,624642783,GB
-624642784,624642879,FR
-624642880,624642883,IT
-624642884,624643019,FR
+624640960,624643019,FR
 624643020,624643023,IT
-624643024,624643039,FR
-624643040,624643055,GB
-624643056,624643071,FR
-624643072,624643087,GB
-624643088,624643095,FR
-624643096,624643103,IT
-624643104,624643187,FR
-624643188,624643191,GB
-624643192,624643343,FR
-624643344,624643351,DE
-624643352,624643359,FR
-624643360,624643367,DE
-624643368,624643503,FR
-624643504,624643519,DE
-624643520,624643631,FR
-624643632,624643647,PL
-624643648,624643775,FR
-624643776,624643783,IT
-624643784,624644063,FR
-624644064,624644095,CH
-624644096,624644275,FR
-624644276,624644279,GB
-624644280,624644615,FR
-624644616,624644619,DE
-624644620,624644631,FR
-624644632,624644635,DE
-624644636,624644639,PL
-624644640,624644675,FR
-624644676,624644679,DE
-624644680,624644723,FR
-624644724,624644727,NL
-624644728,624644815,FR
-624644816,624644819,DE
-624644820,624645127,FR
-624645128,624645131,DE
-624645132,624645147,FR
+624643024,624645147,FR
 624645148,624645151,IT
-624645152,624645279,FR
-624645280,624645295,CH
-624645296,624645619,FR
-624645620,624645623,NL
-624645624,624645759,FR
-624645760,624645823,DE
-624645824,624646095,FR
-624646096,624646099,GB
-624646100,624646143,FR
-624646144,624646159,ES
-624646160,624646235,FR
-624646236,624646239,CZ
-624646240,624646255,FR
-624646256,624646263,DE
-624646264,624646343,FR
+624645152,624646239,FR
+624646240,624646255,DE
+624646256,624646343,FR
 624646344,624646347,NL
-624646348,624646351,FR
-624646352,624646367,DE
-624646368,624646495,FR
-624646496,624646527,ES
-624646528,624646535,CH
-624646536,624646583,FR
+624646348,624646583,FR
 624646584,624646591,NL
-624646592,624646639,FR
-624646640,624646643,IE
-624646644,624646975,FR
-624646976,624646983,PL
-624646984,624647055,FR
-624647056,624647063,DE
-624647064,624647171,FR
+624646592,624647171,FR
 624647172,624647183,ES
-624647184,624647247,FR
-624647248,624647263,GB
-624647264,624647295,FR
-624647296,624647327,ES
-624647328,624647359,FR
-624647360,624647375,PL
-624647376,624647391,FR
-624647392,624647399,PL
-624647400,624647455,FR
-624647456,624647471,ES
-624647472,624647487,FR
-624647488,624647503,PT
-624647504,624647615,FR
-624647616,624647623,PL
-624647624,624647631,ES
-624647632,624648079,FR
-624648080,624648095,ES
-624648096,624648111,FR
-624648112,624648115,IT
-624648116,624648127,FR
-624648128,624648135,DE
-624648136,624648139,FR
+624647184,624648139,FR
 624648140,624648143,ES
 624648144,624653311,FR
 624653312,624653823,GB
-624653824,624656415,FR
-624656416,624656447,IT
-624656448,624656479,PL
-624656480,624656511,NL
-624656512,624656543,FR
-624656544,624656575,PL
-624656576,624656607,FR
-624656608,624656639,IT
-624656640,624656739,FR
-624656740,624656743,CZ
-624656744,624656767,FR
-624656768,624656799,NL
-624656800,624656975,FR
+624653824,624656975,FR
 624656976,624656979,PT
-624656980,624657147,FR
-624657148,624657155,ES
-624657156,624657183,FR
-624657184,624657199,IE
-624657200,624657279,FR
-624657280,624657295,IT
-624657296,624657299,DE
-624657300,624657307,FR
-624657308,624657311,PT
-624657312,624657343,FR
-624657344,624657359,ES
-624657360,624657475,FR
-624657476,624657479,DE
-624657480,624657487,FR
-624657488,624657491,PT
-624657492,624657663,FR
-624657664,624657667,ES
-624657668,624657671,FI
-624657672,624657675,PL
-624657676,624657707,FR
-624657708,624657715,ES
-624657716,624657779,FR
-624657780,624657783,GB
-624657784,624657799,FR
-624657800,624657803,IE
-624657804,624657815,FR
-624657816,624657819,ES
-624657820,624657823,GB
-624657824,624657883,FR
+624656980,624657607,FR
+624657608,624657615,BE
+624657616,624657711,FR
+624657712,624657715,ES
+624657716,624657883,FR
 624657884,624657887,ES
-624657888,624657967,FR
-624657968,624657975,GB
-624657976,624658015,FR
-624658016,624658031,IT
-624658032,624658087,FR
-624658088,624658095,NL
-624658096,624658175,FR
-624658176,624658179,BE
-624658180,624658183,ES
-624658184,624658319,FR
-624658320,624658335,IE
-624658336,624658431,FR
-624658432,624658447,IT
-624658448,624658479,FR
+624657888,624657923,FR
+624657924,624657927,DE
+624657928,624658323,FR
+624658324,624658327,IE
+624658328,624658479,FR
 624658480,624658483,DE
-624658484,624658671,FR
-624658672,624658675,IT
-624658676,624658799,FR
-624658800,624658803,PT
-624658804,624658843,FR
-624658844,624658847,ES
-624658848,624659031,FR
+624658484,624658495,FR
+624658496,624658527,IT
+624658528,624659031,FR
 624659032,624659039,IT
-624659040,624659055,ES
-624659056,624659071,FR
+624659040,624659071,FR
 624659072,624659135,ES
-624659136,624659199,FR
-624659200,624659215,DE
-624659216,624659279,FR
-624659280,624659295,NL
-624659296,624659307,FR
-624659308,624659311,DE
-624659312,624659315,GB
-624659316,624659391,FR
-624659392,624659407,IT
-624659408,624659455,FR
-624659456,624659487,PL
-624659488,624659647,FR
-624659648,624659663,PL
-624659664,624659799,FR
-624659800,624659803,ES
-624659804,624659871,FR
-624659872,624659903,ES
-624659904,624659935,FR
-624659936,624659951,BE
-624659952,624659967,FR
-624659968,624659975,GB
-624659976,624660503,FR
-624660504,624660511,IT
-624660512,624660563,FR
-624660564,624660567,NL
-624660568,624660607,FR
-624660608,624660639,GB
-624660640,624660827,FR
+624659136,624660827,FR
 624660828,624660831,ES
-624660832,624660883,FR
-624660884,624660887,DE
-624660888,624660911,FR
-624660912,624660915,PL
-624660916,624660919,IT
-624660920,624661247,FR
+624660832,624661247,FR
 624661248,624661251,ES
-624661252,624661279,FR
-624661280,624661283,CZ
-624661284,624661787,FR
+624661252,624661787,FR
 624661788,624661788,RO
-624661789,624661791,FR
-624661792,624661823,DE
-624661824,624661955,FR
+624661789,624661955,FR
 624661956,624661959,PL
-624661960,624661967,ES
-624661968,624661975,FI
-624661976,624662455,FR
-624662456,624662459,ES
-624662460,624662543,FR
-624662544,624662559,ES
-624662560,624662623,FR
-624662624,624662627,DE
-624662628,624662751,FR
-624662752,624662755,CZ
-624662756,624662759,FR
-624662760,624662763,CH
-624662764,624662911,FR
-624662912,624663039,GB
-624663040,624663327,FR
-624663328,624663359,DE
-624663360,624663391,PT
-624663392,624663667,FR
-624663668,624663671,ES
-624663672,624663695,FR
-624663696,624663711,IT
-624663712,624663851,FR
-624663852,624663855,GB
-624663856,624663863,FR
-624663864,624663867,DE
-624663868,624663871,ES
-624663872,624663951,FR
+624661960,624663951,FR
 624663952,624663955,ES
-624663956,624663971,FR
-624663972,624663975,IT
-624663976,624664255,FR
-624664256,624664287,GB
-624664288,624664319,ES
-624664320,624664351,FR
-624664352,624664367,ES
-624664368,624664479,FR
-624664480,624664483,IT
-624664484,624664527,FR
+624663956,624664527,FR
 624664528,624664531,ES
-624664532,624664611,FR
-624664612,624664619,IT
-624664620,624664635,FR
-624664636,624664639,PL
-624664640,624664655,FR
-624664656,624664663,LT
-624664664,624664667,FI
-624664668,624664671,NL
-624664672,624664676,FR
+624664532,624664615,FR
+624664616,624664619,IT
+624664620,624664676,FR
 624664677,624664677,IE
-624664678,624664863,FR
-624664864,624664895,ES
-624664896,624664959,NL
-624664960,624665247,FR
-624665248,624665263,PL
-624665264,624665391,FR
-624665392,624665407,PT
-624665408,624665551,FR
-624665552,624665555,LT
-624665556,624665567,FR
-624665568,624665583,GB
-624665584,624665587,FR
+624664678,624665587,FR
 624665588,624665591,DE
-624665592,624665607,FR
-624665608,624665611,ES
-624665612,624665727,FR
-624665728,624665759,GB
-624665760,624665775,FR
-624665776,624665779,GB
-624665780,624665783,NL
-624665784,624665787,FR
-624665788,624665791,ES
-624665792,624665803,FR
+624665592,624665803,FR
 624665804,624665807,NL
-624665808,624665811,CH
-624665812,624665859,FR
-624665860,624665863,PT
-624665864,624665951,FR
+624665808,624665951,FR
 624665952,624665955,NL
-624665956,624665999,FR
-624666000,624666015,BE
-624666016,624666031,FR
-624666032,624666047,PL
-624666048,624666371,FR
-624666372,624666375,BE
-624666376,624666391,FR
-624666392,624666399,DE
-624666400,624666431,FR
-624666432,624666495,IT
-624666496,624666727,FR
-624666728,624666731,PL
-624666732,624666735,BE
-624666736,624666739,IT
-624666740,624666879,FR
-624666880,624666883,IT
-624666884,624666887,GB
-624666888,624666907,FR
-624666908,624666911,GB
-624666912,624666927,FR
-624666928,624666943,BE
-624666944,624666959,IE
-624666960,624666995,FR
-624666996,624666999,NL
-624667000,624667087,FR
-624667088,624667103,ES
-624667104,624667167,FR
-624667168,624667199,GB
-624667200,624667327,FR
-624667328,624667391,NL
-624667392,624667439,FR
-624667440,624667455,GB
-624667456,624667471,FR
+624665956,624666695,FR
+624666696,624666703,DE
+624666704,624667471,FR
 624667472,624667475,IT
 624667476,624667599,FR
 624667600,624667603,IT
-624667604,624667827,FR
-624667828,624667831,ES
-624667832,624668063,FR
+624667604,624668063,FR
 624668064,624668079,BE
-624668080,624668511,FR
-624668512,624668543,DE
-624668544,624668607,FR
-624668608,624668639,PT
+624668080,624668639,FR
 624668640,624668643,NL
-624668644,624668715,FR
-624668716,624668735,ES
-624668736,624668751,FR
-624668752,624668767,GB
-624668768,624668815,FR
-624668816,624668831,ES
-624668832,624668863,FR
-624668864,624668879,ES
-624668880,624669011,FR
+624668644,624669011,FR
 624669012,624669015,DE
-624669016,624669247,FR
-624669248,624669255,DE
-624669256,624669311,FR
-624669312,624669327,ES
-624669328,624669359,FR
-624669360,624669367,IT
-624669368,624669439,FR
-624669440,624669455,NL
-624669456,624669499,FR
-624669500,624669503,DE
-624669504,624669583,FR
-624669584,624669591,IT
-624669592,624669727,FR
-624669728,624669743,GB
-624669744,624669795,FR
+624669016,624669795,FR
 624669796,624669799,ES
-624669800,624669871,FR
-624669872,624669879,NL
-624669880,624669887,ES
-624669888,624669963,FR
-624669964,624669967,LT
-624669968,624669983,FR
-624669984,624669987,IT
-624669988,624670147,FR
-624670148,624670151,CZ
-624670152,624670195,FR
-624670196,624670199,LT
-624670200,624670391,FR
-624670392,624670395,NL
-624670396,624670399,GB
-624670400,624670403,FR
-624670404,624670407,ES
-624670408,624670443,FR
-624670444,624670447,ES
-624670448,624670799,FR
-624670800,624670803,GB
-624670804,624670895,FR
-624670896,624670903,DE
-624670904,624671263,FR
-624671264,624671279,ES
-624671280,624671407,FR
-624671408,624671423,GB
-624671424,624671439,FR
-624671440,624671455,IT
+624669800,624670915,FR
+624670916,624670919,ES
+624670920,624671455,FR
 624671456,624671471,ES
-624671472,624671855,FR
-624671856,624671871,GB
-624671872,624671935,FR
-624671936,624671943,NL
-624671944,624672067,FR
-624672068,624672071,DE
-624672072,624672095,FR
-624672096,624672127,CZ
-624672128,624672131,FR
-624672132,624672135,BE
-624672136,624672175,FR
-624672176,624672179,IT
-624672180,624672511,FR
-624672512,624672515,LT
-624672516,624672519,IT
-624672520,624672523,FR
-624672524,624672527,GB
-624672528,624672547,FR
+624671472,624672547,FR
 624672548,624672551,ES
-624672552,624672555,FI
-624672556,624672559,FR
+624672552,624672559,FR
 624672560,624672563,IT
-624672564,624672607,FR
-624672608,624672615,NL
-624672616,624672671,FR
-624672672,624672703,PL
-624672704,624673279,FR
-624673280,624673283,CH
-624673284,624673287,FR
+624672564,624673287,FR
 624673288,624673295,DE
-624673296,624673303,FR
-624673304,624673307,GB
-624673308,624673311,FR
-624673312,624673343,CH
-624673344,624673435,FR
-624673436,624673439,DE
-624673440,624673451,FR
+624673296,624673451,FR
 624673452,624673455,ES
 624673456,624673535,FR
 624673536,624673791,ES
-624673792,624673795,PL
-624673796,624673799,DE
-624673800,624673803,FR
+624673792,624673803,FR
 624673804,624673807,NL
-624673808,624673823,PL
-624673824,624673871,FR
-624673872,624673879,PL
-624673880,624673883,FR
-624673884,624673887,PL
-624673888,624673891,FI
-624673892,624673895,DE
-624673896,624673903,FR
+624673808,624673903,FR
 624673904,624673919,ES
-624673920,624673955,FR
-624673956,624673959,IT
-624673960,624674079,FR
-624674080,624674111,PT
-624674112,624674339,FR
-624674340,624674343,NL
-624674344,624674459,FR
-624674460,624674463,PL
-624674464,624674495,FR
-624674496,624674503,GB
-624674504,624674527,FR
-624674528,624674559,DE
-624674560,624674735,FR
-624674736,624674739,ES
-624674740,624674783,FR
-624674784,624674815,GB
-624674816,624675055,FR
-624675056,624675059,DE
-624675060,624675691,FR
+624673920,624675691,FR
 624675692,624675695,ES
-624675696,624675719,FR
-624675720,624675727,NL
-624675728,624675775,FR
+624675696,624675775,FR
 624675776,624675779,ES
-624675780,624675803,FR
-624675804,624675807,ES
-624675808,624675839,GB
-624675840,624676003,FR
+624675780,624676003,FR
 624676004,624676007,DE
-624676008,624676019,FR
-624676020,624676023,DE
-624676024,624676087,FR
+624676008,624676087,FR
 624676088,624676091,DE
-624676092,624676183,FR
-624676184,624676191,GB
-624676192,624676495,FR
-624676496,624676511,BE
-624676512,624676715,FR
+624676092,624676715,FR
 624676716,624676719,ES
-624676720,624676799,FR
-624676800,624676863,IT
-624676864,624676939,FR
-624676940,624676943,ES
-624676944,624677055,FR
-624677056,624677087,IT
-624677088,624677119,PL
-624677120,624677247,FR
-624677248,624677263,GB
-624677264,624677279,FI
-624677280,624677407,FR
-624677408,624677439,ES
-624677440,624677463,FR
+624676720,624677463,FR
 624677464,624677467,ES
 624677468,624677683,FR
 624677684,624677687,NL
-624677688,624677727,FR
-624677728,624677731,IT
-624677732,624677767,FR
+624677688,624677767,FR
 624677768,624677775,NL
-624677776,624677983,FR
-624677984,624678015,GB
-624678016,624678187,FR
-624678188,624678191,DE
-624678192,624678363,FR
-624678364,624678367,ES
-624678368,624678391,FR
+624677776,624678391,FR
 624678392,624678399,NL
-624678400,624678415,FR
-624678416,624678431,GB
-624678432,624678463,FR
-624678464,624678479,PL
-624678480,624678487,FR
+624678400,624678487,FR
 624678488,624678495,NL
-624678496,624678527,FR
-624678528,624678543,CH
-624678544,624678591,FR
-624678592,624678655,PT
-624678656,624679175,FR
+624678496,624679175,FR
 624679176,624679183,NL
 624679184,624679199,FR
 624679200,624679203,ES
-624679204,624679311,FR
-624679312,624679327,DE
-624679328,624679391,FR
-624679392,624679407,GB
-624679408,624679679,FR
+624679204,624679679,FR
 624679680,624679687,NL
-624679688,624679695,PL
-624679696,624679775,FR
-624679776,624679791,GB
-624679792,624679795,IT
-624679796,624679843,FR
+624679688,624679843,FR
 624679844,624679847,ES
-624679848,624680191,FR
-624680192,624680255,IT
-624680256,624680511,FR
-624680512,624680527,IT
-624680528,624680735,FR
-624680736,624680743,IT
-624680744,624680747,NL
-624680748,624680895,FR
-624680896,624680927,ES
-624680928,624680931,FR
+624679848,624680839,FR
+624680840,624680847,NL
+624680848,624680931,FR
 624680932,624680935,NL
-624680936,624681095,FR
-624681096,624681103,NL
-624681104,624681279,FR
-624681280,624681295,GB
-624681296,624681327,FR
-624681328,624681331,CH
-624681332,624681335,PL
-624681336,624681351,FR
+624680936,624681351,FR
 624681352,624681359,NL
-624681360,624681439,FR
-624681440,624681447,CH
-624681448,624681451,DE
-624681452,624681807,FR
+624681360,624681807,FR
 624681808,624681823,BE
-624681824,624681967,FR
-624681968,624681983,ES
-624681984,624681999,IT
-624682000,624682111,FR
-624682112,624682127,IT
-624682128,624682795,FR
-624682796,624682799,NL
-624682800,624683067,FR
-624683068,624683071,GB
-624683072,624683199,FR
-624683200,624683215,ES
-624683216,624683231,DE
-624683232,624683295,FR
-624683296,624683311,ES
-624683312,624683519,FR
-624683520,624683583,GB
-624683584,624683679,FR
-624683680,624683687,GB
-624683688,624683775,FR
+624681824,624682495,FR
+624682496,624682527,ES
+624682528,624683295,FR
+624683296,624683311,DE
+624683312,624683775,FR
 624683776,624683779,DE
 624683780,624683783,FR
 624683784,624683787,DE
-624683788,624683791,PL
-624683792,624683815,FR
-624683816,624683823,PL
-624683824,624683887,FR
-624683888,624683903,GB
-624683904,624683935,FR
-624683936,624683943,DE
-624683944,624683975,FR
+624683788,624683975,FR
 624683976,624683983,GB
-624683984,624683991,FR
-624683992,624683999,IT
-624684000,624684103,FR
-624684104,624684111,FI
-624684112,624684175,FR
-624684176,624684183,GB
+624683984,624684043,FR
+624684044,624684047,PT
+624684048,624684183,FR
 624684184,624684191,IT
 624684192,624684199,FR
 624684200,624684203,IT
 624684204,624684207,FR
 624684208,624684211,ES
-624684212,624684287,FR
-624684288,624684303,IT
-624684304,624684511,FR
-624684512,624684543,NL
-624684544,624684671,FR
-624684672,624684679,DE
-624684680,624684735,FR
-624684736,624684767,GB
-624684768,624684775,ES
-624684776,624684799,FR
+624684212,624684799,FR
 624684800,624684803,DE
-624684804,624684831,FR
-624684832,624684847,DE
-624684848,624685055,FR
-624685056,624685059,GB
-624685060,624685063,FI
-624685064,624685215,FR
-624685216,624685219,GB
-624685220,624685263,FR
-624685264,624685279,BE
-624685280,624685311,DE
-624685312,624685503,FR
-624685504,624685535,BE
+624684804,624685535,FR
 624685536,624685539,PT
-624685540,624685559,FR
-624685560,624685567,PT
-624685568,624685711,FR
+624685540,624685711,FR
 624685712,624685715,ES
-624685716,624685775,FR
-624685776,624685791,DE
-624685792,624685799,FR
+624685716,624685799,FR
 624685800,624685803,ES
 624685804,624685919,FR
 624685920,624685923,ES
 624685924,624685943,FR
 624685944,624685947,IT
-624685948,624685951,GB
-624685952,624685983,FR
-624685984,624685987,IT
-624685988,624686207,FR
-624686208,624686239,GB
-624686240,624686271,FR
-624686272,624686303,GB
-624686304,624686335,IE
-624686336,624686627,FR
+624685948,624686627,FR
 624686628,624686631,ES
 624686632,624686667,FR
 624686668,624686671,ES
-624686672,624686687,GB
-624686688,624686711,FR
+624686672,624686711,FR
 624686712,624686715,ES
-624686716,624686719,FR
-624686720,624686735,NL
-624686736,624686911,FR
-624686912,624686975,GB
-624686976,624687055,FR
-624687056,624687071,IE
-624687072,624687343,FR
+624686716,624687343,FR
 624687344,624687346,CZ
 624687347,624687347,ES
-624687348,624687615,FR
-624687616,624687619,BE
-624687620,624687623,FR
-624687624,624687627,GB
-624687628,624687827,FR
+624687348,624687827,FR
 624687828,624687831,ES
-624687832,624687967,FR
-624687968,624687983,IT
-624687984,624688007,FR
+624687832,624688007,FR
 624688008,624688015,ES
-624688016,624688127,FR
-624688128,624688143,PT
-624688144,624688287,FR
-624688288,624688303,PL
-624688304,624688307,FR
+624688016,624688307,FR
 624688308,624688311,ES
-624688312,624688319,FR
-624688320,624688327,FI
-624688328,624688335,PL
-624688336,624688487,FR
+624688312,624688487,FR
 624688488,624688491,ES
 624688492,624688639,FR
 624688640,624688643,ES
-624688644,624688671,FR
-624688672,624688687,PL
-624688688,624688691,FR
+624688644,624688691,FR
 624688692,624688695,ES
-624688696,624688723,FR
-624688724,624688727,CH
-624688728,624688779,FR
+624688696,624688779,FR
 624688780,624688783,ES
 624688784,624688791,FR
 624688792,624688795,ES
 624688796,624688831,FR
 624688832,624688835,ES
-624688836,624688839,FR
-624688840,624688847,ES
-624688848,624688863,FR
-624688864,624688895,ES
-624688896,624688999,FR
-624689000,624689007,ES
-624689008,624689055,FR
-624689056,624689063,ES
-624689064,624689075,FR
-624689076,624689076,ES
+624688836,624689076,FR
 624689077,624689078,BE
-624689079,624689079,ES
-624689080,624689119,FR
-624689120,624689123,GB
-624689124,624689151,FR
+624689079,624689151,FR
 624689152,624691199,DE
 624691200,624693247,FR
 624693248,624695295,RU
@@ -5953,7 +4604,7 @@
 624799744,624801791,RU
 624801792,624803839,AT
 624803840,624812031,DE
-624812032,624813055,BO
+624812032,624813055,US
 624813056,624814079,IL
 624814080,624816127,GB
 624816128,624818175,FR
@@ -6031,9 +4682,8 @@
 625860608,625868799,CZ
 625868800,625999871,RU
 625999872,627048447,DE
-627048448,627113983,DK
-627113984,627138559,RO
-627138560,627142655,FR
+627048448,627130367,DK
+627130368,627142655,FR
 627142656,627145727,RO
 627145728,627146751,ES
 627146752,627179519,NL
@@ -6095,7 +4745,6 @@
 628801536,628803583,GB
 628803584,628805631,FR
 628805632,628807679,GB
-628807680,628809727,AE
 628809728,628813823,TR
 628813824,628815871,DK
 628815872,628817919,GB
@@ -6163,9 +4812,7 @@
 629866496,629874687,NL
 629874688,629879807,RU
 629879808,629880063,DE
-629880064,629880831,RU
-629880832,629881855,EE
-629881856,629882879,DE
+629880064,629882879,RU
 629882880,629883135,GB
 629883136,629883391,AU
 629883392,629883903,EU
@@ -6252,22 +4899,36 @@
 630806528,630808575,ES
 630808576,630810623,NL
 630810624,630816767,CH
-630816768,630833151,RO
+630816768,630818303,RO
+630818304,630818559,SG
+630818560,630829055,RO
+630829056,630833151,IR
 630833152,630849535,NL
 630849536,630980607,TR
 630980608,630981631,MD
-630981632,630982655,RO
+630981632,630982143,RO
+630982144,630982399,SG
+630982400,630982655,RO
 630982656,630984703,MD
 630984704,630988799,IR
-630988800,630998271,RO
+630988800,630992895,RO
+630992896,630996991,IR
+630996992,630998271,RO
 630998272,630998783,MD
 630998784,631001087,RO
 631001088,631005183,MD
-631005184,631006207,RO
+631005184,631006207,IT
 631006208,631007231,MD
 631007232,631017471,RO
 631017472,631018495,MD
-631018496,631039999,RO
+631018496,631019519,IT
+631019520,631021567,IR
+631021568,631023615,RO
+631023616,631024639,IT
+631024640,631029759,RO
+631029760,631033855,SE
+631033856,631034879,IT
+631034880,631039999,RO
 631040000,631043071,MD
 631043072,631044095,RO
 631044096,631045119,MD
@@ -6300,27 +4961,14 @@
 632946688,632963071,AT
 632963072,632979455,AM
 632979456,633012223,IT
-633012224,633059583,FR
-633059584,633059615,ES
-633059616,633059647,DE
-633059648,633059839,FR
-633059840,633059871,IT
-633059872,633060031,FR
-633060032,633060159,IT
-633060160,633060223,FR
-633060224,633060287,GB
-633060288,633060511,FR
-633060512,633060543,DE
-633060544,633060607,BE
-633060608,633061119,FR
-633061120,633061247,IT
-633061248,633061311,NL
-633061312,633061375,DE
-633061376,633063679,FR
+633012224,633059983,FR
+633059984,633059987,GB
+633059988,633063679,FR
 633063680,633063935,PL
 633063936,633064191,FR
 633064192,633064447,GB
-633064448,633065727,FR
+633064448,633065471,FR
+633065472,633065727,GB
 633065728,633065983,DE
 633065984,633066239,FR
 633066240,633066495,ES
@@ -6359,8 +5007,7 @@
 634001408,634003455,NO
 634003456,634007551,PL
 634007552,634009599,TR
-634009600,634010623,NO
-634010624,634011647,RU
+634009600,634011647,NO
 634011648,634028031,JO
 634028032,634060799,RO
 634060800,634068991,UA
@@ -6379,9 +5026,7 @@
 634124288,634126335,CH
 634126336,634191871,RU
 634191872,634193919,TR
-634193920,634194687,SK
-634194688,634194815,CZ
-634194816,634195967,SK
+634193920,634195967,CZ
 634195968,634198015,RU
 634198016,634200063,BA
 634200064,634202111,IS
@@ -6465,7 +5110,9 @@
 635201088,635201095,IT
 635201096,635201159,GB
 635201160,635201167,IT
-635201168,635201455,GB
+635201168,635201407,GB
+635201408,635201415,IT
+635201416,635201455,GB
 635201456,635201463,IT
 635201464,635203583,GB
 635203584,635207679,JO
@@ -6480,7 +5127,9 @@
 635281408,635283455,RO
 635283456,635283967,DE
 635283968,635284223,RO
-635284224,635284479,DE
+635284224,635284418,DE
+635284419,635284419,RO
+635284420,635284479,DE
 635284480,635284991,A1
 635284992,635285503,US
 635285504,635287551,ME
@@ -6493,7 +5142,7 @@
 635299840,635301887,ES
 635301888,635305983,CZ
 635305984,635437055,NL
-635437056,635502591,RO
+635437056,635502591,SA
 635502592,635568127,PL
 635568128,635699199,IT
 635699200,635715583,PL
@@ -6513,9 +5162,7 @@
 635856896,635858943,TR
 635858944,635860991,RU
 635860992,635863039,BE
-635863040,635889663,RU
-635889664,635891711,NG
-635891712,635895807,RU
+635863040,635895807,RU
 635895808,635961343,KW
 635961344,635994111,GE
 635994112,636026879,RU
@@ -6545,7 +5192,11 @@
 636176384,636178431,TR
 636178432,636180479,NL
 636180480,636182527,FR
-636182528,636186623,CZ
+636182528,636185087,CZ
+636185088,636185343,SE
+636185344,636186111,US
+636186112,636186367,FR
+636186368,636186623,ES
 636186624,636188671,NL
 636188672,636190719,GB
 636190720,636223487,RU
@@ -6796,9 +5447,13 @@
 645873664,645874431,CA
 645874432,645875967,US
 645875968,645876735,CA
-645876736,645989450,US
+645876736,645984255,US
+645984256,645988351,CA
+645988352,645989450,US
 645989451,645989451,CA
-645989452,654311423,US
+645989452,646160383,US
+646160384,646162431,CA
+646162432,654311423,US
 654311424,654311679,CN
 654311680,654311935,AU
 654311936,654376959,CN
@@ -6809,7 +5464,8 @@
 655360000,656408575,KR
 656408576,658505727,PK
 658505728,660602879,CN
-660602880,661520383,HK
+660602880,661487615,HK
+661487616,661520383,SG
 661520384,661651455,JP
 661651456,662700031,KR
 662700032,666894335,CN
@@ -6928,7 +5584,6 @@
 692893696,692895743,KE
 692895744,692897791,NG
 692897792,692905983,ZA
-692905984,692908031,ZW
 692908032,692910079,BW
 692910080,692912127,NG
 692912128,692914175,ZM
@@ -6982,7 +5637,9 @@
 692999168,693000191,SL
 693000192,693001215,NG
 693001216,693002239,BW
-693002240,693003263,GA
+693002240,693002505,GA
+693002506,693002506,CM
+693002507,693003263,GA
 693003264,693004287,NG
 693004288,693005311,CD
 693005312,693006335,SD
@@ -7601,7 +6258,9 @@
 711166464,711166591,HK
 711166592,711169311,JP
 711169312,711169327,IN
-711169328,711196671,JP
+711169328,711173119,JP
+711173120,711173375,SG
+711173376,711196671,JP
 711196672,711458815,CN
 711458816,711983103,IN
 711983104,712507391,VN
@@ -7625,69 +6284,831 @@
 717881344,720437247,CN
 720437248,720502783,AU
 720502784,721420287,CN
-721420288,737206271,JP
-737206272,737207295,ID
-737207296,737221631,JP
-737221632,737222655,IN
-737222656,737247231,JP
-737247232,737249279,IN
-737249280,737479679,JP
+721420288,736100351,JP
+736100352,736101375,IN
+736101376,736102399,HK
+736102400,736103423,IN
+736103424,736104447,CN
+736104448,736105471,ID
+736105472,736106495,TW
+736106496,736107519,CN
+736107520,736108543,HK
+736108544,736109567,JP
+736109568,736110591,LA
+736110592,736111615,MM
+736111616,736112639,CN
+736112640,736113663,HK
+736113664,736115711,CN
+736115712,736116735,AU
+736116736,736119807,CN
+736119808,736120831,AU
+736120832,736121855,CN
+736121856,736122879,MM
+736122880,736123903,MY
+736123904,736124927,HK
+736124928,736125951,IN
+736125952,736126975,CN
+736126976,736127999,KR
+736128000,736131071,BD
+736131072,736132095,NZ
+736132096,736133119,LK
+736133120,736136191,IN
+736136192,736138239,CN
+736138240,736139263,HK
+736139264,736140287,SG
+736140288,736141311,IN
+736141312,736142335,CN
+736142336,736143359,IN
+736143360,736144383,ID
+736144384,736145407,IN
+736145408,736146431,CN
+736146432,736147455,IN
+736147456,736148479,CN
+736148480,736149503,NZ
+736149504,736150527,NC
+736150528,736151551,HK
+736151552,736156671,CN
+736156672,736157695,IN
+736157696,736158719,CN
+736158720,736160767,HK
+736160768,736161791,PK
+736161792,736162815,CN
+736162816,736163839,HK
+736163840,736164351,TW
+736164352,736164863,NZ
+736164864,736166911,IN
+736166912,736167935,SG
+736167936,736168959,HK
+736168960,736169983,AU
+736169984,736173055,IN
+736173056,736174079,HK
+736174080,736175103,AU
+736175104,736176127,MY
+736176128,736177151,BN
+736177152,736178175,HK
+736178176,736179199,AU
+736179200,736180223,IN
+736180224,736181247,HK
+736181248,736182271,AU
+736182272,736183295,ID
+736183296,736185343,IN
+736185344,736186367,CN
+736186368,736187391,IN
+736187392,736188415,CN
+736188416,736189439,JP
+736189440,736190463,IN
+736190464,736191487,PK
+736191488,736193535,HK
+736193536,736194559,MY
+736194560,736195583,AU
+736195584,736196607,IN
+736196608,736198655,CN
+736198656,736199679,AU
+736199680,736200703,HK
+736200704,736201727,BN
+736201728,736202751,CN
+736202752,736203775,AU
+736203776,736204799,BD
+736204800,736205823,SG
+736205824,736206847,JP
+736206848,736209919,IN
+736209920,736210943,CN
+736210944,736211967,AU
+736211968,736214015,CN
+736214016,736216063,IN
+736216064,736217087,HK
+736217088,736218111,NZ
+736218112,736219135,BD
+736219136,736220159,CN
+736220160,736221183,IN
+736221184,736229375,CN
+736229376,736230399,IN
+736230400,736231423,CN
+736231424,736231935,AU
+736231936,736232447,IN
+736232448,736233471,HK
+736233472,736234495,NZ
+736234496,736235519,KH
+736235520,736237567,HK
+736237568,736239615,IN
+736239616,736263167,CN
+736263168,736264191,HK
+736264192,736286719,CN
+736286720,736287743,NZ
+736287744,736288767,MV
+736288768,736289791,MY
+736289792,736289919,KR
+736289920,736290047,JP
+736290048,736290815,HK
+736290816,736291839,TW
+736291840,736300031,CN
+736300032,736301055,HK
+736301056,736303103,IN
+736303104,736304127,TW
+736304128,736324607,CN
+736324608,736325631,AU
+736325632,736326655,HK
+736326656,736328703,KR
+736328704,736329727,AU
+736329728,736331775,IN
+736331776,736334847,CN
+736334848,736335871,ID
+736335872,736344063,CN
+736344064,736345087,IN
+736345088,736354303,CN
+736354304,736355327,IN
+736355328,736356351,SG
+736356352,736357375,CN
+736357376,736358399,HK
+736358400,736359423,SG
+736359424,736360447,IN
+736360448,736380927,CN
+736380928,736381951,IN
+736381952,736382975,CN
+736382976,736383999,TH
+736384000,736385023,LA
+736385024,736386047,HK
+736386048,736388095,IN
+736388096,736389119,CN
+736389120,736390143,JP
+736390144,736391167,LK
+736391168,736392191,IN
+736392192,736394239,CN
+736394240,736395263,HK
+736395264,736396287,MN
+736396288,736398335,CN
+736398336,736400383,IN
+736400384,736402431,CN
+736402432,736403455,PK
+736403456,736404479,KR
+736404480,736408575,IN
+736408576,736409599,CN
+736409600,736410623,NZ
+736410624,736411647,CN
+736411648,736412671,NP
+736412672,736413695,TH
+736413696,736414719,HK
+736414720,736415743,CN
+736415744,736416767,BD
+736416768,736417791,SG
+736417792,736418815,HK
+736418816,736421887,IN
+736421888,736422911,SG
+736422912,736423935,IN
+736423936,736424959,CN
+736424960,736425983,JP
+736425984,736428031,MY
+736428032,736429055,IN
+736429056,736430079,HK
+736430080,736431103,IN
+736431104,736432127,BD
+736432128,736433151,CN
+736433152,736434175,ID
+736434176,736435199,IN
+736435200,736436223,HK
+736436224,736437247,JP
+736437248,736438271,HK
+736438272,736439295,CN
+736439296,736440319,TH
+736440320,736441343,CN
+736441344,736442367,HK
+736442368,736443391,CN
+736443392,736445439,AU
+736445440,736446463,JP
+736446464,736447487,IN
+736447488,736448511,TH
+736448512,736449535,IN
+736449536,736450559,SG
+736450560,736452607,IN
+736452608,736453631,CN
+736453632,736455679,IN
+736455680,736456703,CN
+736456704,736458751,HK
+736458752,736459775,CN
+736459776,736460799,JP
+736460800,736461823,SG
+736461824,736462847,TH
+736462848,736465919,CN
+736465920,736466943,TH
+736466944,736467967,HK
+736467968,736468991,SG
+736468992,736470015,IN
+736470016,736471039,JP
+736471040,736479231,CN
+736479232,736480255,IN
+736480256,736481279,ID
+736481280,736482303,BD
+736482304,736483327,HK
+736483328,736485375,CN
+736485376,736486399,IN
+736486400,736487423,NP
+736487424,736489471,CN
+736489472,736491519,JP
+736491520,736493567,ID
+736493568,736494591,KR
+736494592,736495103,ID
+736495616,736498687,HK
+736498688,736499711,CN
+736499712,736500735,SG
+736500736,736501759,JP
+736501760,736502783,CN
+736502784,736505855,IN
+736505856,736506879,AU
+736506880,736508927,JP
+736508928,736509951,BD
+736509952,736510975,AU
+736510976,736513023,CN
+736513024,736515071,KR
+736624640,736886783,JP
+736886784,737149951,CN
+737149952,737151999,IN
+737152000,737154047,HK
+737154048,737155071,MY
+737155072,737156095,TW
+737156096,737157119,HK
+737157120,737158143,NZ
+737158144,737159167,HK
+737159168,737160191,AU
+737160192,737161215,TW
+737161216,737162239,CN
+737162240,737163263,BD
+737163264,737165311,CN
+737165312,737166335,IN
+737166336,737169407,CN
+737169408,737170431,ID
+737170432,737171455,CN
+737171456,737172479,GU
+737172480,737173503,HK
+737173504,737174527,AU
+737174528,737175551,BD
+737175552,737177599,TW
+737177600,737178623,IN
+737178624,737179647,HK
+737179648,737180671,AU
+737180672,737184767,CN
+737184768,737185791,VU
+737185792,737186815,AU
+737186816,737187839,ID
+737187840,737188863,TW
+737188864,737206271,CN
+737206272,737208319,ID
+737208320,737209343,AU
+737209344,737220607,CN
+737220608,737222655,IN
+737222656,737223679,TW
+737223680,737225727,IN
+737225728,737226751,HK
+737226752,737227775,CN
+737227776,737228799,AU
+737228800,737229823,TH
+737229824,737232895,IN
+737232896,737233919,HK
+737233920,737239039,CN
+737239040,737240063,MY
+737240064,737241087,HK
+737241088,737243135,KR
+737243136,737244159,CN
+737244160,737249279,IN
+737249280,737250303,BT
+737250304,737253375,IN
+737253376,737255423,HK
+737255424,737256447,TW
+737256448,737257471,WS
+737257472,737262591,CN
+737262592,737263615,AU
+737263616,737264639,IN
+737264640,737265663,CN
+737265664,737266687,AU
+737266688,737267711,HK
+737267712,737276927,CN
+737276928,737277951,IN
+737277952,737279999,CN
+737280000,737281023,HK
+737281024,737282047,SG
+737282048,737288191,CN
+737288192,737289215,HK
+737289216,737290239,IN
+737290240,737291263,AU
+737291264,737297407,CN
+737297408,737298431,AU
+737298432,737305599,CN
+737305600,737306623,PK
+737306624,737307647,IN
+737307648,737308671,HK
+737308672,737309695,KR
+737309696,737312767,IN
+737312768,737313791,HK
+737313792,737315839,JP
+737315840,737316863,HK
+737316864,737324031,CN
+737324032,737325055,HK
+737325056,737326079,PK
+737326080,737327103,CN
+737327104,737328127,SG
+737328128,737331199,CN
+737331200,737332223,HK
+737332224,737333247,CN
+737333248,737335295,IN
+737335296,737337343,CN
+737337344,737339391,IN
+737339392,737341439,HK
+737341440,737342463,MN
+737342464,737344511,IN
+737344512,737345535,CN
+737345536,737346559,AU
+737346560,737350655,CN
+737350656,737350911,AU
+737350912,737351679,NZ
+737351680,737352703,CN
+737352704,737354751,HK
+737354752,737355775,IN
+737355776,737359871,HK
+737359872,737361919,NZ
+737361920,737364991,HK
+737364992,737368063,IN
+737368064,737369087,CN
+737369088,737370111,HK
+737370112,737371135,NP
+737371136,737375231,HK
+737375232,737376255,AU
+737376256,737377279,HK
+737377280,737378303,PH
+737378304,737379327,CN
+737380352,737381375,CN
+737381376,737382399,ID
+737382400,737384447,CN
+737384448,737385471,ID
+737385472,737386495,CN
+737386496,737387519,MN
+737387520,737388543,HK
+737388544,737389567,CN
+737389568,737390591,IN
+737390592,737391615,HK
+737391616,737392639,CN
+737392640,737393663,ID
+737393664,737394687,CN
+737394688,737395711,HK
+737395712,737396735,NZ
+737396736,737397759,AU
+737397760,737398783,BD
+737398784,737399807,HK
+737399808,737400831,IN
+737400832,737401855,KR
+737401856,737403903,HK
+737403904,737405951,CN
+737405952,737406975,AU
+737406976,737407999,HK
+737408000,737409023,CN
+737409024,737410047,HK
+737410048,737411071,TW
+737411072,737476607,JP
+737476608,737478655,IN
+737478656,737479679,PK
 737479680,737480703,IN
-737480704,737488895,JP
+737480704,737481727,SG
+737481728,737482751,IN
+737482752,737484799,AU
+737484800,737485823,KH
+737485824,737487871,AU
+737487872,737488895,MM
 737488896,737489151,AU
-737489152,737490943,JP
+737489152,737489919,HK
+737489920,737490943,NZ
 737490944,737491967,FJ
-737491968,737502207,JP
+737491968,737492447,SG
+737492448,737492479,MY
+737492480,737492735,SG
+737492736,737492991,HK
+737492992,737497087,AU
+737497088,737498111,NZ
+737498112,737499135,NP
+737499136,737500159,IN
+737500160,737501183,NP
+737501184,737502207,SG
 737502208,737503231,IN
-737503232,737507327,JP
+737503232,737505279,SG
+737505280,737506303,AU
+737506304,737507327,BD
 737507328,737508351,AU
-737508352,737509872,JP
-737509873,737509873,PK
-737509874,737511423,JP
+737508352,737509375,MY
+737509376,737510399,PK
+737510400,737511423,AU
 737511424,737512447,IN
-737512448,737514495,JP
+737512448,737513471,BD
+737513472,737514495,TH
 737514496,737515519,IN
-737515520,737516543,JP
+737515520,737516543,AU
 737516544,737517567,IN
 737517568,737517823,AU
 737517824,737518079,NZ
-737518080,737518335,AU
-737518336,737526783,JP
+737518080,737520639,AU
+737520640,737521663,NZ
+737521664,737522687,AU
+737522688,737525759,ID
+737525760,737526783,BD
 737526784,737527295,US
 737527296,737527551,SG
 737527552,737527807,ID
-737527808,737529855,JP
+737527808,737528831,KH
+737528832,737529855,PK
 737529856,737530879,IN
-737530880,737538047,JP
+737530880,737531903,NC
+737531904,737532927,KH
+737532928,737533951,PK
+737533952,737534975,AU
+737534976,737535999,SG
+737536000,737537023,BD
+737537024,737538047,NP
 737538048,737539071,NZ
-737539072,737644644,JP
-737644645,737644645,IN
-737644646,737941503,JP
+737539072,737540095,BD
+737540096,737541119,ID
+737541120,737542143,SG
+737542144,737574911,CN
+737607680,737608703,HK
+737608704,737610751,CN
+737610752,737611775,ID
+737611776,737612799,PH
+737612800,737613823,ID
+737613824,737614847,MO
+737614848,737615871,IN
+737615872,737617919,ID
+737617920,737618943,IN
+737618944,737620991,CN
+737620992,737622015,IN
+737622016,737623039,TH
+737623040,737624063,GU
+737624064,737625087,AU
+737625088,737626111,CN
+737626112,737627135,JP
+737627136,737628159,CN
+737628160,737629183,AU
+737629184,737634303,CN
+737634304,737635327,KR
+737635328,737637375,CN
+737637376,737638399,AU
+737638400,737639423,PK
+737639424,737640447,NZ
+737640448,737641471,AU
+737641472,737642495,HK
+737642496,737645567,IN
+737645568,737647615,CN
+737647616,737649663,IN
+737649664,737650687,HK
+737650688,737651711,JP
+737651712,737652735,NZ
+737652736,737656831,CN
+737656832,737657855,KR
+737657856,737675263,CN
+737675264,737676287,HK
+737676288,737677311,PK
+737677312,737678335,TW
+737678336,737679359,CN
+737679360,737680383,ID
+737680384,737681407,CN
+737681408,737683455,IN
+737683456,737685503,JP
+737685504,737686527,CN
+737686528,737687551,AU
+737687552,737688575,CN
+737688576,737690623,HK
+737690624,737692671,IN
+737692672,737712127,CN
+737712128,737713151,IN
+737713152,737714175,FM
+737714176,737715199,JP
+737715200,737718271,HK
+737718272,737727487,CN
+737727488,737728511,AU
+737728512,737729535,JP
+737729536,737730559,IN
+737730560,737731583,HK
+737731584,737733631,CN
+737733632,737735679,IN
+737735680,737736703,CN
+737736704,737737727,HK
+737737728,737738751,IN
+737738752,737741823,CN
+737741824,737742847,SG
+737742848,737744895,HK
+737744896,737745919,CN
+737745920,737746943,HK
+737746944,737747967,TH
+737747968,737748991,SG
+737748992,737750015,AF
+737750016,737751039,JP
+737751040,737753087,IN
+737753088,737757183,TH
+737757184,737758207,NZ
+737758208,737760255,HK
+737760256,737761279,IN
+737761280,737762303,HK
+737762304,737763327,AU
+737763328,737765375,HK
+737765376,737768447,TH
+737768448,737769471,AU
+737769472,737770495,CN
+737770496,737771519,HK
+737771520,737771647,KR
+737771648,737771775,JP
+737771776,737771903,KR
+737771904,737772159,JP
+737772160,737772287,KR
+737772288,737772415,JP
+737772416,737772543,KR
+737772544,737774591,CN
+737774592,737775615,ID
+737775616,737782783,CN
+737782784,737783807,HK
+737783808,737784831,PF
+737784832,737787903,IN
+737787904,737788927,CN
+737788928,737790975,NZ
+737790976,737791999,HK
+737792000,737793023,ID
+737793024,737794047,SG
+737794048,737795071,IN
+737795072,737796095,HK
+737796096,737799167,IN
+737799168,737800191,CN
+737800192,737802239,JP
+737802240,737803263,SG
+737803264,737804287,HK
+737804288,737805311,SG
+737805312,737806335,CN
+737806336,737807359,HK
+737807360,737810431,CN
+737810432,737811455,AU
+737811456,737814527,CN
+737814528,737815551,IN
+737815552,737816575,TW
+737816576,737817599,HK
+737817600,737818623,AU
+737818624,737821695,HK
+737821696,737822719,AU
+737822720,737823743,CN
+737823744,737824767,IN
+737824768,737825791,BD
+737825792,737826815,PK
+737826816,737827839,JP
+737827840,737828863,AU
+737828864,737835007,CN
+737835008,737836031,IN
+737836032,737837055,MN
+737837056,737838079,CN
+737838080,737839103,IN
+737839104,737840127,AF
+737840128,737841151,AU
+737841152,737843199,CN
+737843200,737844223,KR
+737844224,737845247,IN
+737845248,737846271,CN
+737846272,737847295,IN
+737847296,737850367,CN
+737850368,737851391,IN
+737851392,737853439,HK
+737853440,737854463,SG
+737854464,737855487,JP
+737855488,737856511,CN
+737856512,737857535,AU
+737857536,737858559,IN
+737858560,737861631,CN
+737861632,737862655,PH
+737862656,737863679,JP
+737863680,737864447,AU
+737864448,737864703,HK
+737864704,737865727,CN
+737865728,737866751,LK
+737866752,737867775,CN
+737867776,737868799,AU
+737868800,737870847,IN
+737870848,737874431,CN
+737874432,737874943,IN
+737874944,737876991,HK
+737876992,737878015,KR
+737878016,737879039,HK
+737879040,737880063,CN
+737880064,737881087,AU
+737881088,737882111,HK
+737882112,737883135,JP
+737883136,737884159,AU
+737884160,737886207,TW
+737886208,737887231,SG
+737887232,737888255,KR
+737888256,737889279,IN
+737889280,737890303,HK
+737890304,737894399,IN
+737894400,737895423,ID
+737895424,737896447,IN
+737896448,737897471,HK
+737897472,737898495,AU
+737898496,737899519,MY
+737899520,737900543,CN
+737900544,737901567,KR
+737901568,737902591,IN
+737902592,737903615,BN
+737903616,737904639,HK
+737904640,737905663,MY
+737905664,737906687,HK
+737906688,737908735,IN
+737908736,737909759,AU
+737909760,737910783,MY
+737910784,737911807,HK
+737911808,737912063,SG
+737912064,737912831,AU
+737912832,737915903,IN
+737915904,737916927,TW
+737916928,737917951,JP
+737917952,737918975,IN
+737918976,737919999,CN
+737920000,737921023,HK
+737921024,737922047,AU
+737922048,737923071,KR
+737923072,737924095,MY
+737924096,737927167,IN
+737927168,737929215,HK
+737929216,737931263,CN
+737931264,737932287,AU
+737932288,737933311,CN
+737933312,737934335,HK
+737934336,737935359,TH
+737935360,737936383,AU
+737936384,737937407,IN
+737937408,737938431,ID
+737938432,737939455,LK
+737939456,737940479,KH
+737940480,737941503,AU
 737941504,737944575,IN
-737944576,737950719,JP
+737944576,737945599,MY
+737945600,737946623,HK
+737946624,737947647,MY
+737947648,737948671,CN
+737948672,737949695,HK
+737949696,737950719,CN
 737950720,737951743,IN
-737951744,737958911,JP
-737958912,737959935,IN
-737959936,737965055,JP
+737951744,737953791,NZ
+737953792,737954815,ID
+737954816,737955839,AU
+737955840,737956863,IN
+737956864,737957887,HK
+737957888,737959935,IN
+737959936,737960959,AU
+737960960,737961983,IN
+737961984,737963007,ID
+737963008,737965055,AU
 737965056,737966079,IN
-737966080,737967103,JP
-737967104,737968127,AU
-737968128,737972223,JP
-737972224,737972735,ID
-737972736,737987583,JP
+737966080,737967103,TH
+737967104,737969151,AU
+737969152,737970175,HK
+737970176,737971199,ID
+737971200,737972223,IN
+737972224,737973247,ID
+737973248,737974271,HK
+737974272,737975295,IN
+737975296,737976319,ID
+737976320,737981439,HK
+737981440,737982463,IN
+737982464,737983487,ID
+737983488,737986559,IN
+737986560,737987583,HK
 737987584,737988607,IN
-737988608,737991679,JP
+737988608,737989631,HK
+737989632,737991679,MY
 737991680,737992191,IN
-737992192,737999320,JP
-737999321,737999321,IN
-737999322,738160639,JP
+737992192,737992703,ID
+737992704,737993727,CN
+737993728,737994751,HK
+737994752,737995775,MY
+737995776,737996799,ID
+737996800,737997823,IN
+737997824,737998847,LA
+737998848,737999871,IN
+737999872,738000895,AU
+738000896,738066431,JP
+738066432,738069503,CN
+738069504,738070527,PK
+738070528,738071551,TW
+738071552,738072575,NZ
+738072576,738073599,CN
+738073600,738075647,IN
+738075648,738076671,CN
+738076672,738077695,IN
+738077696,738078719,CN
+738078720,738079743,IN
+738079744,738080767,CN
+738080768,738081791,TL
+738081792,738082815,WS
+738082816,738083839,CN
+738083840,738084863,ID
+738084864,738085887,CN
+738085888,738086911,MY
+738086912,738087935,ID
+738087936,738091007,CN
+738091008,738092031,BD
+738092032,738094079,CN
+738094080,738095103,IN
+738095104,738097151,CN
+738097152,738098175,MY
+738098176,738099199,ID
+738099200,738100223,CN
+738100224,738101247,TH
+738101248,738107391,CN
+738107392,738108415,IN
+738108416,738109439,HK
+738109440,738111487,CN
+738111488,738112511,IN
+738112512,738118655,CN
+738118656,738119679,IN
+738119680,738120703,CN
+738120704,738121727,IN
+738121728,738122751,HK
+738122752,738128895,CN
+738128896,738129919,KR
+738129920,738135039,CN
+738135040,738136063,TW
+738136064,738137087,CN
+738137088,738138111,BD
+738138112,738139135,NZ
+738139136,738140159,SG
+738140160,738141183,AU
+738141184,738142207,HK
+738142208,738143231,JP
+738143232,738144255,AU
+738144256,738145279,CN
+738145280,738146303,HK
+738146304,738147327,IN
+738147328,738152447,CN
+738152448,738153471,HK
+738153472,738154495,CN
+738154496,738156543,TW
+738156544,738157567,CN
+738157568,738158591,SG
+738158592,738159615,HK
+738159616,738160639,CN
 738160640,738161663,KH
-738161664,738173951,JP
+738161664,738163711,HK
+738163712,738164735,SG
+738164736,738165759,AU
+738165760,738166783,IN
+738166784,738167807,AU
+738167808,738168831,IN
+738168832,738169855,CN
+738169856,738170879,TO
+738170880,738171903,SG
+738171904,738172927,HK
+738172928,738173951,NZ
 738173952,738174975,IN
-738174976,738197503,JP
+738174976,738175999,CN
+738176000,738177023,MY
+738177024,738178047,CN
+738178048,738179071,TW
+738179072,738180095,CN
+738180096,738181119,HK
+738181120,738182143,CN
+738182144,738183167,ID
+738183168,738187263,CN
+738187264,738188287,PH
+738188288,738189311,IN
+738189312,738192383,CN
+738192384,738193407,NC
+738193408,738194431,TH
+738194432,738195455,CN
+738195456,738197503,KR
 738197504,746717183,US
 746717184,746782719,DE
-746782720,755105791,US
+746782720,747175935,US
+747175936,747241471,NL
+747241472,757071871,US
+757989376,758775807,US
+758784000,758792191,US
+758841344,758874367,US
+758874368,758874623,AM
+758874624,758875903,US
+758875904,758876159,AZ
+758876160,758877439,US
+758877440,758877695,KZ
+758877696,758878975,US
+758878976,758879231,KG
+758879232,758880511,US
+758880512,758880767,UZ
+758880768,758882047,US
+758882048,758882303,TM
+758882304,758883583,US
+758883584,758883839,TJ
+758883840,758885119,US
+758885120,758885375,CN
+758885376,758886655,US
+758886656,758886911,DZ
+758886912,758888191,US
+758888192,758888447,LY
+758888448,758889727,US
+758889728,758889983,TN
+758889984,758972415,US
+758972416,758976511,CA
+758976512,758984703,US
+758984704,758988799,CA
+758988800,759054335,US
+759054336,759062527,CA
+759103488,759169023,US
 759169024,759171071,ID
 759171072,759174143,IN
 759174144,759175167,MO
@@ -7742,7 +7163,8 @@
 759235584,759236607,NZ
 759236608,759237631,IN
 759237632,759238655,AU
-763363328,771751935,UY
+761266176,761790463,EG
+767557632,768606207,SC
 771751936,771817471,RU
 771817472,771948543,TR
 771948544,772014079,RU
@@ -7790,15 +7212,11 @@
 772841472,772843519,GB
 772843520,772845567,IT
 772845568,772847615,RU
-772847616,772848103,NL
-772848104,772848111,US
-772848112,772848191,NL
+772847616,772848191,NL
 772848192,772848223,US
 772848224,772848871,NL
 772848872,772848879,US
-772848880,772849231,NL
-772849232,772849247,MY
-772849248,772849255,NL
+772848880,772849255,NL
 772849256,772849263,US
 772849264,772849271,NL
 772849272,772849279,US
@@ -7931,9 +7349,7 @@
 773140480,773144575,CY
 773144576,773148671,RU
 773148672,773152767,IR
-773152768,773153791,SE
-773153792,773154815,US
-773154816,773156863,SE
+773152768,773156863,SE
 773156864,773165055,FR
 773165056,773166463,NL
 773166464,773166591,PL
@@ -7941,7 +7357,9 @@
 773167200,773167207,NL
 773167208,773167359,US
 773167360,773167615,NL
-773167616,773168127,US
+773167616,773167655,US
+773167656,773167663,NL
+773167664,773168127,US
 773168128,773168415,NL
 773168416,773168639,US
 773168640,773168895,NL
@@ -8137,7 +7555,9 @@
 773931008,773934591,DE
 773934592,773935352,FR
 773935353,773935353,US
-773935354,773939199,FR
+773935354,773938231,FR
+773938232,773938239,GB
+773938240,773939199,FR
 773939200,773947391,CZ
 773947392,773955583,GB
 773955584,773963775,FR
@@ -8156,7 +7576,7 @@
 774004736,774012927,IR
 774012928,774021119,RU
 774021120,774029311,IR
-774029312,774037503,RO
+774029312,774037503,KZ
 774037504,774045695,SK
 774045696,774053887,FR
 774053888,774055935,DE
@@ -8167,7 +7587,8 @@
 774078464,774086655,BA
 774086656,774094847,BG
 774094848,774103039,HU
-774103040,774119423,RU
+774103040,774111231,UA
+774111232,774119423,RU
 774119424,774127615,CZ
 774127616,774135807,LT
 774135808,774143999,IR
@@ -8561,382 +7982,94 @@
 778304306,778304306,SI
 778304307,778305535,AL
 778305536,778371071,IR
-778371072,778436607,RU
-778436608,778469375,RO
+778371072,778403839,GB
+778403840,778436607,DE
+778436608,778461183,RO
+778461184,778461439,EE
+778461440,778469375,RO
 778469376,778473471,IR
 778473472,778476031,RO
 778476032,778476287,MD
-778476288,778493951,RO
+778476288,778485759,RO
+778485760,778493951,GB
 778493952,778495999,NL
-778496000,778498047,RO
-778498048,778500095,NL
-778500096,778502143,RO
+778496000,778497791,RO
+778497792,778498047,NL
+778498048,778499049,RO
+778499050,778499050,NL
+778499051,778500863,RO
+778500864,778501119,SG
+778501120,778502143,RO
 778502144,778567679,GR
 778567680,778633215,TR
 778633216,778640127,FR
 778640128,778640383,GB
-778640384,778666143,FR
-778666144,778666151,DE
-778666152,778666239,FR
-778666240,778666243,PL
-778666244,778666259,FR
+778640384,778666259,FR
 778666260,778666263,ES
-778666264,778666299,FR
-778666300,778666303,FI
-778666304,778666383,FR
-778666384,778666387,IE
-778666388,778666479,FR
+778666264,778666479,FR
 778666480,778666495,DE
-778666496,778666871,FR
-778666872,778666879,DE
+778666496,778666879,FR
 778666880,778666943,GB
-778666944,778666959,FR
-778666960,778666967,IT
-778666968,778666975,GB
-778666976,778667007,FR
-778667008,778667039,GB
-778667040,778667071,IT
-778667072,778667131,FR
-778667132,778667135,BE
-778667136,778667287,FR
-778667288,778667291,NL
-778667292,778667295,DE
-778667296,778667327,FR
+778666944,778667327,FR
 778667328,778667331,DE
 778667332,778667391,FR
 778667392,778667395,IT
-778667396,778667399,FR
-778667400,778667407,FI
-778667408,778667455,FR
-778667456,778667471,GB
-778667472,778667475,NL
-778667476,778667911,FR
-778667912,778667919,BE
-778667920,778667927,GB
-778667928,778667935,FR
-778667936,778667943,DE
-778667944,778667947,FR
-778667948,778667951,IT
-778667952,778668015,FR
-778668016,778668019,CZ
-778668020,778668063,FR
-778668064,778668095,GB
-778668096,778668543,FR
-778668544,778668559,BE
-778668560,778668575,FR
-778668576,778668591,NL
-778668592,778668623,FR
-778668624,778668627,ES
-778668628,778668715,FR
-778668716,778668719,IT
-778668720,778668863,FR
+778667396,778668623,FR
+778668624,778668627,NL
+778668628,778668863,FR
 778668864,778668895,DE
-778668896,778668927,PT
-778668928,778669503,FR
-778669504,778669535,FI
-778669536,778669567,FR
-778669568,778669575,BE
-778669576,778669623,FR
-778669624,778669631,IT
-778669632,778669759,FR
-778669760,778669767,DE
-778669768,778670043,FR
-778670044,778670047,DE
-778670048,778670151,FR
-778670152,778670159,IT
-778670160,778670163,NL
-778670164,778670171,FR
-778670172,778670175,DE
-778670176,778670215,FR
-778670216,778670223,DE
-778670224,778670247,FR
-778670248,778670255,PL
-778670256,778670347,FR
-778670348,778670351,PL
-778670352,778670387,FR
-778670388,778670391,ES
-778670392,778670395,GB
-778670396,778670399,FR
-778670400,778670407,DE
-778670408,778670415,FR
-778670416,778670431,DE
-778670432,778670543,FR
-778670544,778670559,GB
-778670560,778670567,NL
-778670568,778670571,FR
-778670572,778670575,DE
-778670576,778670591,BE
-778670592,778670975,FR
+778668896,778669935,FR
+778669936,778669951,ES
+778669952,778670975,FR
 778670976,778670976,DE
-778670977,778671103,FR
-778671104,778671119,CH
-778671120,778671127,GB
-778671128,778671199,FR
-778671200,778671203,ES
-778671204,778671247,FR
-778671248,778671263,GB
-778671264,778671279,PT
-778671280,778671331,FR
-778671332,778671335,IT
-778671336,778671647,FR
-778671648,778671679,ES
-778671680,778671743,GB
-778671744,778671887,FR
-778671888,778671903,NL
-778671904,778671907,FR
-778671908,778671911,FI
-778671912,778672111,FR
-778672112,778672115,IT
-778672116,778672543,FR
-778672544,778672559,DE
-778672560,778672803,FR
-778672804,778672807,FI
-778672808,778672815,FR
-778672816,778672823,CH
-778672824,778672887,FR
-778672888,778672891,PL
-778672892,778673079,FR
-778673080,778673087,GB
-778673088,778673119,FR
-778673120,778673151,DE
-778673152,778673187,FR
+778670977,778671201,FR
+778671202,778671202,ES
+778671203,778673187,FR
 778673188,778673191,ES
 778673192,778673207,FR
 778673208,778673211,ES
-778673212,778673215,FR
-778673216,778673247,IE
-778673248,778673383,FR
+778673212,778673383,FR
 778673384,778673387,IT
-778673388,778673791,FR
-778673792,778673807,BE
-778673808,778673883,FR
+778673388,778673751,FR
+778673752,778673759,DE
+778673760,778673883,FR
 778673884,778673887,ES
-778673888,778674431,FR
-778674432,778674439,IT
-778674440,778674447,FR
-778674448,778674451,BE
-778674452,778674459,FR
-778674460,778674463,DE
-778674464,778674475,IT
-778674476,778674479,CZ
-778674480,778674487,DE
-778674488,778674627,FR
-778674628,778674631,PL
-778674632,778674635,NL
-778674636,778674783,FR
-778674784,778674799,IT
-778674800,778674847,FR
-778674848,778674863,IT
-778674864,778674911,FR
-778674912,778674927,PL
-778674928,778674943,ES
-778674944,778674983,FR
-778674984,778674991,ES
-778674992,778675023,FR
-778675024,778675039,BE
-778675040,778675219,FR
-778675220,778675223,DE
-778675224,778675363,FR
-778675364,778675367,DE
-778675368,778675439,FR
-778675440,778675443,NL
-778675444,778675451,FR
-778675452,778675455,IT
-778675456,778675491,FR
-778675492,778675495,ES
-778675496,778675503,FR
-778675504,778675511,IT
-778675512,778675535,FR
-778675536,778675543,ES
-778675544,778675555,FR
-778675556,778675559,PT
-778675560,778675567,DE
-778675568,778675627,FR
-778675628,778675631,ES
-778675632,778675759,FR
-778675760,778675763,GB
-778675764,778675767,PL
-778675768,778675795,FR
+778673888,778675795,FR
 778675796,778675799,ES
-778675800,778675851,FR
-778675852,778675855,PT
-778675856,778675863,IT
-778675864,778675891,FR
+778675800,778675891,FR
 778675892,778675895,ES
-778675896,778675903,GB
-778675904,778675967,FR
-778675968,778675999,DE
-778676000,778676063,FR
-778676064,778676095,CH
-778676096,778676111,NL
-778676112,778676123,FR
-778676124,778676127,PL
-778676128,778676215,FR
-778676216,778676219,CZ
-778676220,778676415,FR
-778676416,778676423,IE
-778676424,778676579,FR
-778676580,778676587,DE
-778676588,778676591,ES
-778676592,778676611,FR
-778676612,778676615,LT
-778676616,778676655,FR
-778676656,778676671,NL
-778676672,778676687,FR
-778676688,778676691,IT
-778676692,778676695,GB
-778676696,778676727,FR
-778676728,778676735,NL
-778676736,778676743,FR
-778676744,778676751,DE
-778676752,778676783,FR
-778676784,778676799,BE
-778676800,778676807,FR
-778676808,778676815,ES
-778676816,778676827,FR
-778676828,778676831,ES
-778676832,778676847,FR
-778676848,778676851,PL
-778676852,778676855,NL
-778676856,778677039,FR
-778677040,778677055,PL
-778677056,778677063,FR
-778677064,778677071,CH
+778675896,778677071,FR
 778677072,778677075,NL
-778677076,778677343,FR
-778677344,778677375,PL
-778677376,778677439,FR
-778677440,778677455,FI
-778677456,778677471,FR
+778677076,778677471,FR
 778677472,778677475,DE
 778677476,778677503,FR
-778677504,778677507,GB
-778677508,778677519,FR
-778677520,778677523,ES
-778677524,778677855,FR
-778677856,778677859,ES
-778677860,778677875,FR
-778677876,778677879,IT
-778677880,778677943,FR
-778677944,778677947,PL
-778677948,778678019,FR
-778678020,778678023,NL
-778678024,778678027,PL
-778678028,778678031,FR
-778678032,778678035,GB
-778678036,778678119,FR
-778678120,778678127,IT
-778678128,778678175,FR
-778678176,778678191,GB
-778678192,778678807,FR
-778678808,778678815,ES
-778678816,778678839,FR
-778678840,778678847,PL
-778678848,778678871,FR
-778678872,778678875,PL
-778678876,778678991,FR
-778678992,778679007,GB
-778679008,778679023,FR
-778679024,778679031,NL
-778679032,778679087,FR
-778679088,778679095,PL
-778679096,778679167,FR
-778679168,778679199,GB
-778679200,778679212,FR
+778677504,778677505,GB
+778677506,778677506,ES
+778677507,778677507,GB
+778677508,778677759,ES
+778677760,778679212,FR
 778679213,778679214,FI
 778679215,778679491,FR
 778679492,778679495,ES
-778679496,778679503,IT
-778679504,778679519,FR
-778679520,778679531,ES
-778679532,778679679,FR
-778679680,778679695,ES
-778679696,778679711,NL
-778679712,778679907,FR
-778679908,778679911,PT
-778679912,778679935,FR
-778679936,778679999,GB
-778680000,778680111,FR
-778680112,778680127,NL
-778680128,778680227,FR
+778679496,778680227,FR
 778680228,778680231,IE
-778680232,778680447,FR
-778680448,778680455,GB
-778680456,778680471,FR
-778680472,778680475,GB
-778680476,778680559,FR
-778680560,778680575,IT
-778680576,778680683,FR
+778680232,778680683,FR
 778680684,778680687,ES
-778680688,778681403,FR
-778681404,778681407,ES
-778681408,778681423,FR
-778681424,778681431,FI
-778681432,778681435,IT
-778681436,778681459,FR
-778681460,778681463,LT
-778681464,778681487,FR
+778680688,778681487,FR
 778681488,778681495,NL
 778681496,778681503,FR
 778681504,778681507,DE
 778681508,778681519,FR
 778681520,778681523,ES
-778681524,778681547,FR
-778681548,778681551,ES
-778681552,778681787,FR
-778681788,778681791,ES
-778681792,778681823,FR
+778681524,778681823,FR
 778681824,778681827,IT
-778681828,778681843,FR
-778681844,778681847,CH
-778681848,778681919,FR
-778681920,778681983,PT
-778681984,778682295,FR
-778682296,778682299,PL
-778682300,778682351,FR
-778682352,778682367,DE
-778682368,778690559,FR
-778690560,778690591,BE
-778690592,778690635,FR
-778690636,778690639,BE
-778690640,778690711,FR
-778690712,778690719,BE
-778690720,778690935,FR
-778690936,778690943,CH
-778690944,778690959,BE
-778690960,778691047,FR
-778691048,778691055,ES
-778691056,778691063,NL
-778691064,778691375,FR
-778691376,778691391,ES
-778691392,778691471,FR
-778691472,778691479,PL
-778691480,778691619,FR
+778681828,778682103,FR
+778682104,778682111,DE
+778682112,778691619,FR
 778691620,778691623,IT
 778691624,778691711,FR
 778691712,778691727,GB
-778691728,778691743,FR
-778691744,778691751,DE
-778691752,778691775,FR
-778691776,778691791,IT
-778691792,778691971,FR
-778691972,778691975,CZ
-778691976,778691983,FR
-778691984,778691987,CH
-778691988,778691999,FR
-778692000,778692007,IT
-778692008,778692055,FR
-778692056,778692059,LT
-778692060,778692107,FR
-778692108,778692111,GB
-778692112,778692119,IT
-778692120,778692143,FR
-778692144,778692159,ES
-778692160,778692195,FR
-778692196,778692199,GB
-778692200,778692287,FR
-778692288,778692319,LT
-778692320,778692499,FR
+778691728,778692499,FR
 778692500,778692503,ES
 778692504,778692519,FR
 778692520,778692527,NL
@@ -8944,165 +8077,37 @@
 778692536,778692539,IT
 778692540,778692619,FR
 778692620,778692623,ES
-778692624,778692739,FR
-778692740,778692743,IE
+778692624,778692743,FR
 778692744,778692747,ES
-778692748,778692751,FR
-778692752,778692767,DE
-778692768,778692799,FR
-778692800,778692807,LT
-778692808,778692815,FR
-778692816,778692823,PL
-778692824,778692847,FR
-778692848,778692863,DE
-778692864,778692879,FR
-778692880,778692883,NL
-778692884,778692887,ES
-778692888,778692927,FR
-778692928,778692943,PL
-778692944,778693075,FR
-778693076,778693079,DE
-778693080,778693095,FR
+778692748,778693095,FR
 778693096,778693099,ES
-778693100,778693151,FR
-778693152,778693155,IT
-778693156,778693223,FR
-778693224,778693227,PL
-778693228,778693243,FR
-778693244,778693247,CZ
-778693248,778693403,FR
-778693404,778693407,PL
-778693408,778693427,FR
+778693100,778693427,FR
 778693428,778693431,ES
-778693432,778693455,FR
-778693456,778693459,BE
-778693460,778693471,FR
-778693472,778693503,NL
-778693504,778693515,FR
-778693516,778693519,GB
-778693520,778693623,FR
-778693624,778693627,NL
-778693628,778693631,ES
-778693632,778693679,FR
-778693680,778693695,DE
-778693696,778693759,FR
+778693432,778693759,FR
 778693760,778693763,ES
-778693764,778693767,PL
-778693768,778693791,FR
-778693792,778693799,NL
-778693800,778693887,FR
-778693888,778693891,ES
-778693892,778693971,FR
-778693972,778693975,CH
-778693976,778694171,FR
-778694172,778694175,CH
-778694176,778694295,FR
-778694296,778694299,IT
-778694300,778694519,FR
-778694520,778694527,CH
-778694528,778694563,FR
-778694564,778694567,GB
-778694568,778694575,NL
-778694576,778694647,FR
-778694648,778694655,DE
-778694656,778694679,FR
-778694680,778694687,GB
-778694688,778694975,FR
-778694976,778695007,CH
-778695008,778695039,ES
-778695040,778695103,FR
-778695104,778695135,FI
-778695136,778695167,DE
-778695168,778695303,FR
-778695304,778695307,DE
-778695308,778695323,FR
-778695324,778695327,PL
-778695328,778695339,FR
-778695340,778695343,ES
-778695344,778695347,DE
-778695348,778695375,FR
-778695376,778695391,FI
-778695392,778695471,FR
+778693764,778695471,FR
 778695472,778695475,ES
-778695476,778695487,FR
-778695488,778695503,BE
-778695504,778695663,FR
-778695664,778695679,PL
-778695680,778695711,FR
-778695712,778695743,GB
-778695744,778695759,FR
-778695760,778695767,NL
-778695768,778695823,FR
-778695824,778695839,FI
+778695476,778695839,FR
 778695840,778695871,DE
-778695872,778695927,FR
-778695928,778695935,IT
-778695936,778696199,FR
-778696200,778696207,NL
-778696208,778696211,PL
-778696212,778696255,FR
-778696256,778696263,IE
-778696264,778696383,FR
-778696384,778696415,PT
-778696416,778696487,FR
-778696488,778696495,IT
+778695872,778696439,FR
+778696440,778696447,IT
+778696448,778696495,FR
 778696496,778696499,ES
-778696500,778696559,FR
-778696560,778696567,PL
-778696568,778696591,FR
-778696592,778696607,DE
-778696608,778696639,NL
-778696640,778696643,ES
-778696644,778696647,FR
-778696648,778696655,PL
-778696656,778696987,FR
-778696988,778696991,NL
+778696500,778696991,FR
 778696992,778696995,ES
 778696996,778697067,FR
 778697068,778697071,ES
-778697072,778697119,FR
-778697120,778697151,IT
-778697152,778697175,FR
+778697072,778697175,FR
 778697176,778697179,ES
-778697180,778697183,FR
-778697184,778697215,PT
-778697216,778697247,FR
-778697248,778697255,DE
-778697256,778697347,FR
-778697348,778697351,PL
-778697352,778697567,FR
-778697568,778697599,GB
-778697600,778697663,FR
-778697664,778697667,IE
-778697668,778697671,FR
-778697672,778697675,GB
-778697676,778697679,FR
-778697680,778697683,DE
-778697684,778697727,FR
-778697728,778697791,DE
-778697792,778697807,FR
-778697808,778697815,IT
+778697180,778697815,FR
 778697816,778697819,ES
-778697820,778697847,FR
-778697848,778697851,DE
-778697852,778697955,FR
+778697820,778697955,FR
 778697956,778697959,ES
-778697960,778698399,FR
-778698400,778698431,BE
-778698432,778698447,FR
+778697960,778698447,FR
 778698448,778698451,ES
-778698452,778698455,FR
-778698456,778698463,PL
-778698464,778698467,IT
-778698468,778698623,FR
-778698624,778698627,FI
-778698628,778698631,FR
-778698632,778698635,GB
-778698636,778698643,FR
+778698452,778698643,FR
 778698644,778698647,ES
-778698648,778698667,FR
-778698668,778698671,GB
-778698672,778698703,FR
+778698648,778698703,FR
 778698704,778698707,ES
 778698708,778698751,FR
 778698752,778764287,TR
@@ -9241,7 +8246,9 @@
 782672872,782672879,IL
 782672880,782672927,LT
 782672928,782672959,US
-782672960,782675967,LT
+782672960,782672991,LT
+782672992,782673023,CR
+782673024,782675967,LT
 782675968,782676735,NL
 782676736,782676991,DE
 782676992,782680063,NL
@@ -9255,8 +8262,10 @@
 783040512,783048703,UA
 783048704,783056895,RU
 783056896,783065087,UA
-783065088,783073279,RU
-783073280,783089663,UA
+783065088,783077887,RU
+783077888,783078143,UA
+783078144,783081471,RU
+783081472,783089663,UA
 783089664,783106047,RU
 783106048,783134719,UA
 783134720,783138815,RU
@@ -9392,7 +8401,15 @@
 784039936,784072703,PL
 784072704,784105471,RU
 784105472,784138239,HR
-784138240,784169215,DE
+784138240,784155495,DE
+784155496,784155503,AT
+784155504,784155511,GB
+784155512,784155519,CZ
+784155520,784155623,DE
+784155624,784155631,AT
+784155632,784155639,GB
+784155640,784155640,CZ
+784155641,784169215,DE
 784169216,784169231,AL
 784169232,784169247,BG
 784169248,784169263,CZ
@@ -9403,7 +8420,7 @@
 784169472,784171007,DE
 784171008,784203775,PT
 784203776,784236543,GR
-784236544,784269311,RO
+784236544,784269311,GB
 784269312,784302079,BY
 784302080,784334847,RU
 784334848,784465919,FR
@@ -9436,7 +8453,9 @@
 786567168,786569215,CZ
 786569216,786571263,NO
 786571264,786575359,ES
-786575360,786577407,GB
+786575360,786576098,GB
+786576099,786576099,SE
+786576100,786577407,GB
 786577408,786579455,NL
 786579456,786581503,RU
 786581504,786583551,GB
@@ -9537,7 +8556,9 @@
 786915328,786917375,SK
 786917376,786919423,RO
 786919424,786919431,IT
-786919432,786919639,GB
+786919432,786919535,GB
+786919536,786919543,IT
+786919544,786919639,GB
 786919640,786919647,IT
 786919648,786919799,GB
 786919800,786919807,IT
@@ -9545,17 +8566,15 @@
 786919880,786919887,IT
 786919888,786920191,GB
 786920192,786920199,IT
-786920200,786920303,GB
-786920304,786920311,IT
-786920312,786920343,GB
+786920200,786920343,GB
 786920344,786920351,IT
-786920352,786920631,GB
-786920632,786920639,IT
-786920640,786920839,GB
+786920352,786920839,GB
 786920840,786920847,IT
 786920848,786920855,GB
 786920856,786920863,IT
-786920864,786921303,GB
+786920864,786921287,GB
+786921288,786921295,IT
+786921296,786921303,GB
 786921304,786921311,IT
 786921312,786921455,GB
 786921456,786921463,IT
@@ -9599,7 +8618,8 @@
 787038976,787039231,FR
 787039232,787039247,AR
 787039248,787039263,PE
-787039264,787054591,GB
+787039264,787039279,VE
+787039280,787054591,GB
 787054592,787070975,IT
 787070976,787087359,RU
 787087360,787095551,TR
@@ -9607,13 +8627,17 @@
 787095680,787095711,CH
 787095712,787096575,EU
 787096576,787097855,CH
-787097856,787099391,EU
+787097856,787098111,EU
+787098112,787098623,CH
+787098624,787099391,EU
 787099392,787100671,CH
 787100672,787101695,EU
 787101696,787102719,CH
 787102720,787103743,EU
 787103744,787111935,HR
-787111936,787120127,CZ
+787111936,787116287,CZ
+787116288,787116543,US
+787116544,787120127,CZ
 787120128,787128319,ES
 787128320,787136511,CZ
 787136512,787152895,IT
@@ -9667,12 +8691,11 @@
 787365888,787382271,PL
 787382272,787389951,GP
 787389952,787390207,MQ
-787390208,787390463,GP
-787390464,787394559,FR
+787390208,787394559,GP
 787394560,787394815,GF
-787394816,787396095,FR
+787394816,787396095,GP
 787396096,787396351,GF
-787396352,787398399,FR
+787396352,787398399,GP
 787398400,787398655,MQ
 787398656,787415039,PL
 787415040,787431423,BA
@@ -9701,11 +8724,26 @@
 787707904,787709951,DE
 787709952,787711487,IE
 787711488,787711999,GB
-787712000,787718143,NL
-787718144,787724287,RU
-787724288,787726335,UA
-787726336,787742719,RU
-787742720,787759103,NL
+787712000,787712255,MT
+787712256,787712511,MA
+787712512,787712767,DE
+787712768,787713023,IT
+787713024,787713279,LV
+787713280,787713535,SE
+787713536,787713791,BG
+787713792,787714047,GR
+787714048,787714303,IM
+787714304,787714559,SY
+787714560,787714815,LB
+787714816,787715071,QA
+787715072,787715327,OM
+787715328,787715583,YE
+787715584,787715839,BH
+787715840,787718143,NL
+787718144,787742719,RU
+787742720,787750911,NL
+787750912,787755007,GB
+787755008,787759103,NL
 787759104,787767295,PS
 787767296,787775487,NL
 787775488,787808255,DE
@@ -9726,9 +8764,11 @@
 787869696,787873791,GB
 787873792,787881745,SE
 787881746,787881747,FR
-787881748,787883391,SE
+787881748,787881983,SE
+787881984,787883391,A1
 787883392,787883519,GB
-787883520,787891247,SE
+787883520,787890175,A1
+787890176,787891247,SE
 787891248,787891251,ES
 787891252,787906559,SE
 787906560,787939327,GR
@@ -9744,7 +8784,9 @@
 788070400,788078591,RU
 788078592,788086783,NL
 788086784,788094975,BG
-788094976,788103167,IR
+788094976,788095231,IR
+788095232,788095487,DE
+788095488,788103167,IR
 788103168,788111359,HU
 788111360,788119551,LT
 788119552,788127743,GB
@@ -9950,7 +8992,7 @@
 831519744,831520767,IN
 831520768,832045055,PH
 832045056,832307199,CN
-832307200,832308223,MN
+832307456,832307711,MN
 832308224,832311295,JP
 832311296,832315391,AU
 832315392,832319487,KH
@@ -10028,7 +9070,13 @@
 839339608,839339609,A1
 839339610,839348223,US
 839348224,839348479,DE
-839348480,839352319,US
+839348480,839348735,AT
+839348736,839348991,GB
+839348992,839349247,AT
+839349248,839350271,DE
+839350272,839351807,US
+839351808,839352063,DE
+839352064,839352319,US
 839352320,839357439,NL
 839357440,839358463,FR
 839358464,839359487,GB
@@ -10048,7 +9096,9 @@
 840838509,840838509,UA
 840838510,840838510,US
 840838511,840838512,UA
-840838513,840898047,US
+840838513,840865791,US
+840865792,840866047,CA
+840866048,840898047,US
 840898048,840898559,CA
 840898560,840909055,US
 840909056,840909311,CA
@@ -10062,7 +9112,9 @@
 843055104,843644927,CA
 843644928,844890111,US
 844890112,844988415,CA
-844988416,845283327,US
+844988416,845089407,US
+845089408,845089535,PR
+845089536,845283327,US
 845283328,845545471,CA
 845545472,846442495,US
 846442496,846446591,CA
@@ -10102,10 +9154,17 @@
 911147008,911212543,AU
 911212544,911998975,US
 911998976,912031743,JP
-912031744,912130047,US
+912031744,912064511,US
+912064512,912130047,DE
 912130048,912195583,BR
 912195584,912261119,JP
-912261120,916979711,US
+912261120,915800063,US
+915800064,915865599,JP
+915865600,915898367,US
+915898368,915931135,SG
+915931136,916062207,US
+916062208,916193279,IE
+916193280,916979711,US
 916979712,917045247,JP
 917045248,917110783,SG
 917110784,917241855,IE
@@ -10138,13 +9197,17 @@
 922205776,922205776,DE
 922205777,922222591,IE
 922222592,922419199,JP
-922419200,922484735,SG
+922419200,922427633,SG
+922427634,922427634,US
+922427635,922427703,SG
+922427704,922427704,US
+922427705,922484735,SG
 922484736,922615807,AU
 922615808,922746879,SG
 922746880,956301311,US
-956301312,959447039,EU
+956301312,959447039,BE
 959447040,959512575,US
-959512576,960626687,EU
+959512576,960626687,BE
 960626688,960641023,GB
 960641024,960641279,EU
 960641280,960643330,GB
@@ -10154,7 +9217,9 @@
 960644864,960646399,GB
 960646400,960646911,EU
 960646912,960654335,GB
-960654336,960654591,EU
+960654336,960654374,EU
+960654375,960654375,GB
+960654376,960654591,EU
 960654592,960659455,GB
 960659456,960662015,DE
 960662016,960662271,EU
@@ -10200,7 +9265,7 @@
 960970752,960974847,TV
 960974848,960978943,VU
 960978944,960983039,NC
-960983040,961019903,EU
+960983040,961019903,BE
 961019904,961021439,HK
 961021440,961021695,A2
 961021696,961021951,HK
@@ -10229,7 +9294,9 @@
 961093888,961094143,AP
 961094144,961118207,SG
 961118208,961119487,MY
-961119488,961119743,AP
+961119488,961119508,AP
+961119509,961119509,MY
+961119510,961119743,AP
 961119744,961126399,MY
 961126400,961134591,TW
 961134592,961142783,KR
@@ -10243,7 +9310,7 @@
 961224704,961228799,EC
 961228800,961232895,BO
 961232896,961236991,PY
-961236992,961241087,EU
+961236992,961241087,BE
 961241088,961245183,GF
 961245184,961247231,GY
 961247232,961249279,SR
@@ -10254,7 +9321,7 @@
 961265664,961269759,SV
 961269760,961273855,PA
 961273856,961277951,CR
-961277952,961282047,EU
+961277952,961282047,BE
 961282048,961314815,MX
 961314816,961380351,US
 961380352,961413119,CA
@@ -10283,34 +9350,36 @@
 961716224,961720319,CF
 961720320,961724415,TD
 961724416,961740799,ZA
-961740800,961806335,EU
+961740800,961806335,BE
 961806336,961810431,MR
-961810432,961826815,EU
+961810432,961826815,BE
 961826816,961830911,NE
-961830912,961892351,EU
+961830912,961892351,BE
 961892352,961896447,ZW
 961896448,961900543,NG
-961900544,961937407,EU
+961900544,961937407,BE
 961937408,961945599,IS
 961945600,961950463,FI
 961950464,961950719,EU
 961950720,961953791,FI
 961953792,961961983,DK
 961961984,961970175,NO
-961970176,962002943,EU
+961970176,961971455,BE
+961971456,961971711,EU
+961971712,962002943,BE
 962002944,962035711,RU
 962035712,962039807,EE
 962039808,962043903,LV
 962043904,962047999,LT
-962048000,962076671,EU
+962048000,962076671,BE
 962076672,962080767,BH
-962080768,962084863,EU
+962080768,962084863,BE
 962084864,962088959,GE
-962088960,962097151,EU
+962088960,962097151,BE
 962097152,962101247,IL
-962101248,962134015,EU
+962101248,962134015,BE
 962134016,962138111,AE
-962138112,962203647,EU
+962138112,962203647,BE
 962203648,962207999,AT
 962208000,962208255,EU
 962208256,962211839,AT
@@ -10320,55 +9389,57 @@
 962220032,962224127,CZ
 962224128,962228223,GR
 962228224,962232319,HU
-962232320,962244607,EU
+962232320,962244607,BE
 962244608,962248703,RO
-962248704,962252799,EU
+962248704,962252799,BE
 962252800,962256895,SK
 962256896,962260991,SI
 962260992,962265087,TR
-962265088,962281471,EU
+962265088,962281471,BE
 962281472,962285567,DO
-962285568,962359295,EU
+962285568,962359295,BE
 962359296,962363391,IN
-962363392,962392063,EU
+962363392,962392063,BE
 962392064,962396159,PK
-962396160,962408447,EU
+962396160,962408447,BE
 962408448,962412543,TH
 962412544,962416639,UZ
-962416640,962461695,EU
+962416640,962461695,BE
 962461696,962469887,IE
 962469888,962527231,TR
-962527232,962592767,EU
+962527232,962592767,BE
 962592768,962594815,IN
-962594816,962596863,EU
+962594816,962596863,BE
 962596864,962598911,SG
-962598912,962600959,EU
+962598912,962600959,BE
 962600960,962609151,HK
 962609152,962613247,JP
-962613248,962617343,EU
+962613248,962617343,BE
 962617344,962621439,AU
-962621440,962674687,EU
+962621440,962674687,BE
 962674688,962676735,BR
-962676736,962680831,EU
+962676736,962680831,BE
 962680832,962689023,US
-962689024,962723839,EU
+962689024,962723839,BE
 962723840,962732031,GB
 962732032,962740223,DE
 962740224,962744319,SE
-962744320,962748415,EU
+962744320,962748415,BE
 962748416,962752511,BH
 962752512,962756607,ZA
-962756608,968818687,EU
+962756608,968818687,BE
 968818688,968819711,DE
-968819712,968851455,EU
+968819712,968851455,BE
 968851456,968852479,US
-968852480,972743935,EU
+968852480,972743935,BE
 972743936,972744191,GB
-972744192,972744447,EU
+972744192,972744447,BE
 972744448,972744703,IN
-972744704,972747263,EU
+972744704,972747263,BE
 972747264,972747519,US
-972747520,973078527,EU
+972747520,972748031,BE
+972748032,972748287,EU
+972748288,973078527,BE
 973078528,973209599,JP
 973209600,973275135,IN
 973275136,973471743,JP
@@ -10733,7 +9804,9 @@
 1040457728,1040465919,ME
 1040465920,1040467071,EU
 1040467072,1040467087,FR
-1040467088,1040474111,EU
+1040467088,1040473343,EU
+1040473344,1040473599,DE
+1040473600,1040474111,EU
 1040474112,1040482303,CZ
 1040482304,1040515071,BE
 1040515072,1040547839,GB
@@ -10781,119 +9854,9 @@
 1041638912,1041642751,ES
 1041642752,1041643007,EU
 1041643008,1041694719,ES
-1041694720,1041700959,GB
-1041700960,1041700975,FR
-1041700976,1041701783,GB
-1041701784,1041701791,FR
-1041701792,1041701823,GB
-1041701824,1041701831,FR
-1041701832,1041702399,GB
-1041702400,1041702655,FR
-1041702656,1041703479,GB
-1041703480,1041703487,FR
-1041703488,1041703631,GB
-1041703632,1041703639,FR
-1041703640,1041703679,GB
-1041703680,1041703935,FR
-1041703936,1041704415,GB
-1041704416,1041704423,FR
-1041704424,1041706551,GB
-1041706552,1041706559,FR
-1041706560,1041706751,GB
-1041706752,1041707007,FR
-1041707008,1041708543,GB
-1041708544,1041708799,FR
-1041708800,1041709951,GB
-1041709952,1041709959,FR
-1041709960,1041710671,GB
-1041710672,1041710687,FR
-1041710688,1041711359,GB
-1041711360,1041711615,FR
-1041711616,1041711943,GB
-1041711944,1041711951,FR
-1041711952,1041712631,GB
-1041712632,1041712639,FR
-1041712640,1041715071,GB
-1041715072,1041715079,FR
-1041715080,1041715567,GB
-1041715568,1041715583,FR
-1041715584,1041716039,GB
-1041716040,1041716047,FR
-1041716048,1041716223,GB
-1041716224,1041716231,FR
-1041716232,1041716455,GB
-1041716456,1041716463,FR
-1041716464,1041718015,GB
-1041718016,1041718271,FR
-1041718272,1041718527,GB
-1041718528,1041718783,FR
-1041718784,1041719223,GB
-1041719224,1041719224,FR
-1041719225,1041719227,GB
-1041719228,1041719228,FR
-1041719229,1041719407,GB
-1041719408,1041719423,FR
-1041719424,1041721391,GB
-1041721392,1041721407,FR
-1041721408,1041721599,GB
-1041721600,1041721727,FR
-1041721728,1041721759,GB
-1041721760,1041721775,FR
-1041721776,1041722951,GB
-1041722952,1041722959,FR
-1041722960,1041723263,GB
-1041723264,1041723279,FR
-1041723280,1041723775,GB
-1041723776,1041723839,FR
-1041723840,1041729559,GB
-1041729560,1041729561,FR
-1041729562,1041729564,GB
-1041729565,1041729566,FR
-1041729567,1041729935,GB
-1041729936,1041729951,FR
-1041729952,1041731839,GB
-1041731840,1041732095,FR
-1041732096,1041734911,GB
-1041734912,1041735167,FR
-1041735168,1041736381,GB
-1041736382,1041736382,FR
-1041736383,1041736447,GB
-1041736448,1041736703,FR
-1041736704,1041737583,GB
-1041737584,1041737591,FR
-1041737592,1041737839,GB
-1041737840,1041737855,FR
-1041737856,1041739031,GB
-1041739032,1041739039,FR
-1041739040,1041740279,GB
-1041740280,1041740287,FR
-1041740288,1041741055,GB
-1041741056,1041741311,FR
-1041741312,1041742415,GB
-1041742416,1041742423,FR
-1041742424,1041743103,GB
-1041743104,1041743111,FR
-1041743112,1041743247,GB
-1041743248,1041743255,FR
-1041743256,1041745783,GB
-1041745784,1041745791,FR
-1041745792,1041746903,GB
-1041746904,1041746919,FR
-1041746920,1041748991,GB
+1041694720,1041748991,FR
 1041748992,1041749247,EU
-1041749248,1041749639,GB
-1041749640,1041749643,FR
-1041749644,1041749659,GB
-1041749660,1041749663,FR
-1041749664,1041753231,GB
-1041753232,1041753239,FR
-1041753240,1041756839,GB
-1041756840,1041756855,FR
-1041756856,1041757615,GB
-1041757616,1041757623,FR
-1041757624,1041758175,GB
-1041758176,1041758183,FR
-1041758184,1041760255,GB
+1041749248,1041760255,FR
 1041760256,1041768447,DE
 1041768448,1041776639,NO
 1041776640,1041784831,CZ
@@ -11016,7 +9979,9 @@
 1044414464,1044447231,GB
 1044447232,1044453233,SE
 1044453234,1044453234,NO
-1044453235,1044455423,SE
+1044453235,1044455168,SE
+1044455169,1044455169,NO
+1044455170,1044455423,SE
 1044455424,1044463615,EE
 1044463616,1044479999,SE
 1044480000,1044488191,CH
@@ -11081,7 +10046,9 @@
 1044936116,1044936119,BE
 1044936120,1044936487,GB
 1044936488,1044936495,BE
-1044936496,1044937247,GB
+1044936496,1044936735,GB
+1044936736,1044936743,BE
+1044936744,1044937247,GB
 1044937248,1044937255,BE
 1044937256,1044938503,GB
 1044938504,1044938511,LU
@@ -11246,7 +10213,9 @@
 1046498688,1046498695,DE
 1046498696,1046498799,GB
 1046498800,1046498807,DE
-1046498808,1046503095,GB
+1046498808,1046502106,GB
+1046502107,1046502107,DE
+1046502108,1046503095,GB
 1046503096,1046503103,DE
 1046503104,1046504447,GB
 1046504448,1046508543,DE
@@ -11258,7 +10227,11 @@
 1046514688,1046515711,DE
 1046515712,1046518783,GB
 1046518784,1046519807,DE
-1046519808,1046525351,GB
+1046519808,1046524215,GB
+1046524216,1046524223,DE
+1046524224,1046524615,GB
+1046524616,1046524623,DE
+1046524624,1046525351,GB
 1046525352,1046525359,DE
 1046525360,1046525439,GB
 1046525440,1046525695,DE
@@ -11325,7 +10298,11 @@
 1047314432,1047322623,SE
 1047322624,1047330815,IT
 1047330816,1047339007,RU
-1047339008,1047347199,SE
+1047339008,1047340863,SE
+1047340864,1047340927,NO
+1047340928,1047342879,SE
+1047342880,1047342887,FI
+1047342888,1047347199,SE
 1047347200,1047363583,DE
 1047363584,1047371775,CZ
 1047371776,1047373559,RU
@@ -11350,7 +10327,9 @@
 1047658496,1047724031,EG
 1047724032,1047728127,EU
 1047728128,1047732223,SE
-1047732224,1047787519,EU
+1047732224,1047782689,EU
+1047782690,1047782690,GB
+1047782691,1047787519,EU
 1047787520,1047787775,ES
 1047787776,1047789567,EU
 1047789568,1047822335,AT
@@ -11377,7 +10356,6 @@
 1048193024,1048195071,RO
 1048195072,1048197119,RU
 1048197120,1048201215,UA
-1048201216,1048203263,PL
 1048203264,1048205311,DE
 1048205312,1048209407,RU
 1048209408,1048211455,UA
@@ -11633,7 +10611,7 @@
 1052170240,1052172287,SE
 1052172288,1052174335,PL
 1052174336,1052176383,CZ
-1052176384,1052178431,NL
+1052176384,1052178431,GB
 1052178432,1052180479,DK
 1052180480,1052213247,RU
 1052213248,1052246015,FI
@@ -11764,9 +10742,7 @@
 1053312912,1053312927,DK
 1053312928,1053313279,EU
 1053313280,1053313535,GB
-1053313536,1053316687,EU
-1053316688,1053316695,GB
-1053316696,1053318911,EU
+1053313536,1053318911,EU
 1053318912,1053318943,FI
 1053318944,1053320223,EU
 1053320224,1053320239,DE
@@ -11776,17 +10752,13 @@
 1053326504,1053326527,BE
 1053326528,1053326543,EU
 1053326544,1053326551,BE
-1053326552,1053329439,EU
-1053329440,1053329471,ES
-1053329472,1053332991,EU
+1053326552,1053332991,EU
 1053332992,1053334015,BE
 1053334016,1053335551,EU
 1053335552,1053336575,ZA
 1053336576,1053339903,EU
 1053339904,1053340159,AT
-1053340160,1053345279,EU
-1053345280,1053345375,PK
-1053345376,1053349375,EU
+1053340160,1053349375,EU
 1053349376,1053349631,NL
 1053349632,1053349951,EU
 1053349952,1053349967,IE
@@ -11866,7 +10838,9 @@
 1053837568,1053837823,GB
 1053837824,1053838335,FK
 1053838336,1053838591,DE
-1053838592,1053840399,EU
+1053838592,1053839359,EU
+1053839360,1053840383,DE
+1053840384,1053840399,EU
 1053840400,1053840415,DE
 1053840416,1053840447,EU
 1053840448,1053840511,DE
@@ -11971,7 +10945,9 @@
 1053927160,1053927167,FI
 1053927168,1053933567,SE
 1053933568,1053949951,CZ
-1053949952,1054015487,FR
+1053949952,1053968188,FR
+1053968189,1053968189,PT
+1053968190,1054015487,FR
 1054015488,1054089215,IT
 1054089216,1054097407,GE
 1054097408,1054105599,NL
@@ -12148,7 +11124,9 @@
 1056571392,1056669695,NL
 1056669696,1056702463,MA
 1056702464,1056874751,GB
-1056874752,1056875007,IE
+1056874752,1056874943,IE
+1056874944,1056874975,GB
+1056874976,1056875007,IE
 1056875008,1056875663,GB
 1056875664,1056875671,IE
 1056875672,1056964607,GB
@@ -12248,7 +11226,9 @@
 1065873408,1065877503,PR
 1065877504,1065906175,US
 1065906176,1065908223,KY
-1065908224,1066255871,US
+1065908224,1066254975,US
+1066254976,1066255103,GB
+1066255104,1066255871,US
 1066255872,1066256383,A1
 1066256384,1066311679,US
 1066311680,1066315775,CA
@@ -12539,7 +11519,9 @@
 1072941056,1072942079,CA
 1072942080,1072943103,US
 1072943104,1072945151,CA
-1072945152,1073022975,US
+1072945152,1072953599,US
+1072953600,1072953607,IE
+1072953608,1073022975,US
 1073022976,1073025791,HN
 1073025792,1073026047,NI
 1073026048,1073026303,US
@@ -12749,15 +11731,13 @@
 1075976192,1075976447,CA
 1075976448,1075977055,US
 1075977056,1075977071,CA
-1075977072,1075977983,US
-1075977984,1075978239,CA
-1075978240,1075982335,US
+1075977072,1075982335,US
 1075982336,1075982591,CA
 1075982592,1075982847,US
 1075982848,1075983103,CA
 1075983104,1075983359,US
-1075983360,1075984383,CA
-1075984384,1075985919,US
+1075983360,1075984127,CA
+1075984128,1075985919,US
 1075985920,1075986687,CA
 1075986688,1075986943,US
 1075986944,1075987199,CA
@@ -12779,7 +11759,9 @@
 1075995648,1075996671,CA
 1075996672,1075997183,US
 1075997184,1075997439,CA
-1075997440,1075998207,US
+1075997440,1075998119,US
+1075998120,1075998127,CA
+1075998128,1075998207,US
 1075998208,1075998271,CA
 1075998272,1075998463,US
 1075998464,1075999231,CA
@@ -12809,7 +11791,9 @@
 1076009728,1076009983,CA
 1076009984,1076026623,US
 1076026624,1076026879,CA
-1076026880,1076028159,US
+1076026880,1076027019,US
+1076027020,1076027023,CA
+1076027024,1076028159,US
 1076028160,1076028415,CA
 1076028416,1076028927,US
 1076028928,1076029183,BZ
@@ -12934,7 +11918,9 @@
 1078284864,1078284991,CA
 1078284992,1078285151,US
 1078285152,1078285167,CA
-1078285168,1078285311,US
+1078285168,1078285255,US
+1078285256,1078285259,CA
+1078285260,1078285311,US
 1078285312,1078285567,CA
 1078285568,1078286351,US
 1078286352,1078286367,CA
@@ -12954,9 +11940,7 @@
 1078349312,1078349823,PH
 1078349824,1078429695,US
 1078429696,1078429951,GR
-1078429952,1078435871,US
-1078435872,1078435879,A1
-1078435880,1078438399,US
+1078429952,1078438399,US
 1078438400,1078438655,CA
 1078438656,1078438911,US
 1078438912,1078438929,CN
@@ -13050,8 +12034,8 @@
 1079403264,1079403519,US
 1079403520,1079403775,CA
 1079403776,1079405567,US
-1079405568,1079406079,CA
-1079406080,1079408895,US
+1079405568,1079406111,CA
+1079406112,1079408895,US
 1079408896,1079409407,PK
 1079409408,1079409919,US
 1079409920,1079410175,CA
@@ -13089,7 +12073,9 @@
 1079623680,1079627775,PR
 1079627776,1079664639,US
 1079664640,1079668735,CA
-1079668736,1079861247,US
+1079668736,1079669247,US
+1079669248,1079669759,NL
+1079669760,1079861247,US
 1079861248,1079865343,CA
 1079865344,1079962879,US
 1079962880,1079963135,GB
@@ -13169,8 +12155,8 @@
 1081379840,1081385215,US
 1081385216,1081385471,PA
 1081385472,1081387519,US
-1081387520,1081388031,PA
-1081388032,1081391103,US
+1081387520,1081387775,PA
+1081387776,1081391103,US
 1081391104,1081393151,PA
 1081393152,1081393407,US
 1081393408,1081393663,CL
@@ -13213,7 +12199,9 @@
 1081573376,1081589759,US
 1081589760,1081593855,BB
 1081593856,1081597951,CA
-1081597952,1082138623,US
+1081597952,1081639423,US
+1081639424,1081639679,DE
+1081639680,1082138623,US
 1082138624,1082139409,A2
 1082139410,1082139410,ZA
 1082139411,1082140671,A2
@@ -13322,13 +12310,21 @@
 1087467292,1087467295,BR
 1087467296,1087496703,US
 1087496704,1087496959,CA
-1087496960,1087508161,US
+1087496960,1087501567,US
+1087501568,1087501695,HK
+1087501696,1087508161,US
 1087508162,1087508162,JP
 1087508163,1087510271,US
 1087510272,1087510463,CA
 1087510464,1087510495,US
 1087510496,1087510527,CA
-1087510528,1087580927,US
+1087510528,1087514623,US
+1087514624,1087515391,BB
+1087515392,1087515647,US
+1087515648,1087516159,BB
+1087516160,1087516415,US
+1087516416,1087516671,BB
+1087516672,1087580927,US
 1087580928,1087581183,BR
 1087581184,1087593983,US
 1087593984,1087594239,MX
@@ -13457,9 +12453,7 @@
 1089526784,1089527039,VE
 1089527040,1089579519,US
 1089579520,1089580031,VE
-1089580032,1089598975,US
-1089598976,1089599231,HK
-1089599232,1089824767,US
+1089580032,1089824767,US
 1089824768,1089825023,VI
 1089825024,1089881599,US
 1089881600,1089882111,GB
@@ -13510,8 +12504,8 @@
 1093074944,1093091327,CA
 1093091328,1093107967,US
 1093107968,1093108479,CA
-1093108480,1093108735,US
-1093108736,1093109247,CA
+1093108480,1093108991,US
+1093108992,1093109247,CA
 1093109248,1093109503,US
 1093109504,1093109759,CA
 1093109760,1093109871,US
@@ -13545,7 +12539,9 @@
 1093118208,1093118463,HK
 1093118464,1093119999,US
 1093120000,1093120255,CA
-1093120256,1093120511,US
+1093120256,1093120415,US
+1093120416,1093120431,CA
+1093120432,1093120511,US
 1093120512,1093120767,CA
 1093120768,1093121023,US
 1093121024,1093122047,CA
@@ -13557,9 +12553,7 @@
 1093122816,1093123839,CA
 1093123840,1093123951,US
 1093123952,1093123967,CA
-1093123968,1093124607,US
-1093124608,1093124863,CA
-1093124864,1093126143,US
+1093123968,1093126143,US
 1093126144,1093126399,CA
 1093126400,1093126911,US
 1093126912,1093127167,CA
@@ -13571,7 +12565,9 @@
 1093132544,1093133055,CA
 1093133056,1093135359,US
 1093135360,1093135615,CA
-1093135616,1093135871,US
+1093135616,1093135631,US
+1093135632,1093135639,CA
+1093135640,1093135871,US
 1093135872,1093136639,CA
 1093136640,1093136895,US
 1093136896,1093137151,CA
@@ -13832,7 +12828,8 @@
 1108025344,1108029439,CA
 1108029440,1108033535,US
 1108033536,1108041727,CA
-1108041728,1108054015,US
+1108041728,1108045823,US
+1108049920,1108054015,US
 1108054016,1108066303,CA
 1108066304,1108443391,US
 1108443392,1108443647,CA
@@ -13947,7 +12944,7 @@
 1110867456,1110867967,JM
 1110867968,1110887423,US
 1110887424,1110887679,IE
-1110887680,1110925311,US
+1110887680,1110929407,US
 1110929408,1110933503,BM
 1110933504,1110937599,US
 1110937600,1110937855,A1
@@ -14007,9 +13004,13 @@
 1114511872,1114512127,CA
 1114512128,1114513407,US
 1114513408,1114513471,SA
-1114513472,1114513535,US
-1114513536,1114515455,SA
-1114515456,1114517503,US
+1114513472,1114513551,US
+1114513552,1114513663,SA
+1114513664,1114514175,US
+1114514176,1114515455,SA
+1114515456,1114515463,US
+1114515464,1114515471,CA
+1114515472,1114517503,US
 1114517504,1114518015,CA
 1114518016,1114520063,US
 1114520064,1114520319,PH
@@ -14065,8 +13066,8 @@
 1116016128,1116021247,US
 1116021248,1116021503,CI
 1116021504,1116024063,US
-1116024064,1116024127,PG
-1116024128,1116027135,US
+1116024064,1116024319,PG
+1116024320,1116027135,US
 1116027136,1116027903,A2
 1116027904,1116168191,US
 1116168192,1116176383,CA
@@ -14237,15 +13238,11 @@
 1119502336,1119510527,CA
 1119510528,1119558143,US
 1119558144,1119558655,PR
-1119558656,1119567871,US
-1119567872,1119568127,GB
-1119568128,1119568383,US
+1119558656,1119568383,US
 1119568384,1119568639,GB
-1119568640,1119568895,US
-1119568896,1119569151,GB
-1119569152,1119570175,US
-1119570176,1119570431,GB
-1119570432,1119571967,US
+1119568640,1119570559,US
+1119570560,1119570687,GB
+1119570688,1119571967,US
 1119571968,1119576063,CA
 1119576064,1119580159,US
 1119580160,1119584255,CA
@@ -14279,14 +13276,18 @@
 1120346112,1120350207,CA
 1120350208,1120370687,US
 1120370688,1120371199,CA
-1120371200,1120372223,US
+1120371200,1120371567,US
+1120371568,1120371583,CA
+1120371584,1120372223,US
 1120372224,1120372479,CA
 1120372480,1120372991,US
 1120372992,1120373247,CA
 1120373248,1120373503,US
 1120373504,1120374015,CA
-1120374016,1120374527,US
-1120374528,1120375039,CA
+1120374016,1120374519,US
+1120374520,1120374523,CA
+1120374524,1120374783,US
+1120374784,1120375039,CA
 1120375040,1120375551,US
 1120375552,1120376063,CA
 1120376064,1120376303,US
@@ -14432,7 +13433,9 @@
 1122451456,1122455551,CO
 1122455552,1122476031,US
 1122476032,1122480127,PR
-1122480128,1122533375,US
+1122480128,1122497327,US
+1122497328,1122497343,BR
+1122497344,1122533375,US
 1122533376,1122535423,GB
 1122535424,1122538495,KR
 1122538496,1122635775,US
@@ -14449,14 +13452,15 @@
 1123589632,1123589887,DE
 1123589888,1123590143,US
 1123590144,1123598335,VI
-1123598336,1123606527,CA
-1123606528,1123635199,US
+1123598336,1123635199,US
 1123635200,1123635455,AU
-1123635456,1123635639,US
+1123635456,1123635639,EU
 1123635640,1123635640,RU
-1123635641,1123635670,US
+1123635641,1123635670,EU
 1123635671,1123635671,RU
-1123635672,1123651583,US
+1123635672,1123635711,EU
+1123635712,1123635967,AP
+1123635968,1123651583,US
 1123651584,1123651839,JM
 1123651840,1123652095,BB
 1123652096,1123652863,JM
@@ -14478,7 +13482,9 @@
 1123801088,1123801343,RU
 1123801344,1123848191,US
 1123848192,1123852287,CA
-1123852288,1123950591,US
+1123852288,1123929599,US
+1123929600,1123929855,CA
+1123929856,1123950591,US
 1123950592,1123958783,CA
 1123958784,1125064703,US
 1125064704,1125065215,GB
@@ -14608,7 +13614,9 @@
 1137524736,1137541119,CA
 1137541120,1137623039,US
 1137623040,1137639423,PR
-1137639424,1137704959,US
+1137639424,1137680959,US
+1137680960,1137680975,UA
+1137680976,1137704959,US
 1137704960,1137706239,CA
 1137706240,1137706495,US
 1137706496,1137712383,CA
@@ -14629,9 +13637,7 @@
 1137893376,1137917951,US
 1137917952,1137922047,CA
 1137922048,1137926143,US
-1137926144,1137926655,CA
-1137926656,1137926911,AW
-1137926912,1137929727,CA
+1137926144,1137929727,CA
 1137929728,1137929983,IE
 1137929984,1137934335,CA
 1137934336,1137950719,US
@@ -14799,7 +13805,11 @@
 1154488320,1154488831,A2
 1154488832,1156071423,US
 1156071424,1156079615,CA
-1156079616,1156263935,US
+1156079616,1156243455,US
+1156243456,1156245503,CA
+1156245504,1156249599,US
+1156249600,1156250623,CA
+1156250624,1156263935,US
 1156263936,1156265983,CA
 1156265984,1156296703,US
 1156296704,1156300799,CA
@@ -14811,7 +13821,13 @@
 1157912704,1157912831,CA
 1157912832,1157913215,US
 1157913216,1157913279,CA
-1157913280,1157931007,US
+1157913280,1157914194,US
+1157914195,1157914202,IN
+1157914203,1157914234,US
+1157914235,1157914242,IN
+1157914243,1157914258,US
+1157914259,1157914266,IN
+1157914267,1157931007,US
 1157931008,1157935103,BS
 1157935104,1157943295,US
 1157943296,1157947391,CA
@@ -14885,7 +13901,11 @@
 1159348224,1159356415,CA
 1159356416,1159421951,US
 1159421952,1159430143,CA
-1159430144,1159512575,US
+1159430144,1159480063,US
+1159480064,1159480319,CA
+1159480320,1159483903,US
+1159483904,1159484415,CA
+1159484416,1159512575,US
 1159512576,1159512831,CA
 1159512832,1159513599,US
 1159513600,1159514879,CA
@@ -14930,7 +13950,9 @@
 1160368128,1160373247,US
 1160373248,1160373503,AE
 1160373504,1160392703,US
-1160392704,1160396799,CA
+1160392704,1160392959,CA
+1160392960,1160393727,US
+1160393728,1160396799,CA
 1160396800,1160405759,US
 1160405760,1160406015,DO
 1160406016,1160406319,US
@@ -15014,8 +14036,10 @@
 1161428224,1161428991,KN
 1161428992,1161429247,US
 1161429248,1161429503,CA
-1161429504,1161429759,US
-1161429760,1161431039,CA
+1161429504,1161429951,US
+1161429952,1161430015,CA
+1161430016,1161430783,US
+1161430784,1161431039,CA
 1161431040,1161433087,A2
 1161433088,1161437183,CA
 1161437184,1161453567,US
@@ -15037,7 +14061,11 @@
 1161830426,1161830426,UA
 1161830427,1161830596,US
 1161830597,1161830597,UA
-1161830598,1161831384,US
+1161830598,1161831090,US
+1161831091,1161831091,DE
+1161831092,1161831305,US
+1161831306,1161831306,DE
+1161831307,1161831384,US
 1161831385,1161831385,UA
 1161831386,1161832483,US
 1161832484,1161832484,UA
@@ -15045,16 +14073,16 @@
 1161835226,1161835226,UA
 1161835227,1161835230,US
 1161835231,1161835231,PH
-1161835232,1161837567,US
+1161835232,1161835338,US
+1161835339,1161835339,DE
+1161835340,1161837567,US
 1161837568,1161837823,JP
 1161837824,1161885695,US
 1161885696,1161886207,JP
 1161886208,1161886975,US
 1161886976,1161887231,DE
 1161887232,1161887743,AU
-1161887744,1161900863,US
-1161900864,1161900895,A1
-1161900896,1161925631,US
+1161887744,1161925631,US
 1161925632,1161925887,EC
 1161925888,1161926399,US
 1161926400,1161926655,EC
@@ -15167,8 +14195,8 @@
 1163540480,1163540735,US
 1163540736,1163541503,CA
 1163541504,1163542015,US
-1163542016,1163542783,CA
-1163542784,1163543295,US
+1163542016,1163542527,CA
+1163542528,1163543295,US
 1163543296,1163543551,CA
 1163543552,1163544063,US
 1163544064,1163544319,CA
@@ -15237,7 +14265,9 @@
 1163580928,1163581183,CA
 1163581184,1163581695,US
 1163581696,1163581951,CA
-1163581952,1163582031,US
+1163581952,1163582003,US
+1163582004,1163582007,CA
+1163582008,1163582031,US
 1163582032,1163582039,CA
 1163582040,1163582079,US
 1163582080,1163582111,CA
@@ -15298,7 +14328,8 @@
 1168687104,1168697599,US
 1168697600,1168697855,GB
 1168697856,1168698111,NL
-1168698112,1168727551,US
+1168698112,1168698367,GB
+1168698368,1168727551,US
 1168727552,1168727807,ES
 1168727808,1168859135,US
 1168859136,1168863231,CA
@@ -15568,9 +14599,7 @@
 1209823488,1209823519,GB
 1209823520,1209823543,US
 1209823544,1209823551,GB
-1209823552,1209824335,US
-1209824336,1209824339,FR
-1209824340,1209824447,US
+1209823552,1209824447,US
 1209824448,1209824511,GB
 1209824512,1209824767,CN
 1209824768,1209861119,US
@@ -15592,9 +14621,7 @@
 1210420224,1210420479,IT
 1210420480,1210421503,US
 1210421504,1210421551,CA
-1210421552,1210447003,US
-1210447004,1210447004,CA
-1210447005,1210449919,US
+1210421552,1210449919,US
 1210449920,1210580991,CA
 1210580992,1210925055,US
 1210925056,1210941439,CA
@@ -15666,11 +14693,11 @@
 1224473600,1224474623,US
 1224474624,1224475647,GT
 1224475648,1224476671,US
-1224476672,1224476927,CW
+1224476672,1224476927,SX
 1224476928,1224477439,US
-1224477440,1224477695,CW
+1224477440,1224477695,SX
 1224477696,1224477951,US
-1224477952,1224478719,CW
+1224477952,1224478719,SX
 1224478720,1224480767,US
 1224480768,1224484863,JM
 1224484864,1224493055,GT
@@ -15790,7 +14817,9 @@
 1249139712,1249140735,MF
 1249140736,1249142015,US
 1249142016,1249142271,GB
-1249142272,1249163263,US
+1249142272,1249146879,US
+1249146880,1249147903,CA
+1249147904,1249163263,US
 1249163264,1249165311,CA
 1249165312,1249165823,US
 1249165824,1249166335,CA
@@ -15891,7 +14920,8 @@
 1249717760,1249718015,FI
 1249718016,1249718271,BE
 1249718272,1249720319,US
-1249720320,1249720367,AU
+1249720320,1249720351,AU
+1249720352,1249720367,JP
 1249720368,1249720383,SG
 1249720384,1249720511,AU
 1249720512,1249720527,IN
@@ -15922,7 +14952,8 @@
 1249721512,1249721519,TR
 1249721520,1249721527,ZA
 1249721528,1249721535,DK
-1249721536,1249721543,US
+1249721536,1249721539,PL
+1249721540,1249721543,US
 1249721544,1249721551,GB
 1249721552,1249721599,US
 1249721600,1249721607,AT
@@ -15951,7 +14982,9 @@
 1249721792,1249721799,KE
 1249721800,1249721807,TR
 1249721808,1249721815,ZA
-1249721816,1249722111,US
+1249721816,1249721833,US
+1249721834,1249721835,GB
+1249721836,1249722111,US
 1249722112,1249722367,IN
 1249722368,1249724671,US
 1249724672,1249724694,BE
@@ -16052,7 +15085,9 @@
 1264763648,1264766975,CA
 1264766976,1264990975,US
 1264990976,1264991231,NL
-1264991232,1266147327,US
+1264991232,1264991311,US
+1264991312,1264991319,JP
+1264991320,1266147327,US
 1266147328,1266155519,CA
 1266155520,1268200732,US
 1268200733,1268200733,VI
@@ -16096,7 +15131,9 @@
 1279952384,1279952895,CA
 1279952896,1279953151,US
 1279953152,1279953663,CA
-1279953664,1279959551,US
+1279953664,1279953759,US
+1279953760,1279953791,CA
+1279953792,1279959551,US
 1279959552,1279959807,CA
 1279959808,1279960479,US
 1279960480,1279960511,CA
@@ -16151,7 +15188,8 @@
 1280097280,1280097791,LC
 1280097792,1280098303,AG
 1280098304,1280102399,PR
-1280102400,1280131071,US
+1280102400,1280126975,US
+1280126976,1280131071,JP
 1280131072,1280139263,CA
 1280139264,1291845631,US
 1291845632,1292894207,DE
@@ -16205,7 +15243,9 @@
 1296236672,1296236799,US
 1296236800,1296237439,FR
 1296237440,1296237567,IT
-1296237568,1296238591,FR
+1296237568,1296237823,FR
+1296237824,1296237824,GB
+1296237825,1296238591,FR
 1296238592,1296239103,NL
 1296239104,1296239231,FR
 1296239232,1296239359,NL
@@ -16227,7 +15267,9 @@
 1296247296,1296248959,FR
 1296248960,1296249023,DE
 1296249024,1296249087,GB
-1296249088,1296250367,FR
+1296249088,1296249279,FR
+1296249280,1296249343,DE
+1296249344,1296250367,FR
 1296250368,1296250399,CZ
 1296250400,1296250431,DE
 1296250432,1296250463,PL
@@ -16262,7 +15304,8 @@
 1296256848,1296258303,FR
 1296258304,1296259071,NL
 1296259072,1296259839,FR
-1296259840,1296260351,NL
+1296259840,1296260095,NL
+1296260096,1296260351,US
 1296260352,1296261119,FR
 1296261120,1296262143,DE
 1296262144,1296262399,FR
@@ -16439,7 +15482,9 @@
 1297178624,1297178879,NL
 1297178880,1297182719,RO
 1297182720,1297184767,ES
-1297184768,1297215487,RO
+1297184768,1297203199,RO
+1297203200,1297211391,IR
+1297211392,1297215487,RO
 1297215488,1297217535,NL
 1297217536,1297219583,RO
 1297219584,1297285119,RU
@@ -16486,7 +15531,7 @@
 1297743872,1297760255,DE
 1297760256,1297776639,LT
 1297776640,1297782783,DE
-1297782784,1297784831,PT
+1297782784,1297784831,US
 1297784832,1297793023,DE
 1297793024,1297809407,UA
 1297809408,1297825791,PL
@@ -16516,7 +15561,9 @@
 1297981440,1297989631,RO
 1297989632,1297997823,CZ
 1297997824,1298006015,IT
-1298006016,1298017279,RU
+1298006016,1298016255,RU
+1298016256,1298016511,LT
+1298016512,1298017279,RU
 1298017280,1298018303,BY
 1298018304,1298020351,RU
 1298020352,1298022399,BY
@@ -16614,8 +15661,7 @@
 1304428544,1305477119,FR
 1305477120,1305739263,ES
 1305739264,1306001407,DK
-1306001408,1306132479,RU
-1306132480,1306198015,SE
+1306001408,1306198015,SE
 1306198016,1306206207,LV
 1306206208,1306214399,HR
 1306214400,1306222591,LT
@@ -16746,8 +15792,8 @@
 1307623424,1307627519,FR
 1307627520,1307631615,SE
 1307631616,1307635711,IT
-1307635712,1307637503,EE
-1307637504,1307637759,LV
+1307635712,1307636735,EE
+1307636736,1307637759,LV
 1307637760,1307639807,LT
 1307639808,1307643903,IT
 1307643904,1307652095,RU
@@ -16809,7 +15855,7 @@
 1307819264,1307819519,EU
 1307819520,1307819775,GB
 1307819776,1307820031,EU
-1307820032,1307824127,ES
+1307820032,1307824127,PT
 1307824128,1307828223,HU
 1307828224,1307832319,NL
 1307832320,1307836415,RU
@@ -16838,9 +15884,7 @@
 1307926528,1307930623,KZ
 1307930624,1307934719,RU
 1307934720,1307938815,FR
-1307938816,1307941242,US
-1307941243,1307941243,TR
-1307941244,1307942911,US
+1307938816,1307942911,TR
 1307942912,1307947007,RU
 1307947008,1307951103,CH
 1307951104,1307959295,RU
@@ -16938,7 +15982,8 @@
 1310588928,1310605311,RU
 1310605312,1310621695,PL
 1310621696,1310638079,RS
-1310638080,1310656511,RU
+1310638080,1310654463,UA
+1310654464,1310656511,RU
 1310656512,1310657535,GB
 1310657536,1310658559,SE
 1310658560,1310660607,RU
@@ -17075,7 +16120,8 @@
 1314652160,1314717695,HU
 1314717696,1314783231,SA
 1314783232,1314848767,DE
-1314848768,1315045375,RO
+1314848768,1314914303,SA
+1314914304,1315045375,RO
 1315045376,1315176447,SK
 1315176448,1315307519,QA
 1315307520,1315438591,CZ
@@ -17138,7 +16184,7 @@
 1315893248,1315897343,RU
 1315897344,1315901439,IR
 1315901440,1315905535,UA
-1315905536,1315909631,SI
+1315905536,1315909631,BA
 1315909632,1315913727,AZ
 1315913728,1315917823,DE
 1315917824,1315921919,RU
@@ -17159,7 +16205,15 @@
 1317011456,1317044223,BG
 1317044224,1317076991,CZ
 1317076992,1317109759,BE
-1317109760,1317126399,GB
+1317109760,1317111935,GB
+1317111936,1317111999,A1
+1317112000,1317117951,GB
+1317117952,1317118207,A1
+1317118208,1317119999,GB
+1317120000,1317120255,A1
+1317120256,1317120767,GB
+1317120768,1317120895,A1
+1317120896,1317126399,GB
 1317126400,1317126655,US
 1317126656,1317142527,GB
 1317142528,1317175295,PT
@@ -17238,9 +16292,7 @@
 1318682624,1318690815,RU
 1318690816,1318699007,DK
 1318699008,1318707199,IE
-1318707200,1318713023,GB
-1318713024,1318713087,FR
-1318713088,1318715391,GB
+1318707200,1318715391,FR
 1318715392,1318723583,BG
 1318723584,1318731775,IR
 1318731776,1318739967,PL
@@ -17332,7 +16384,6 @@
 1331861504,1331863551,CZ
 1331863552,1331865599,GB
 1331865600,1331869695,NL
-1331869696,1331871743,SA
 1331871744,1331873791,DK
 1331873792,1331877887,RU
 1331877888,1331879935,ES
@@ -17371,7 +16422,7 @@
 1331941376,1331943423,ES
 1331943424,1331945471,RU
 1331945472,1331947519,SE
-1331947520,1331949567,CH
+1331947520,1331949567,DE
 1331949568,1331951615,RU
 1331951616,1331953663,GE
 1331953664,1332019199,BG
@@ -17454,8 +16505,8 @@
 1334345728,1334378495,RU
 1334378496,1334411263,IT
 1334411264,1334444031,RU
-1334444032,1334476799,SE
-1334476800,1334477311,DK
+1334444032,1334476800,SE
+1334476801,1334477311,DK
 1334477312,1334478847,SE
 1334478848,1334479359,DK
 1334479360,1334479871,SE
@@ -17555,7 +16606,9 @@
 1334724608,1334724863,US
 1334724864,1334725631,NL
 1334725632,1334725887,SE
-1334725888,1334726143,NL
+1334725888,1334725900,NL
+1334725901,1334725901,SE
+1334725902,1334726143,NL
 1334726144,1334726399,LU
 1334726400,1334726655,SE
 1334726656,1334734847,RU
@@ -17636,8 +16689,7 @@
 1336627200,1336629247,NO
 1336629248,1336631295,DE
 1336631296,1336633343,IS
-1336633344,1336634879,ES
-1336634880,1336635391,PT
+1336633344,1336635391,PT
 1336635392,1336637439,RU
 1336637440,1336639487,UA
 1336639488,1336643583,HU
@@ -17736,13 +16788,16 @@
 1343017984,1343018495,RE
 1343018496,1343025151,FR
 1343025152,1343025663,RE
-1343025664,1343220479,FR
+1343025664,1343218687,FR
+1343218688,1343219711,DE
+1343219712,1343220479,FR
 1343220480,1343220671,DE
 1343220672,1343220735,FR
 1343220736,1343220863,GB
 1343220864,1343221055,FR
 1343221056,1343221119,GB
-1343221120,1343221759,FR
+1343221120,1343221247,DE
+1343221248,1343221759,FR
 1343221760,1343222271,GB
 1343222272,1343223679,FR
 1343223680,1343223687,LB
@@ -17811,6 +16866,7 @@
 1346589696,1346592767,US
 1346592768,1346596863,ES
 1346596864,1346600959,IT
+1346600960,1346605055,MU
 1346605056,1346609151,CH
 1346609152,1346617343,FR
 1346617344,1346621439,SE
@@ -18321,7 +17377,9 @@
 1347854600,1347854607,DE
 1347854608,1347857407,EU
 1347857408,1347858431,DE
-1347858432,1347862089,EU
+1347858432,1347858751,EU
+1347858752,1347858815,DE
+1347858816,1347862089,EU
 1347862090,1347862090,DE
 1347862091,1347862271,EU
 1347862272,1347862527,DE
@@ -18599,14 +17657,18 @@
 1357316096,1357317119,EU
 1357317120,1357317375,GB
 1357317376,1357317631,A2
-1357317632,1357321023,EU
+1357317632,1357318399,EU
+1357318400,1357318655,FR
+1357318656,1357321023,EU
 1357321024,1357321087,KE
 1357321088,1357321983,EU
 1357321984,1357322239,GB
 1357322240,1357322255,DE
 1357322256,1357322495,EU
 1357322496,1357322751,DE
-1357322752,1357323519,EU
+1357322752,1357323007,GB
+1357323008,1357323015,CG
+1357323016,1357323519,EU
 1357323520,1357323775,GB
 1357323776,1357323779,FI
 1357323780,1357324287,EU
@@ -18616,24 +17678,26 @@
 1357326338,1357327359,EU
 1357327360,1357327615,FR
 1357327616,1357328383,EU
-1357328384,1357328639,GB
-1357328640,1357328895,EU
-1357328896,1357329151,NL
-1357329152,1357329407,EU
+1357328384,1357328671,GB
+1357328672,1357328895,EU
+1357328896,1357329159,NL
+1357329160,1357329407,EU
 1357329408,1357329415,BE
 1357329416,1357330943,EU
 1357330944,1357331199,GB
 1357331200,1357335807,EU
 1357335808,1357336063,IT
-1357336064,1357340671,EU
+1357336064,1357337599,EU
+1357337600,1357337615,NL
+1357337616,1357340671,EU
 1357340672,1357341695,GB
 1357341696,1357342975,EU
 1357342976,1357343231,GB
 1357343232,1357343487,EU
 1357343488,1357343503,GB
 1357343504,1357344259,EU
-1357344260,1357344263,FR
-1357344264,1357344511,EU
+1357344260,1357344271,FR
+1357344272,1357344511,EU
 1357344512,1357344767,FR
 1357344768,1357346815,EU
 1357346816,1357346835,FR
@@ -18644,8 +17708,8 @@
 1357347376,1357347455,EU
 1357347456,1357347583,FR
 1357347584,1357347615,EU
-1357347616,1357347647,FR
-1357347648,1357347839,EU
+1357347616,1357347659,FR
+1357347660,1357347839,EU
 1357347840,1357348095,PL
 1357348096,1357348383,EU
 1357348384,1357348415,ES
@@ -18674,15 +17738,13 @@
 1357372928,1357373467,EU
 1357373468,1357373471,GB
 1357373472,1357373479,EU
-1357373480,1357373483,GB
-1357373484,1357373487,EU
-1357373488,1357373519,GB
+1357373480,1357373519,GB
 1357373520,1357373535,FI
 1357373536,1357373951,EU
-1357373952,1357374719,GB
-1357374720,1357377535,EU
-1357377536,1357377663,FR
-1357377664,1357377791,EU
+1357373952,1357374975,GB
+1357374976,1357377535,EU
+1357377536,1357377671,FR
+1357377672,1357377791,EU
 1357377792,1357378047,FR
 1357378048,1357381631,EU
 1357381632,1357414399,NO
@@ -18712,7 +17774,9 @@
 1357880064,1357883391,EU
 1357883392,1357883647,FR
 1357883648,1357883903,SE
-1357883904,1357885951,EU
+1357883904,1357885199,EU
+1357885200,1357885215,AT
+1357885216,1357885951,EU
 1357885952,1357886207,SE
 1357886208,1357889023,EU
 1357889024,1357889279,GB
@@ -18774,17 +17838,13 @@
 1357984528,1357984551,IT
 1357984552,1357984591,GB
 1357984592,1357984599,IT
-1357984600,1357984671,GB
-1357984672,1357984679,IT
-1357984680,1357984831,GB
+1357984600,1357984831,GB
 1357984832,1357984839,IT
 1357984840,1357984911,GB
 1357984912,1357984919,IT
 1357984920,1357985015,GB
 1357985016,1357985023,IT
-1357985024,1357985599,GB
-1357985600,1357985607,IT
-1357985608,1357985791,GB
+1357985024,1357985791,GB
 1357985792,1357987839,DE
 1357987840,1357991935,GB
 1357991936,1357996031,NO
@@ -18829,9 +17889,7 @@
 1358172160,1358176255,CY
 1358176256,1358180351,RU
 1358180352,1358184447,ES
-1358184448,1358186607,SE
-1358186608,1358186623,NO
-1358186624,1358187775,SE
+1358184448,1358187775,SE
 1358187776,1358187839,NO
 1358187840,1358192639,SE
 1358192640,1358196735,HU
@@ -18941,7 +17999,9 @@
 1358668160,1358668167,PT
 1358668168,1358668447,GB
 1358668448,1358668455,PT
-1358668456,1358670943,GB
+1358668456,1358668623,GB
+1358668624,1358668631,PT
+1358668632,1358670943,GB
 1358670944,1358670951,FR
 1358670952,1358670975,GB
 1358670976,1358670991,PT
@@ -19010,9 +18070,7 @@
 1358861568,1358861823,DE
 1358861824,1358862335,FR
 1358862336,1358862847,US
-1358862848,1358862898,DK
-1358862899,1358862899,NO
-1358862900,1358863103,DK
+1358862848,1358863103,DK
 1358863104,1358863359,EU
 1358863360,1358863615,US
 1358863616,1358864383,GB
@@ -19050,9 +18108,7 @@
 1359003648,1359020031,CZ
 1359020032,1359036415,FR
 1359036416,1359052799,GB
-1359052800,1359063039,RU
-1359063040,1359064063,PL
-1359064064,1359101951,RU
+1359052800,1359101951,RU
 1359101952,1359118335,GB
 1359118336,1359119199,DE
 1359119200,1359119231,NL
@@ -19338,9 +18394,7 @@
 1361018880,1361022975,AT
 1361022976,1361027071,IT
 1361027072,1361035263,IR
-1361035264,1361035627,NL
 1361035628,1361035631,DZ
-1361035632,1361039359,NL
 1361039360,1361041407,IE
 1361041408,1361042431,NL
 1361042432,1361043455,PL
@@ -19532,11 +18586,7 @@
 1365218192,1365218199,US
 1365218200,1365219167,NL
 1365219168,1365219168,GB
-1365219169,1365219391,NL
-1365219392,1365219407,MY
-1365219408,1365219703,NL
-1365219704,1365219711,US
-1365219712,1365220231,NL
+1365219169,1365220231,NL
 1365220232,1365220239,IE
 1365220240,1365220503,NL
 1365220504,1365220507,IE
@@ -19738,7 +18788,9 @@
 1372699904,1372700159,DE
 1372700160,1372702719,EU
 1372702720,1372703231,DE
-1372703232,1372704767,EU
+1372703232,1372703615,EU
+1372703616,1372703743,DE
+1372703744,1372704767,EU
 1372704768,1372713983,DE
 1372713984,1372715007,EU
 1372715008,1372717055,DE
@@ -19909,7 +18961,9 @@
 1382203392,1382205439,GB
 1382205440,1382213631,EU
 1382213632,1382219775,GB
-1382219776,1382222847,SE
+1382219776,1382222807,SE
+1382222808,1382222815,FI
+1382222816,1382222847,SE
 1382222848,1382223103,FI
 1382223104,1382252543,SE
 1382252544,1382268927,CZ
@@ -19971,7 +19025,9 @@
 1383243776,1383251967,YE
 1383251968,1383260159,CZ
 1383260160,1383268351,RU
-1383268352,1383273983,IR
+1383268352,1383272191,IR
+1383272192,1383272447,NL
+1383272448,1383273983,IR
 1383273984,1383274248,KW
 1383274249,1383274249,IR
 1383274250,1383275775,KW
@@ -20098,7 +19154,9 @@
 1385218048,1385226239,UA
 1385226240,1385234431,GB
 1385234432,1385242623,DE
-1385242624,1385250815,GB
+1385242624,1385250431,GB
+1385250432,1385250559,A1
+1385250560,1385250815,GB
 1385250816,1385259007,PL
 1385259008,1385267199,IT
 1385267200,1385275391,SE
@@ -20240,7 +19298,13 @@
 1388642304,1388650495,FI
 1388650496,1388658687,PL
 1388658688,1388666879,GB
-1388666880,1388675071,FR
+1388666880,1388671097,FR
+1388671098,1388671098,RE
+1388671099,1388671763,FR
+1388671764,1388671764,RE
+1388671765,1388672244,FR
+1388672245,1388672245,RE
+1388672246,1388675071,FR
 1388675072,1388677631,EU
 1388677632,1388677887,NL
 1388677888,1388678143,EU
@@ -20308,7 +19372,11 @@
 1388796683,1388796687,GB
 1388796688,1388797951,NL
 1388797952,1388806143,RU
-1388806144,1388814335,DE
+1388806144,1388806399,DE
+1388806400,1388806655,A1
+1388806656,1388811775,DE
+1388811776,1388812031,A1
+1388812032,1388814335,DE
 1388814336,1388822015,AX
 1388822016,1388822527,SE
 1388822528,1388830719,AM
@@ -20363,7 +19431,9 @@
 1389477888,1389494271,BY
 1389494272,1389510655,DE
 1389510656,1389527039,NL
-1389527040,1389543423,PL
+1389527040,1389528551,RO
+1389528552,1389528552,PL
+1389528553,1389543423,RO
 1389543424,1389557247,DE
 1389557248,1389557375,EU
 1389557376,1389557391,DE
@@ -20492,7 +19562,9 @@
 1400719360,1400721407,DE
 1400721408,1400723455,EU
 1400723456,1400727551,DE
-1400727552,1400729599,EU
+1400727552,1400727807,EU
+1400727808,1400727935,DE
+1400727936,1400729599,EU
 1400729600,1400730623,DE
 1400730624,1400731647,EU
 1400731648,1400733695,DE
@@ -20591,7 +19663,9 @@
 1401634816,1401651199,HR
 1401651200,1401667583,RU
 1401667584,1401683967,IT
-1401683968,1401712895,SE
+1401683968,1401708287,SE
+1401708288,1401708543,DE
+1401708544,1401712895,SE
 1401712896,1401713151,DE
 1401713152,1401749503,SE
 1401749504,1401765887,DE
@@ -20602,7 +19676,6 @@
 1401819136,1401821183,BG
 1401821184,1401825279,GB
 1401825280,1401827327,PL
-1401827328,1401829375,GB
 1401829376,1401831423,PL
 1401831424,1401833471,GB
 1401833472,1401835519,FI
@@ -20649,7 +19722,9 @@
 1401935872,1401937919,FI
 1401937920,1401939967,GB
 1401939968,1401942015,UA
-1401942016,1401944063,EU
+1401942016,1401942783,EU
+1401942784,1401943039,GB
+1401943040,1401944063,EU
 1401944064,1401946111,BG
 1401946112,1401962495,FR
 1401962496,1401978879,PL
@@ -20671,7 +19746,9 @@
 1402142720,1402159103,ES
 1402159104,1402175487,IT
 1402175488,1402191871,IE
-1402191872,1402208255,IR
+1402191872,1402194943,IR
+1402194944,1402195967,PT
+1402195968,1402208255,IR
 1402208256,1402224639,CZ
 1402224640,1402241023,BG
 1402241024,1402257407,GB
@@ -20798,21 +19875,16 @@
 1404215296,1404219391,LV
 1404219392,1404220415,SE
 1404220416,1404221439,EE
-1404221440,1404222463,RU
-1404222464,1404225535,SE
-1404225536,1404227071,RU
-1404227072,1404227583,SE
+1404221440,1404227583,SE
 1404227584,1404231679,LV
 1404231680,1404232191,SE
 1404232192,1404232703,NO
 1404232704,1404234751,SE
 1404234752,1404239871,HR
-1404239872,1404256255,SE
-1404256256,1404305407,RU
+1404239872,1404305407,SE
 1404305408,1404313599,EE
 1404313600,1404321791,HR
-1404321792,1404338175,RU
-1404338176,1404340223,SE
+1404321792,1404340223,SE
 1404340224,1404342271,HR
 1404342272,1404379135,SE
 1404379136,1404383231,AT
@@ -20820,10 +19892,7 @@
 1404385280,1404386047,LT
 1404386048,1404387327,SE
 1404387328,1404420095,LT
-1404420096,1404426502,RU
-1404426503,1404426503,SE
-1404426504,1404436479,RU
-1404436480,1404444671,SE
+1404420096,1404444671,SE
 1404444672,1404452863,NO
 1404452864,1404510207,SE
 1404510208,1404518399,HR
@@ -20861,7 +19930,7 @@
 1404813312,1404815871,EE
 1404815872,1404816383,LT
 1404816384,1404829695,NL
-1404829696,1404870655,RU
+1404829696,1404870655,SE
 1404870656,1404872703,LT
 1404872704,1404874751,SE
 1404874752,1404875775,LV
@@ -21339,7 +20408,9 @@
 1411842048,1411850239,NL
 1411850240,1411858431,FR
 1411858432,1411870719,DE
-1411870720,1411872767,EU
+1411870720,1411872056,EU
+1411872057,1411872057,GB
+1411872058,1411872767,EU
 1411872768,1411874815,NL
 1411874816,1411876863,RU
 1411876864,1411878911,EU
@@ -21494,11 +20565,15 @@
 1424503716,1424523263,ES
 1424523264,1424556031,RO
 1424556032,1424588799,EG
-1424588800,1424595743,GB
+1424588800,1424595726,GB
+1424595727,1424595727,IT
+1424595728,1424595743,GB
 1424595744,1424595751,IT
 1424595752,1424597069,GB
 1424597070,1424597070,CZ
-1424597071,1424603023,GB
+1424597071,1424601887,GB
+1424601888,1424601903,NL
+1424601904,1424603023,GB
 1424603024,1424603039,US
 1424603040,1424604671,GB
 1424604672,1424604927,EU
@@ -21506,15 +20581,25 @@
 1424604976,1424604991,NL
 1424604992,1424607743,GB
 1424607744,1424607775,DE
-1424607776,1424610992,GB
+1424607776,1424608083,GB
+1424608084,1424608087,FR
+1424608088,1424609247,GB
+1424609248,1424609255,DE
+1424609256,1424610643,GB
+1424610644,1424610644,PL
+1424610645,1424610992,GB
 1424610993,1424610993,FR
 1424610994,1424611002,GB
 1424611003,1424611003,FR
 1424611004,1424611005,GB
 1424611006,1424611006,FR
-1424611007,1424617215,GB
+1424611007,1424611295,GB
+1424611296,1424611311,BE
+1424611312,1424617215,GB
 1424617216,1424617231,IT
-1424617232,1424621567,GB
+1424617232,1424619855,GB
+1424619856,1424619863,BE
+1424619864,1424621567,GB
 1424621568,1424625663,PL
 1424625664,1424629759,GB
 1424629760,1424633855,PL
@@ -21622,7 +20707,11 @@
 1425970176,1425970431,FR
 1425970432,1425971967,EU
 1425971968,1425972223,A2
-1425972224,1425977343,EU
+1425972224,1425974271,EU
+1425974272,1425974783,GB
+1425974784,1425975807,EU
+1425975808,1425976063,FR
+1425976064,1425977343,EU
 1425977344,1425980415,FR
 1425980416,1425980671,IQ
 1425980672,1425981439,A2
@@ -21635,13 +20724,18 @@
 1426587648,1426604031,SE
 1426604032,1426620415,DE
 1426636800,1426653183,GB
-1426653184,1426669567,RO
+1426653184,1426660657,RO
+1426660658,1426660658,US
+1426660659,1426669567,RO
 1426669568,1426685951,IR
 1426685952,1426702335,TJ
 1426702336,1426718719,LV
 1426718720,1426731007,SI
 1426731008,1426735103,HR
-1426735104,1426751487,BE
+1426735104,1426743295,BE
+1426743296,1426745599,LU
+1426745600,1426745855,BE
+1426745856,1426751487,LU
 1426751488,1426767871,FR
 1426767872,1426784255,DE
 1426784256,1426800639,SE
@@ -21655,9 +20749,7 @@
 1426915328,1426931711,AT
 1426931712,1426948095,CZ
 1426948096,1426964479,DE
-1426964480,1426967287,GB
-1426967288,1426967295,ES
-1426967296,1426980863,GB
+1426964480,1426980863,GB
 1426980864,1426997247,BG
 1426997248,1427013631,PL
 1427013632,1427030015,FR
@@ -21699,7 +20791,9 @@
 1427722028,1427722030,SG
 1427722031,1427722031,DE
 1427722032,1427722033,SG
-1427722034,1427728088,DE
+1427722034,1427722093,DE
+1427722094,1427722094,EE
+1427722095,1427728088,DE
 1427728089,1427728100,SG
 1427728101,1427728599,DE
 1427728600,1427728600,SK
@@ -21713,7 +20807,9 @@
 1427832832,1427865599,BE
 1427865600,1427898367,DK
 1427898368,1427914751,RU
-1427914752,1427931135,BE
+1427914752,1427930965,BE
+1427930966,1427930966,LU
+1427930967,1427931135,BE
 1427931136,1427947519,PL
 1427947520,1427963903,RU
 1427963904,1427980287,TR
@@ -21924,8 +21020,7 @@
 1433907200,1433909247,IT
 1433909248,1433911295,BE
 1433911296,1433913343,ES
-1433913344,1433915391,NL
-1433915392,1433917439,DE
+1433913344,1433917439,DE
 1433917440,1433919487,BE
 1433919488,1433921535,GB
 1433921536,1433921735,CH
@@ -22028,7 +21123,23 @@
 1436542976,1436545023,NL
 1436545024,1436547071,DE
 1436547072,1436549119,GB
-1436549120,1436680191,CZ
+1436549120,1436549887,CZ
+1436549888,1436552447,SK
+1436552448,1436552703,CZ
+1436552704,1436553727,SK
+1436553728,1436553983,CZ
+1436553984,1436554751,SK
+1436554752,1436555007,CZ
+1436555008,1436557055,SK
+1436557056,1436557311,CZ
+1436557312,1436559359,SK
+1436559360,1436559615,CZ
+1436559616,1436560127,SK
+1436560128,1436560383,CZ
+1436560384,1436564479,SK
+1436564480,1436564735,CZ
+1436564736,1436614655,SK
+1436614656,1436680191,CZ
 1436680192,1436811263,SK
 1436811264,1437073407,NO
 1437073408,1437335551,FR
@@ -22115,11 +21226,20 @@
 1439358976,1439367167,RU
 1439367168,1439373311,NL
 1439373312,1439373567,SE
-1439373568,1439399935,NL
+1439373568,1439383551,NL
+1439383552,1439399935,FR
 1439399936,1439432703,DK
-1439432704,1439477759,RO
+1439432704,1439441919,RO
+1439441920,1439442943,ES
+1439442944,1439453183,RO
+1439453184,1439457279,IR
+1439457280,1439460607,RO
+1439460608,1439460863,MD
+1439460864,1439477759,RO
 1439477760,1439479807,MD
-1439479808,1439498239,RO
+1439479808,1439485951,RO
+1439485952,1439490047,IR
+1439490048,1439498239,RO
 1439498240,1439513599,DE
 1439513600,1439514623,GB
 1439514624,1439516671,IT
@@ -22171,7 +21291,8 @@
 1440514048,1440546815,DE
 1440546816,1440579583,NO
 1440579584,1440645119,PL
-1440645120,1440669695,RS
+1440645120,1440653311,GB
+1440653312,1440669695,RS
 1440669696,1440671743,NL
 1440671744,1440672767,EE
 1440672768,1440710655,NL
@@ -22297,7 +21418,9 @@
 1446576128,1446608895,IR
 1446608896,1446641663,BY
 1446641664,1446674431,SI
-1446674432,1446707199,DK
+1446674432,1446704127,DK
+1446704128,1446705151,ES
+1446705152,1446707199,DK
 1446707200,1446739967,AT
 1446739968,1446772735,HU
 1446772736,1446805503,SA
@@ -22324,28 +21447,49 @@
 1449590784,1449656319,DE
 1449656320,1449664511,RO
 1449664512,1449668607,IR
-1449668608,1449706495,RO
+1449668608,1449670743,SE
+1449670744,1449670744,RO
+1449670745,1449672703,SE
+1449672704,1449676799,RO
+1449676800,1449684991,IR
+1449684992,1449695231,RO
+1449695232,1449697279,SE
+1449697280,1449706495,RO
 1449706496,1449707519,MD
-1449707520,1449736191,RO
-1449736192,1449738239,MD
-1449738240,1449742335,RO
+1449707520,1449709567,SE
+1449709568,1449715711,RO
+1449715712,1449717759,IR
+1449717760,1449734143,RO
+1449734144,1449736191,IT
+1449736192,1449742335,RO
 1449742336,1449744383,MD
-1449744384,1449765887,RO
+1449744384,1449750527,RO
+1449750528,1449752575,SE
+1449752576,1449754623,RO
+1449754624,1449758719,IR
+1449758720,1449765887,RO
 1449765888,1449766911,MD
 1449766912,1449775103,RO
 1449775104,1449776127,MD
-1449776128,1449819135,RO
-1449819136,1449820159,MD
-1449820160,1449824255,RO
+1449776128,1449793279,RO
+1449793280,1449793535,NL
+1449793536,1449824255,RO
 1449824256,1449826303,MD
-1449826304,1449840639,RO
+1449826304,1449828351,RO
+1449828352,1449830399,SE
+1449830400,1449840639,RO
 1449840640,1449852927,MD
 1449852928,1449857023,IR
 1449857024,1449869311,RO
 1449869312,1449870335,MD
-1449870336,1449883647,RO
+1449870336,1449873407,RO
+1449873408,1449877503,IR
+1449877504,1449879039,RO
+1449879040,1449879295,SG
+1449879296,1449883647,RO
 1449883648,1449885695,BE
-1449885696,1449893887,RO
+1449885696,1449889791,RO
+1449889792,1449893887,IR
 1449893888,1449895935,MD
 1449895936,1449906175,RO
 1449906176,1449910271,IR
@@ -22473,7 +21617,9 @@
 1467285504,1467301887,RU
 1467301888,1467318271,GB
 1467318272,1467334655,RU
-1467334656,1467346495,GB
+1467334656,1467345023,GB
+1467345024,1467345151,A1
+1467345152,1467346495,GB
 1467346496,1467346559,A1
 1467346560,1467351039,GB
 1467351040,1467367423,NO
@@ -22668,7 +21814,8 @@
 1475477504,1475493887,HU
 1475493888,1475510271,RU
 1475510272,1475543039,GB
-1475543040,1475559423,RO
+1475543040,1475545087,RO
+1475545088,1475559423,KZ
 1475559424,1475571711,GR
 1475571712,1475572735,BG
 1475572736,1475575807,GR
@@ -22993,7 +22140,9 @@
 1489649664,1489650687,FR
 1489650688,1489651199,EU
 1489651200,1489653247,FR
-1489653248,1489657855,EU
+1489653248,1489655295,EU
+1489655296,1489655551,GR
+1489655552,1489657855,EU
 1489657856,1489659647,IT
 1489659648,1489661951,FR
 1489661952,1489662975,EU
@@ -23006,15 +22155,20 @@
 1489731584,1489764351,BG
 1489764352,1489797119,RU
 1489797120,1489829887,KZ
-1489829888,1489862655,DE
+1489829888,1489856527,DE
+1489856528,1489856543,US
+1489856544,1489862655,DE
 1489862656,1489928191,RU
 1489928192,1489960959,SE
 1489960960,1489993727,HR
 1489993728,1490026495,LU
-1490026496,1490028543,US
-1490028544,1490029055,UA
-1490029056,1490042879,NL
-1490042880,1490059263,CZ
+1490026496,1490028543,NL
+1490028544,1490028671,GB
+1490028672,1490028799,DE
+1490028800,1490042879,NL
+1490042880,1490053375,CZ
+1490053376,1490054143,PL
+1490054144,1490059263,CZ
 1490059264,1490075647,DE
 1490075648,1490092031,GB
 1490092032,1490108415,DE
@@ -23225,7 +22379,8 @@
 1495207936,1495209983,RU
 1495212032,1495214079,RU
 1495214080,1495216127,CZ
-1495216128,1495220223,IT
+1495216128,1495218175,IT
+1495218176,1495220223,NL
 1495220224,1495222271,PL
 1495222272,1495224319,IT
 1495224320,1495228415,RU
@@ -23248,9 +22403,15 @@
 1495263232,1495265279,GB
 1495265280,1495267327,US
 1495267328,1495269375,SE
-1495269376,1495283711,RO
-1495283712,1495287807,MD
-1495287808,1495304191,RO
+1495269376,1495277567,IR
+1495277568,1495279615,SE
+1495279616,1495283711,RO
+1495283712,1495285759,MD
+1495285760,1495287807,US
+1495287808,1495289855,SE
+1495289856,1495293951,RO
+1495293952,1495298047,IR
+1495298048,1495304191,RO
 1495304192,1495306239,MD
 1495306240,1495306573,GB
 1495306574,1495306574,RO
@@ -23258,36 +22419,48 @@
 1495308288,1495313407,RO
 1495313408,1495314431,MD
 1495314432,1495326719,RO
-1495326720,1495335935,MD
-1495335936,1495416831,RO
+1495326720,1495332863,MD
+1495332864,1495333887,RO
+1495333888,1495335935,MD
+1495335936,1495362559,RO
+1495362560,1495363583,ES
+1495363584,1495369727,RO
+1495369728,1495371775,SE
+1495371776,1495408639,RO
+1495408640,1495416831,IR
 1495416832,1495418879,MD
-1495418880,1495429119,RO
-1495429120,1495431167,MD
-1495431168,1495442431,RO
-1495442432,1495443455,MD
-1495443456,1495446527,RO
-1495446528,1495447551,MD
-1495447552,1495449599,RO
+1495418880,1495433215,RO
+1495433216,1495441407,IR
+1495441408,1495444479,RO
+1495444480,1495444735,SG
+1495444736,1495447551,RO
+1495447552,1495449599,SE
 1495449600,1495451647,MD
 1495451648,1495452671,RO
 1495452672,1495453695,MD
-1495453696,1495459839,RO
-1495459840,1495460863,MD
-1495460864,1495468031,RO
+1495453696,1495461887,RO
+1495461888,1495463935,SE
+1495463936,1495468031,RO
 1495468032,1495470079,MD
-1495470080,1495476223,RO
-1495476224,1495478271,MD
-1495478272,1495487487,RO
+1495470080,1495487487,RO
 1495487488,1495488511,MD
-1495488512,1495492607,RO
-1495492608,1495494655,MD
-1495494656,1495508991,RO
-1495508992,1495510015,MD
+1495488512,1495489279,RO
+1495489280,1495489535,MD
+1495489536,1495498239,RO
+1495498240,1495498495,SG
+1495498496,1495508991,RO
+1495508992,1495510015,IT
 1495510016,1495517183,RO
 1495517184,1495518207,MD
-1495518208,1495571455,RO
+1495518208,1495543807,RO
+1495543808,1495547903,IR
+1495547904,1495556095,RO
+1495556096,1495560191,IR
+1495560192,1495571455,RO
 1495571456,1495572479,MD
-1495572480,1495597055,RO
+1495572480,1495576575,RO
+1495576576,1495580671,IR
+1495580672,1495597055,RO
 1495597056,1495601151,IR
 1495601152,1495608319,RO
 1495608320,1495609343,MD
@@ -23295,97 +22468,116 @@
 1495623680,1495623935,MD
 1495623936,1495632127,RO
 1495632128,1495632639,MD
-1495632640,1495670783,RO
+1495632640,1495642111,RO
+1495642112,1495644159,SE
+1495644160,1495658495,RO
+1495658496,1495662591,IR
+1495662592,1495670783,RO
 1495670784,1495671807,MD
 1495671808,1495672831,RO
 1495672832,1495674879,ES
-1495674880,1495678975,RO
-1495678976,1495679999,MD
-1495680000,1495682047,RO
+1495674880,1495682047,RO
 1495682048,1495683071,MD
-1495683072,1495747583,RO
+1495683072,1495687167,IR
+1495687168,1495747583,RO
 1495747584,1495748607,MD
 1495748608,1495748863,RO
 1495748864,1495749119,GB
 1495749120,1495749631,RO
 1495749632,1495750655,MD
 1495750656,1495752703,RO
-1495752704,1495755775,MD
-1495755776,1495756799,RO
-1495756800,1495758847,MD
-1495758848,1495759871,RO
+1495752704,1495754751,MD
+1495754752,1495759359,RO
+1495759360,1495759615,SG
+1495759616,1495759871,RO
 1495759872,1495760127,MD
 1495760128,1495760895,RO
 1495760896,1495762943,DE
-1495762944,1495771135,RO
+1495762944,1495765759,RO
+1495765760,1495766015,NL
+1495766016,1495771135,RO
 1495771136,1495772159,PL
 1495772160,1495782655,RO
 1495782656,1495782911,GB
 1495782912,1495790079,RO
 1495790080,1495790335,MD
-1495790336,1495793663,RO
-1495793664,1495795711,MD
-1495795712,1495845631,RO
+1495790336,1495845631,RO
 1495845632,1495845887,GB
-1495845888,1495852031,RO
-1495852032,1495853055,MD
-1495853056,1495875583,RO
-1495875584,1495891967,MD
-1495891968,1495941119,RO
-1495941120,1495942143,MD
-1495942144,1495943167,RO
-1495943168,1495945215,MD
-1495945216,1495951359,RO
+1495845888,1495855103,RO
+1495855104,1495859199,IR
+1495859200,1495861247,RO
+1495861248,1495865343,IR
+1495865344,1495891455,RO
+1495891456,1495891711,MD
+1495891712,1495900159,RO
+1495900160,1495902207,SE
+1495902208,1495908351,RO
+1495908352,1495922687,IR
+1495922688,1495926783,RO
+1495926784,1495927039,SG
+1495927040,1495951359,RO
 1495951360,1495952383,MD
-1495952384,1495957503,RO
-1495957504,1495958527,MD
-1495958528,1495966719,RO
-1495966720,1495967743,MD
+1495952384,1495967743,RO
 1495967744,1495968767,NL
 1495968768,1495970815,RO
 1495970816,1495971839,MD
 1495971840,1495982079,RO
 1495982080,1495983103,MD
-1495983104,1495986175,RO
-1495986176,1495988223,MD
-1495988224,1495990271,RO
+1495983104,1495990271,RO
 1495990272,1495994367,IR
-1495994368,1496004607,RO
-1496004608,1496005631,MD
-1496005632,1496018943,RO
-1496018944,1496020991,MD
-1496020992,1496023039,RO
-1496023040,1496024063,MD
-1496024064,1496033279,RO
-1496033280,1496034303,MD
-1496034304,1496053759,RO
-1496053760,1496055807,MD
-1496055808,1496078335,RO
+1495994368,1495998463,RO
+1495998464,1495998719,SG
+1495998720,1496012799,RO
+1496012800,1496016895,IR
+1496016896,1496049663,RO
+1496049664,1496051711,SE
+1496051712,1496055807,RO
+1496055808,1496057855,SE
+1496057856,1496078335,RO
 1496078336,1496079359,MD
 1496079360,1496084991,RO
 1496084992,1496085247,MD
 1496085248,1496094719,RO
 1496094720,1496095743,MD
-1496095744,1496121343,RO
+1496095744,1496119295,RO
+1496119296,1496121343,SE
 1496121344,1496122367,MD
 1496122368,1496131583,RO
 1496131584,1496132607,MD
 1496132608,1496133631,RO
 1496133632,1496137727,IR
-1496137728,1496197119,RO
+1496137728,1496180735,RO
+1496180736,1496182783,SE
+1496182784,1496188927,RO
+1496188928,1496189951,ES
+1496189952,1496190975,RO
+1496190976,1496191999,SE
+1496192000,1496192255,RO
+1496192256,1496193023,SE
+1496193024,1496197119,RO
 1496197120,1496197631,MD
-1496197632,1496228863,RO
+1496197632,1496203263,RO
+1496203264,1496205311,IT
+1496205312,1496213503,RO
+1496213504,1496215551,IT
+1496215552,1496228863,RO
 1496228864,1496229887,MD
-1496229888,1496238079,RO
-1496238080,1496240127,MD
+1496229888,1496236031,RO
+1496236032,1496238079,IT
+1496238080,1496240127,IQ
 1496240128,1496262911,RO
 1496262912,1496263167,US
-1496263168,1496276735,RO
+1496263168,1496268799,RO
+1496268800,1496272895,IR
+1496272896,1496276735,RO
 1496276736,1496276991,MD
-1496276992,1496295423,RO
+1496276992,1496285183,RO
+1496285184,1496293375,IR
+1496293376,1496295423,RO
 1496295424,1496297471,GB
-1496297472,1496299519,MD
-1496299520,1496317951,RO
+1496297472,1496299519,RO
+1496299520,1496301567,SE
+1496301568,1496317951,RO
 1496317952,1497366527,DE
 1497366528,1498415103,PL
 1498415104,1499463679,FR
@@ -23511,13 +22703,15 @@
 1502920704,1502937087,RU
 1502937088,1502953471,RO
 1502953472,1502969855,MD
-1502969856,1502975231,FR
+1502969856,1502973951,FR
+1502973952,1502974975,DE
+1502974976,1502975231,FR
 1502975232,1502975247,GB
 1502975248,1502975327,FR
 1502975328,1502975359,GB
 1502975360,1502975743,FR
-1502975744,1502975999,DE
-1502976000,1502978047,FR
+1502975744,1502977023,DE
+1502977024,1502978047,FR
 1502978048,1502979071,US
 1502979072,1502979135,FR
 1502979136,1502979199,GB
@@ -23525,7 +22719,11 @@
 1502979216,1502979231,CZ
 1502979232,1502980351,FR
 1502980352,1502980607,US
-1502980608,1502981887,FR
+1502980608,1502980879,FR
+1502980880,1502980895,DE
+1502980896,1502980991,FR
+1502980992,1502981119,DE
+1502981120,1502981887,FR
 1502981888,1502982143,NL
 1502982144,1502986239,FR
 1502986240,1502999734,DE
@@ -23546,7 +22744,9 @@
 1503084544,1503100927,GB
 1503100928,1503117311,RU
 1503117312,1503133695,NO
-1503133696,1503395839,PT
+1503133696,1503370138,PT
+1503370139,1503370139,GB
+1503370140,1503395839,PT
 1503395840,1503657983,FR
 1503657984,1503690751,SE
 1503690752,1503723519,IS
@@ -23725,7 +22925,22 @@
 1503905624,1503905647,DE
 1503905648,1503905655,IT
 1503905656,1503905663,AT
-1503905664,1503920127,DE
+1503905664,1503905863,DE
+1503905864,1503905871,FI
+1503905872,1503905895,DE
+1503905896,1503905903,GB
+1503905904,1503905983,DE
+1503905984,1503905991,UA
+1503905992,1503906015,DE
+1503906016,1503906023,AT
+1503906024,1503906031,DE
+1503906032,1503906039,SK
+1503906040,1503906055,DE
+1503906056,1503906063,CH
+1503906064,1503906071,TR
+1503906072,1503906111,DE
+1503906112,1503906175,TR
+1503906176,1503920127,DE
 1503920128,1503985663,HR
 1503985664,1504018431,IR
 1504018432,1504051199,RO
@@ -23734,7 +22949,9 @@
 1504116736,1504149503,PL
 1504149504,1504149759,GB
 1504149760,1504150015,ES
-1504150016,1504154623,GB
+1504150016,1504151039,GB
+1504151040,1504151295,FR
+1504151296,1504154623,GB
 1504154624,1504155647,IE
 1504155648,1504247807,GB
 1504247808,1504313343,RU
@@ -23835,7 +23052,9 @@
 1506410496,1506422063,DE
 1506422064,1506422079,GB
 1506422080,1506443263,DE
-1506443264,1506445103,GB
+1506443264,1506444757,GB
+1506444758,1506444758,DE
+1506444759,1506445103,GB
 1506445104,1506445119,DE
 1506445120,1506445135,GB
 1506445136,1506445151,DE
@@ -23845,7 +23064,9 @@
 1506446824,1506446831,NL
 1506446832,1506448319,GB
 1506448320,1506448383,IT
-1506448384,1506450047,GB
+1506448384,1506449263,GB
+1506449264,1506449279,BE
+1506449280,1506450047,GB
 1506450048,1506450111,CH
 1506450112,1506450863,GB
 1506450864,1506450879,CZ
@@ -23857,13 +23078,21 @@
 1506458245,1506458245,CH
 1506458246,1506459177,GB
 1506459178,1506459178,EU
-1506459179,1506459968,GB
+1506459179,1506459207,GB
+1506459208,1506459247,BE
+1506459248,1506459295,GB
+1506459296,1506459327,BE
+1506459328,1506459968,GB
 1506459969,1506459969,FR
 1506459970,1506460151,GB
 1506460152,1506460159,FR
-1506460160,1506462719,GB
+1506460160,1506462511,GB
+1506462512,1506462527,FR
+1506462528,1506462719,GB
 1506462720,1506462975,IT
-1506462976,1506463679,GB
+1506462976,1506463551,GB
+1506463552,1506463615,DE
+1506463616,1506463679,GB
 1506463680,1506463695,DE
 1506463696,1506464895,GB
 1506464896,1506464911,NL
@@ -23874,8 +23103,8 @@
 1506465280,1506466383,GB
 1506466384,1506466391,DE
 1506466392,1506466399,GB
-1506466400,1506466431,DE
-1506466432,1506469663,GB
+1506466400,1506466559,DE
+1506466560,1506469663,GB
 1506469664,1506469695,IT
 1506469696,1506469759,GB
 1506469760,1506469775,IT
@@ -23920,9 +23149,7 @@
 1506793472,1506795519,RU
 1506795520,1506799615,CH
 1506799616,1506801663,LV
-1506801664,1506803135,DE
-1506803136,1506803151,CH
-1506803152,1506803711,DE
+1506801664,1506803711,DE
 1506803712,1506869247,RU
 1506869248,1506934783,UA
 1506934784,1507000319,GR
@@ -23938,7 +23165,9 @@
 1507459072,1507483903,KZ
 1507483904,1507484159,NZ
 1507484160,1507524607,KZ
-1507524608,1507590143,EE
+1507524608,1507525631,EE
+1507525632,1507529727,KZ
+1507529728,1507590143,EE
 1507590144,1507655679,NL
 1507655680,1507659775,DE
 1507659776,1507663871,RU
@@ -24251,7 +23480,7 @@
 1512025600,1512026879,GF
 1512026880,1512028159,FR
 1512028160,1512030207,GF
-1512030208,1512046591,YT
+1512030208,1512046591,MQ
 1512046592,1512308991,FR
 1512308992,1512309247,GP
 1512309248,1512310271,FR
@@ -24388,117 +23617,7 @@
 1512370944,1512372223,GP
 1512372224,1512372735,FR
 1512372736,1512372991,GP
-1512372992,1512768255,FR
-1512768256,1512768511,RE
-1512768512,1512770047,FR
-1512770048,1512770303,RE
-1512770304,1512771071,FR
-1512771072,1512771327,RE
-1512771328,1512773119,FR
-1512773120,1512773375,RE
-1512773376,1512774399,FR
-1512774400,1512774655,RE
-1512774656,1512775423,FR
-1512775424,1512775935,RE
-1512775936,1512777215,FR
-1512777216,1512777471,RE
-1512777472,1512777727,FR
-1512777728,1512777983,RE
-1512777984,1512778751,FR
-1512778752,1512779007,RE
-1512779008,1512779519,FR
-1512779520,1512779775,RE
-1512779776,1512780287,FR
-1512780288,1512780543,RE
-1512780544,1512784127,FR
-1512784128,1512784383,RE
-1512784384,1512784639,FR
-1512784640,1512784895,RE
-1512784896,1512786943,FR
-1512786944,1512787199,RE
-1512787200,1512788735,FR
-1512788736,1512788991,RE
-1512788992,1512790527,FR
-1512790528,1512790783,RE
-1512790784,1512791295,FR
-1512791296,1512791551,RE
-1512791552,1512792831,FR
-1512792832,1512793087,RE
-1512793088,1512793343,FR
-1512793344,1512793599,RE
-1512793600,1512794111,FR
-1512794112,1512794367,RE
-1512794368,1512794623,FR
-1512794624,1512794879,RE
-1512794880,1512795647,FR
-1512795648,1512795903,RE
-1512795904,1512797695,FR
-1512797696,1512797951,RE
-1512797952,1512799231,FR
-1512799232,1512799487,RE
-1512799488,1512800255,FR
-1512800256,1512800511,MQ
-1512800512,1512800767,FR
-1512800768,1512801023,MQ
-1512801024,1512802559,FR
-1512802560,1512803071,MQ
-1512803072,1512807423,FR
-1512807424,1512807679,MQ
-1512807680,1512810495,FR
-1512810496,1512810751,MQ
-1512810752,1512821759,FR
-1512821760,1512822015,GP
-1512822016,1512824575,FR
-1512824576,1512824831,GP
-1512824832,1512826111,FR
-1512826112,1512826367,GP
-1512826368,1512826623,FR
-1512826624,1512826879,GP
-1512826880,1512828159,FR
-1512828160,1512828927,GP
-1512828928,1512830207,FR
-1512830208,1512830463,GP
-1512830464,1512830975,FR
-1512830976,1512831231,GP
-1512831232,1514111231,FR
-1514111232,1514111743,GP
-1514111744,1514111999,FR
-1514112000,1514112255,GP
-1514112256,1514113791,FR
-1514113792,1514114047,GP
-1514114048,1514114815,FR
-1514114816,1514115071,GP
-1514115072,1514115583,FR
-1514115584,1514115839,GP
-1514115840,1514116351,FR
-1514116352,1514116607,GP
-1514116608,1514119935,FR
-1514119936,1514120191,GP
-1514120192,1514121215,FR
-1514121216,1514121471,GP
-1514121472,1514123007,FR
-1514123008,1514123263,GP
-1514123264,1514124287,FR
-1514124288,1514124543,GP
-1514124544,1514127871,FR
-1514127872,1514128127,RE
-1514128128,1514128895,FR
-1514128896,1514129407,RE
-1514129408,1514131967,FR
-1514131968,1514132223,RE
-1514132224,1514132735,FR
-1514132736,1514132991,RE
-1514132992,1514134271,FR
-1514134272,1514134527,RE
-1514134528,1514136063,FR
-1514136064,1514136319,RE
-1514136320,1514137599,FR
-1514137600,1514137855,RE
-1514137856,1514142207,FR
-1514142208,1514142719,RE
-1514142720,1514142975,FR
-1514142976,1514143231,RE
-1514143232,1514143743,FR
+1512372992,1514143743,FR
 1514143744,1514176511,SK
 1514176512,1515192639,FR
 1515192640,1515192655,EU
@@ -24514,14 +23633,16 @@
 1515470080,1515470335,FR
 1515470336,1515470847,US
 1515470848,1515488511,FR
-1515488512,1515488895,US
-1515488896,1515489023,FR
+1515488512,1515489023,US
 1515489024,1515489039,DE
 1515489040,1515489055,FR
 1515489056,1515489087,DE
 1515489088,1515489151,FR
 1515489152,1515489167,ES
-1515489168,1518338047,FR
+1515489168,1515489535,FR
+1515489536,1515489791,US
+1515489792,1515491007,NL
+1515491008,1518338047,FR
 1518338048,1518370815,DE
 1518370816,1518409727,NL
 1518409728,1518412031,SE
@@ -24555,7 +23676,9 @@
 1518533888,1518534143,NO
 1518534144,1518540543,SE
 1518540544,1518540799,LT
-1518540800,1518542847,SE
+1518540800,1518541479,SE
+1518541480,1518541480,DE
+1518541481,1518542847,SE
 1518542848,1518551039,LT
 1518551040,1518565375,NL
 1518565376,1518567423,SE
@@ -24566,15 +23689,15 @@
 1518635008,1518637055,NL
 1518637056,1518641151,SE
 1518641152,1518649343,NL
-1518649344,1518665727,SE
-1518665728,1518727167,RU
-1518727168,1518731263,SE
+1518649344,1518682879,SE
+1518682880,1518683135,RU
+1518683136,1518731263,SE
 1518731264,1518747647,DE
 1518747648,1518772223,LT
 1518772224,1518780415,NL
 1518780416,1518796799,HR
 1518796800,1518927871,DE
-1518927872,1518944255,RU
+1518927872,1518944255,SE
 1518944256,1518945023,NL
 1518945024,1518945535,SE
 1518945536,1518946303,NL
@@ -24629,9 +23752,33 @@
 1518992384,1518992639,NL
 1518992640,1518992895,SE
 1518992896,1518993152,NL
-1518993153,1518993407,SE
-1518993408,1519190015,RU
-1519190016,1519206399,SE
+1518993153,1519190271,SE
+1519190272,1519190783,NL
+1519190784,1519191551,SE
+1519191552,1519192063,NL
+1519192064,1519193343,SE
+1519193344,1519194111,NL
+1519194112,1519194623,SE
+1519194624,1519194879,NL
+1519194880,1519195135,SE
+1519195136,1519196671,NL
+1519196672,1519197183,SE
+1519197184,1519197951,NL
+1519197952,1519200255,SE
+1519200256,1519200511,EE
+1519200512,1519201023,SE
+1519201024,1519201279,EE
+1519201280,1519202303,SE
+1519202304,1519202815,EE
+1519202816,1519203071,SE
+1519203072,1519203327,EE
+1519203328,1519203583,SE
+1519203584,1519204351,EE
+1519204352,1519204607,SE
+1519204608,1519204863,EE
+1519204864,1519205631,SE
+1519205632,1519206143,EE
+1519206144,1519206399,SE
 1519206400,1519208447,LV
 1519208448,1519214591,SE
 1519214592,1519219455,LV
@@ -24647,10 +23794,16 @@
 1519296512,1519299583,LT
 1519299584,1519300607,SE
 1519300608,1519304703,LT
-1519304704,1519312895,SE
+1519304704,1519305983,NL
+1519305984,1519306239,SE
+1519306240,1519307775,NL
+1519307776,1519308031,SE
+1519308032,1519308287,NL
+1519308288,1519308543,SE
+1519308544,1519308799,NL
+1519308800,1519312895,SE
 1519312896,1519321087,LT
-1519321088,1519386623,RU
-1519386624,1519394815,SE
+1519321088,1519394815,SE
 1519394816,1519398911,HR
 1519398912,1519403007,SE
 1519403008,1519419391,NL
@@ -24667,9 +23820,7 @@
 1519931392,1519934463,NL
 1519934464,1519936191,GB
 1519936192,1519936255,DK
-1519936256,1519938559,GB
-1519938560,1519939583,NL
-1519939584,1519943679,GB
+1519936256,1519943679,GB
 1519943680,1519976447,AT
 1519976448,1520009215,DE
 1520009216,1520041983,SY
@@ -24820,8 +23971,8 @@
 1533730816,1533732863,NL
 1533732864,1533734911,RU
 1533734912,1533739007,CZ
-1533739008,1533804543,RU
-1533804544,1533837311,DE
+1533739008,1533820927,RU
+1533820928,1533837311,DE
 1533837312,1533845503,IR
 1533845504,1533847551,GB
 1533847552,1533849599,RU
@@ -24854,248 +24005,48 @@
 1534590976,1534656511,HU
 1534656512,1534711807,FR
 1534711808,1534712831,BE
-1534712832,1534713919,FR
-1534713920,1534713927,CH
-1534713928,1534714055,FR
-1534714056,1534714063,PL
-1534714064,1534714079,NL
-1534714080,1534714207,FR
-1534714208,1534714223,NL
-1534714224,1534714255,FR
-1534714256,1534714259,FI
-1534714260,1534714279,FR
-1534714280,1534714283,DE
-1534714284,1534714287,CH
-1534714288,1534714323,FR
-1534714324,1534714327,ES
-1534714328,1534714403,FR
-1534714404,1534714431,ES
-1534714432,1534714539,FR
-1534714540,1534714543,ES
-1534714544,1534714575,FR
-1534714576,1534714583,NL
-1534714584,1534714751,FR
+1534712832,1534714415,FR
+1534714416,1534714431,ES
+1534714432,1534714639,FR
+1534714640,1534714655,IE
+1534714656,1534714751,FR
 1534714752,1534714767,DE
-1534714768,1534714799,FR
-1534714800,1534714815,GB
-1534714816,1534714927,FR
-1534714928,1534714931,DE
-1534714932,1534715211,FR
-1534715212,1534715215,LT
-1534715216,1534715263,FR
+1534714768,1534715263,FR
 1534715264,1534715267,IT
-1534715268,1534715295,FR
-1534715296,1534715299,GB
-1534715300,1534715359,FR
-1534715360,1534715367,DE
-1534715368,1534715415,FR
-1534715416,1534715419,PL
-1534715420,1534715423,FR
-1534715424,1534715431,IT
-1534715432,1534715439,FR
-1534715440,1534715447,IT
-1534715448,1534715631,FR
-1534715632,1534715639,DE
-1534715640,1534715671,FR
-1534715672,1534715675,CZ
-1534715676,1534715711,FR
-1534715712,1534715727,GB
-1534715728,1534715775,FR
-1534715776,1534715783,ES
-1534715784,1534715791,IT
-1534715792,1534715871,FR
+1534715268,1534715871,FR
 1534715872,1534715875,ES
-1534715876,1534715879,FR
-1534715880,1534715883,PL
-1534715884,1534715935,FR
+1534715876,1534715935,FR
 1534715936,1534715939,NL
-1534715940,1534716007,FR
-1534716008,1534716015,IT
-1534716016,1534716031,ES
-1534716032,1534716095,FR
-1534716096,1534716127,NL
-1534716128,1534716131,GB
-1534716132,1534716163,FR
-1534716164,1534716167,BE
-1534716168,1534716303,FR
-1534716304,1534716307,GB
-1534716308,1534716367,FR
-1534716368,1534716375,IT
+1534715940,1534716375,FR
 1534716376,1534716379,ES
-1534716380,1534716383,BE
-1534716384,1534716447,FR
-1534716448,1534716463,ES
-1534716464,1534716575,FR
-1534716576,1534716591,NL
-1534716592,1534716623,FR
-1534716624,1534716639,BE
-1534716640,1534716647,IT
-1534716648,1534716763,FR
-1534716764,1534716767,BE
-1534716768,1534716775,DE
-1534716776,1534716783,FR
-1534716784,1534716791,NL
-1534716792,1534716799,LT
-1534716800,1534716803,FI
-1534716804,1534716807,NL
-1534716808,1534717035,FR
-1534717036,1534717039,IT
-1534717040,1534717063,FR
-1534717064,1534717071,IT
-1534717072,1534717087,GB
-1534717088,1534717199,FR
+1534716380,1534717199,FR
 1534717200,1534717215,GB
 1534717216,1534717247,FR
 1534717248,1534717251,ES
-1534717252,1534717255,FR
-1534717256,1534717263,IT
+1534717252,1534717263,FR
 1534717264,1534717267,ES
-1534717268,1534717323,FR
-1534717324,1534717327,CH
-1534717328,1534717343,NL
-1534717344,1534717407,FR
-1534717408,1534717415,IT
-1534717416,1534717551,FR
-1534717552,1534717567,PL
-1534717568,1534717587,FR
-1534717588,1534717591,GB
-1534717592,1534717599,FR
-1534717600,1534717631,PT
-1534717632,1534717663,FR
+1534717268,1534717663,FR
 1534717664,1534717679,GB
-1534717680,1534717695,BE
-1534717696,1534717711,PT
-1534717712,1534717791,FR
-1534717792,1534717823,NL
-1534717824,1534717915,FR
-1534717916,1534717919,ES
-1534717920,1534717923,FR
+1534717680,1534717923,FR
 1534717924,1534717927,IT
-1534717928,1534717935,FR
-1534717936,1534717951,CZ
-1534717952,1534717991,FR
-1534717992,1534717995,FI
-1534717996,1534718007,FR
-1534718008,1534718011,ES
-1534718012,1534718271,FR
-1534718272,1534718335,PT
-1534718336,1534718351,FR
-1534718352,1534718359,IT
-1534718360,1534718363,GB
-1534718364,1534718475,FR
-1534718476,1534718479,GB
-1534718480,1534718535,FR
-1534718536,1534718539,IT
-1534718540,1534718575,FR
-1534718576,1534718591,LT
-1534718592,1534718631,FR
-1534718632,1534718639,GB
-1534718640,1534718655,FR
-1534718656,1534718687,GB
-1534718688,1534718759,FR
-1534718760,1534718767,ES
-1534718768,1534718819,FR
-1534718820,1534718823,PL
-1534718824,1534719087,FR
-1534719088,1534719103,GB
-1534719104,1534719335,FR
-1534719336,1534719339,IT
-1534719340,1534719423,FR
-1534719424,1534719439,PL
-1534719440,1534719459,FR
-1534719460,1534719463,DE
-1534719464,1534719471,FR
-1534719472,1534719487,BE
-1534719488,1534719507,FR
-1534719508,1534719511,FI
-1534719512,1534719519,FR
-1534719520,1534719535,GB
-1534719536,1534719567,FR
-1534719568,1534719575,LT
-1534719576,1534719583,IT
-1534719584,1534719599,PT
-1534719600,1534719607,PL
-1534719608,1534719615,FR
-1534719616,1534719631,PL
-1534719632,1534719747,FR
+1534717928,1534718763,FR
+1534718764,1534718767,ES
+1534718768,1534719747,FR
 1534719748,1534719751,ES
 1534719752,1534719783,FR
 1534719784,1534719787,ES
-1534719788,1534719791,PT
-1534719792,1534719815,FR
-1534719816,1534719823,GB
-1534719824,1534719831,FR
-1534719832,1534719839,PL
-1534719840,1534719967,FR
-1534719968,1534719983,IT
-1534719984,1534720003,FR
+1534719788,1534720003,FR
 1534720004,1534720007,ES
 1534720008,1534720011,IT
-1534720012,1534720015,FR
-1534720016,1534720023,IT
+1534720012,1534720023,FR
 1534720024,1534720027,PL
-1534720028,1534720047,FR
-1534720048,1534720063,GB
-1534720064,1534720095,FR
-1534720096,1534720111,IT
-1534720112,1534720179,FR
+1534720028,1534720179,FR
 1534720180,1534720183,ES
-1534720184,1534720211,FR
-1534720212,1534720215,DE
-1534720216,1534720223,GB
-1534720224,1534720255,FR
-1534720256,1534720271,PL
-1534720272,1534720415,FR
-1534720416,1534720419,ES
-1534720420,1534720423,FR
-1534720424,1534720431,IT
-1534720432,1534720467,FR
-1534720468,1534720471,ES
+1534720184,1534720471,FR
 1534720472,1534720479,DE
-1534720480,1534720527,FR
-1534720528,1534720531,BE
-1534720532,1534720647,FR
-1534720648,1534720655,ES
-1534720656,1534720735,FR
-1534720736,1534720739,PL
-1534720740,1534720743,FR
-1534720744,1534720767,GB
-1534720768,1534720787,FR
-1534720788,1534720791,IT
-1534720792,1534720943,FR
-1534720944,1534720951,LT
-1534720952,1534720967,FR
-1534720968,1534720975,IT
-1534720976,1534720991,FR
-1534720992,1534721007,IT
-1534721008,1534721035,FR
-1534721036,1534721039,PT
-1534721040,1534721071,FR
-1534721072,1534721087,IT
-1534721088,1534721115,FR
-1534721116,1534721119,CH
-1534721120,1534721195,FR
-1534721196,1534721199,DE
-1534721200,1534721215,IT
-1534721216,1534721295,FR
-1534721296,1534721311,GB
-1534721312,1534721391,FR
-1534721392,1534721407,GB
-1534721408,1534721487,FR
-1534721488,1534721491,BE
-1534721492,1534721587,FR
-1534721588,1534721591,LT
-1534721592,1534721619,FR
+1534720480,1534721619,FR
 1534721620,1534721623,ES
-1534721624,1534721707,FR
-1534721708,1534721711,IT
-1534721712,1534721727,FR
-1534721728,1534721743,GB
-1534721744,1534721827,FR
-1534721828,1534721831,DE
-1534721832,1534721971,FR
-1534721972,1534721975,GB
-1534721976,1534722047,FR
+1534721624,1534722047,FR
 1534722048,1534787583,RU
 1534787584,1534791679,RO
 1534791680,1534795775,RU
@@ -25113,12 +24064,14 @@
 1534849024,1534853119,NL
 1534853120,1534918655,UA
 1534918656,1534984191,GB
-1534984192,1534985215,NO
-1534985216,1535049727,ES
+1534984192,1534988287,NO
+1534988288,1535049727,ES
 1535049728,1535115263,SK
 1535115264,1535197183,AT
 1535197184,1535203359,EE
-1535203360,1535246335,SE
+1535203360,1535205375,SE
+1535205376,1535213567,EE
+1535213568,1535246335,SE
 1535246336,1535311871,AT
 1535311872,1535344639,NO
 1535344640,1535350783,LV
@@ -25151,15 +24104,11 @@
 1535631360,1535635455,GB
 1535635456,1535639551,AZ
 1535639552,1535672319,GB
-1535672320,1535706111,DE
-1535706112,1535707135,CH
-1535707136,1535709183,DE
-1535709184,1535715327,CH
-1535715328,1535717375,DE
-1535717376,1535721471,CH
-1535721472,1535721727,DE
-1535721728,1535733759,CH
-1535733760,1535735807,DE
+1535672320,1535721727,DE
+1535721728,1535727871,CH
+1535727872,1535728127,DE
+1535728128,1535732735,CH
+1535732736,1535735807,DE
 1535735808,1535737855,CH
 1535737856,1535770623,HU
 1535770624,1535803391,CH
@@ -25370,8 +24319,7 @@
 1539260416,1539276799,SK
 1539276800,1539280895,SE
 1539280896,1539284991,FR
-1539284992,1539287039,DE
-1539287040,1539289087,TR
+1539284992,1539289087,TR
 1539289088,1539293183,RU
 1539293184,1539297279,AZ
 1539297280,1539301375,BG
@@ -25480,7 +24428,7 @@
 1539427328,1539428351,UA
 1539428352,1539429375,PL
 1539429376,1539434495,RU
-1539434496,1539435519,UA
+1539434496,1539435519,GB
 1539435520,1539437567,RU
 1539437568,1539438591,GB
 1539439616,1539440639,UA
@@ -25582,7 +24530,8 @@
 1539503104,1539504127,RU
 1539504128,1539504639,AT
 1539504640,1539505151,UA
-1539505152,1539506175,RU
+1539505152,1539505663,RU
+1539505664,1539506175,AT
 1539506176,1539506687,NL
 1539506688,1539507199,UA
 1539507200,1539508223,RO
@@ -26283,7 +25232,7 @@
 1539891200,1539893247,RU
 1539893248,1539894271,UA
 1539894272,1539895295,PL
-1539896320,1539898367,UA
+1539897344,1539898367,UA
 1539898368,1539899391,CZ
 1539899392,1539900415,RU
 1539901440,1539902463,RU
@@ -26404,7 +25353,6 @@
 1540055040,1540055423,EU
 1540055424,1540055551,NO
 1540055552,1540056063,EU
-1540056064,1540057087,NL
 1540057088,1540057343,PL
 1540057344,1540057599,RU
 1540057600,1540057855,US
@@ -26521,8 +25469,8 @@
 1540199424,1540200447,CH
 1540200448,1540201471,IL
 1540201472,1540202495,UA
-1540202496,1540203519,RU
-1540203520,1540204543,UA
+1540202496,1540204287,RU
+1540204288,1540204543,UA
 1540204544,1540205567,RU
 1540205568,1540206591,DE
 1540206592,1540208639,RU
@@ -27148,7 +26096,6 @@
 1540477952,1540478207,NO
 1540478208,1540478463,NL
 1540478464,1540478719,UA
-1540478720,1540478975,SA
 1540478976,1540479231,HR
 1540479232,1540479487,GB
 1540479488,1540479743,RU
@@ -27224,7 +26171,9 @@
 1540535296,1540536319,SK
 1540536320,1540537343,RU
 1540537344,1540538367,UA
-1540538368,1540542463,RU
+1540538368,1540538879,RU
+1540538880,1540539391,UA
+1540539392,1540542463,RU
 1540542464,1540543487,PL
 1540543488,1540544511,DE
 1540544512,1540545535,RU
@@ -27297,7 +26246,6 @@
 1540624384,1540624639,IR
 1540624640,1540624895,BG
 1540624896,1540625151,GB
-1540625152,1540625407,IR
 1540625664,1540625919,FR
 1540625920,1540626175,UA
 1540626176,1540626431,RO
@@ -27365,7 +26313,6 @@
 1540645120,1540645375,RU
 1540645376,1540645631,BE
 1540645632,1540645887,NL
-1540645888,1540646143,PL
 1540646144,1540646399,RO
 1540646400,1540646655,PS
 1540646656,1540646911,SE
@@ -27567,7 +26514,6 @@
 1540703488,1540703743,NL
 1540703744,1540703999,DK
 1540704000,1540704255,PL
-1540704256,1540704511,KZ
 1540704512,1540704767,IE
 1540705280,1540705535,RO
 1540705536,1540705791,AT
@@ -27586,7 +26532,6 @@
 1540708864,1540709119,FR
 1540709120,1540709375,DE
 1540709376,1540709631,UA
-1540709632,1540709887,KZ
 1540709888,1540710143,UA
 1540710144,1540710399,NL
 1540710400,1540710655,PL
@@ -27631,7 +26576,6 @@
 1540722688,1540722943,RU
 1540722944,1540723455,FR
 1540723456,1540723711,SI
-1540723712,1540723967,RU
 1540723968,1540724223,UA
 1540724224,1540724479,HU
 1540724736,1540724991,CH
@@ -27751,9 +26695,7 @@
 1540779008,1540780031,NL
 1540780032,1540781055,UA
 1540781056,1540783103,RU
-1540783104,1540784383,UA
-1540784384,1540785151,RU
-1540785152,1540787199,UA
+1540783104,1540787199,UA
 1540787200,1540788223,KZ
 1540788224,1540790271,RU
 1540790272,1540791295,KW
@@ -28122,7 +27064,6 @@
 1540982272,1540982783,GB
 1540982784,1540983295,RU
 1540983296,1540983551,ME
-1540983552,1540983807,CH
 1540983808,1540984063,FR
 1540984064,1540984319,DE
 1540984320,1540984575,PL
@@ -28271,7 +27212,7 @@
 1541070848,1541071871,IT
 1541071872,1541072895,RU
 1541072896,1541073919,CZ
-1541073920,1541074943,RO
+1541073920,1541074943,GB
 1541074944,1541075967,PL
 1541075968,1541078015,RU
 1541078016,1541079039,RO
@@ -28296,7 +27237,7 @@
 1541099520,1541100543,UA
 1541100544,1541101567,HU
 1541101568,1541102591,RU
-1541102592,1541103615,EU
+1541102592,1541103615,RO
 1541103616,1541105663,RU
 1541105664,1541106687,PL
 1541106688,1541107711,NL
@@ -28322,8 +27263,7 @@
 1541133312,1541134335,RO
 1541134336,1541135359,SE
 1541135360,1541136383,UA
-1541136384,1541138431,RU
-1541138432,1541139455,UA
+1541136384,1541139455,RU
 1541139456,1541140479,HU
 1541140480,1541142527,CZ
 1541142528,1541143551,RU
@@ -28487,6 +27427,7 @@
 1541187840,1541188351,RU
 1541188352,1541188607,FR
 1541188608,1541188863,HU
+1541188864,1541189119,RU
 1541189120,1541189375,UA
 1541189376,1541189631,GB
 1541189888,1541190143,PL
@@ -28512,7 +27453,6 @@
 1541195520,1541195775,GB
 1541195776,1541196031,FR
 1541196032,1541196287,CZ
-1541196288,1541196543,RU
 1541196800,1541197055,UA
 1541197056,1541197311,PL
 1541197312,1541197567,RU
@@ -28994,7 +27934,7 @@
 1541420032,1541420543,RU
 1541420544,1541421055,NL
 1541421056,1541421567,PL
-1541421568,1541422079,GB
+1541421568,1541422079,CZ
 1541422080,1541422591,PL
 1541422592,1541423103,RU
 1541423616,1541424127,AT
@@ -29332,7 +28272,7 @@
 1541667840,1541668095,CH
 1541668352,1541668607,UA
 1541668608,1541668863,GE
-1541668864,1541669887,A1
+1541668864,1541669887,GB
 1541669888,1541670911,LV
 1541670912,1541671423,PL
 1541671424,1541671679,RU
@@ -29555,8 +28495,8 @@
 1541795584,1541795839,ES
 1541795840,1541796863,UA
 1541796864,1541797375,RU
-1541797376,1541798143,GB
-1541798144,1541798911,PL
+1541797376,1541797887,GB
+1541797888,1541798911,PL
 1541798912,1541799935,CZ
 1541799936,1541800447,FR
 1541800448,1541800959,AT
@@ -29572,7 +28512,7 @@
 1541805824,1541806079,RU
 1541806080,1541806335,PL
 1541806336,1541806591,UA
-1541806592,1541807103,RU
+1541806592,1541806847,RU
 1541807104,1541808127,UA
 1541808128,1541808383,IR
 1541808384,1541809151,NL
@@ -29736,7 +28676,6 @@
 1541893632,1541894143,PL
 1541894144,1541895167,RU
 1541895168,1541897727,PL
-1541897728,1541897983,RU
 1541897984,1541898239,UA
 1541898240,1541900799,RU
 1541900800,1541901055,RO
@@ -30160,7 +29099,7 @@
 1542159360,1542160127,PL
 1542160128,1542160383,RU
 1542160384,1542160895,UA
-1542160896,1542161407,RO
+1542160896,1542161407,GB
 1542161408,1542162431,NL
 1542162432,1542162943,RU
 1542162944,1542163199,FR
@@ -30168,7 +29107,7 @@
 1542163456,1542163711,GB
 1542163712,1542163967,FR
 1542163968,1542164479,UA
-1542164480,1542165759,RU
+1542164480,1542165503,RU
 1542165760,1542166015,PL
 1542166016,1542166527,IL
 1542166528,1542167551,PL
@@ -30471,7 +29410,6 @@
 1542344448,1542345215,RU
 1542345216,1542345471,UA
 1542345472,1542345727,RU
-1542345728,1542345983,UA
 1542345984,1542346239,PL
 1542346240,1542348287,RU
 1542348288,1542348799,MD
@@ -30497,7 +29435,7 @@
 1542359040,1542360319,RU
 1542360320,1542360575,NL
 1542360576,1542361087,PL
-1542361088,1542361343,LI
+1542361088,1542361343,CH
 1542361344,1542361599,PL
 1542361600,1542362111,UA
 1542362112,1542362623,RO
@@ -30558,7 +29496,7 @@
 1542392832,1542393087,RO
 1542393088,1542393343,BG
 1542393344,1542393599,IR
-1542393600,1542394879,RU
+1542393856,1542394879,RU
 1542394880,1542395135,DE
 1542395136,1542395391,ES
 1542395392,1542395647,RU
@@ -30754,7 +29692,6 @@
 1542498304,1542499583,RU
 1542499584,1542499839,ES
 1542499840,1542500095,GB
-1542500096,1542500351,UA
 1542500352,1542500607,GB
 1542500608,1542500863,RO
 1542500864,1542501119,GB
@@ -30870,7 +29807,6 @@
 1542641664,1542641919,RO
 1542641920,1542642175,AE
 1542642176,1542642431,PL
-1542642432,1542642687,RU
 1542642688,1542643199,PL
 1542643200,1542643455,UA
 1542643456,1542643711,NL
@@ -30882,7 +29818,8 @@
 1542669568,1542669823,NO
 1542669824,1542670079,DE
 1542670080,1542670335,CH
-1542670336,1542671359,ES
+1542670336,1542670591,US
+1542670592,1542671359,ES
 1542671360,1542671871,FR
 1542671872,1542672383,RS
 1542672384,1542681087,RU
@@ -30963,7 +29900,6 @@
 1542849536,1542850559,UA
 1542850560,1542851583,GB
 1542851584,1542851839,BG
-1542851840,1542852095,LU
 1542852096,1542852351,KW
 1542852352,1542852607,PL
 1542852608,1542855167,RU
@@ -31015,7 +29951,11 @@
 1542979584,1543110655,DE
 1543110656,1543127039,UA
 1543127040,1543143423,DE
-1543143424,1543241727,RO
+1543143424,1543159807,RO
+1543159808,1543167999,SE
+1543168000,1543172095,MD
+1543172096,1543176191,RO
+1543176192,1543241727,IR
 1543241728,1543503871,IT
 1543503872,1545601023,GB
 1545601024,1545674495,SE
@@ -31024,23 +29964,20 @@
 1545863168,1545895935,RU
 1545895936,1545928703,BA
 1545928704,1545961471,SI
-1545961472,1545994239,RU
-1545994240,1545995263,CZ
-1545995264,1545995519,RU
-1545995520,1545996287,CZ
+1545961472,1545994751,RU
+1545994752,1545996287,CZ
 1545996288,1545998335,RU
 1545998336,1546000383,CZ
 1546000384,1546001407,UZ
 1546001408,1546002943,RU
 1546002944,1546003199,UA
-1546003200,1546003455,RU
-1546003456,1546004479,CZ
+1546003200,1546003967,RU
+1546003968,1546004479,CZ
 1546004480,1546004735,UA
 1546004736,1546005247,CZ
 1546005248,1546006527,RU
 1546006528,1546008575,UA
-1546008576,1546010623,BY
-1546010624,1546014719,CZ
+1546008576,1546014719,BY
 1546014720,1546015743,RU
 1546015744,1546027007,CZ
 1546027008,1546059775,RU
@@ -31063,11 +30000,13 @@
 1546121984,1546121987,ES
 1546121988,1546122463,FR
 1546122464,1546122479,DZ
-1546122480,1546122649,FR
+1546122480,1546122641,FR
+1546122642,1546122642,DE
+1546122643,1546122649,FR
 1546122650,1546122650,PT
 1546122651,1546122696,FR
-1546122697,1546122697,ES
-1546122698,1546125311,FR
+1546122697,1546122698,ES
+1546122699,1546125311,FR
 1546125312,1546256383,GB
 1546256384,1546264575,RU
 1546264576,1546266623,TR
@@ -31184,7 +30123,8 @@
 1547091968,1547108351,GE
 1547108352,1547124735,RU
 1547124736,1547141119,MK
-1547141120,1547157503,RO
+1547141120,1547149311,RO
+1547149312,1547157503,KZ
 1547157504,1547173887,PL
 1547173888,1547436031,ES
 1547436032,1547440127,AT
@@ -31292,8 +30232,8 @@
 1548159488,1548159999,GB
 1548160000,1548160257,NL
 1548160258,1548160259,EU
-1548160260,1548162479,NL
-1548162480,1548162495,FR
+1548160260,1548162463,NL
+1548162464,1548162495,FR
 1548162496,1548169215,NL
 1548169216,1548171263,DE
 1548171264,1548172287,FR
@@ -31399,69 +30339,37 @@
 1551604480,1551604735,SE
 1551604736,1551630335,EU
 1551630336,1551892479,RU
-1551892480,1553995775,FR
-1553995776,1553996287,MQ
-1553996288,1554001407,FR
-1554001408,1554001919,MQ
-1554001920,1554007807,FR
-1554007808,1554008063,GP
-1554008064,1554009599,FR
-1554009600,1554010111,GP
-1554010112,1554010623,FR
-1554010624,1554010879,GP
-1554010880,1554014207,FR
-1554014208,1554014463,GP
-1554014464,1554015231,FR
-1554015232,1554015743,GP
-1554015744,1554015999,FR
-1554016000,1554016255,GP
-1554016256,1554016767,FR
-1554016768,1554018047,GP
-1554018048,1554019583,FR
-1554019584,1554019839,GP
-1554019840,1554025215,FR
-1554025216,1554025471,GP
-1554025472,1554026495,FR
-1554026496,1554026751,GP
-1554026752,1554030079,FR
-1554030080,1554030335,GP
-1554030336,1554032127,FR
-1554032128,1554032383,MQ
-1554032384,1554032895,FR
-1554032896,1554033151,MQ
-1554033152,1554037503,FR
-1554037504,1554037759,MQ
-1554037760,1554040575,FR
-1554040576,1554040831,RE
-1554040832,1554043647,FR
-1554043648,1554043903,RE
-1554043904,1554046463,FR
-1554046464,1554046719,RE
-1554046720,1554048767,FR
-1554048768,1554049279,RE
-1554049280,1554050047,FR
-1554050048,1554050559,RE
-1554050560,1554050815,FR
-1554050816,1554051071,RE
-1554051072,1554054911,FR
-1554054912,1554055167,RE
-1554055168,1556086783,FR
+1551892480,1556086783,FR
 1556086784,1556491204,DE
 1556491205,1556491205,EU
-1556491206,1557921791,DE
+1556491206,1557069823,DE
+1557069824,1557135359,GB
+1557135360,1557921791,DE
 1557921792,1558052863,NO
 1558052864,1558054399,FR
 1558054400,1558054655,DE
-1558054656,1558079407,FR
+1558054656,1558056102,FR
+1558056103,1558056103,ES
+1558056104,1558079407,FR
 1558079408,1558079415,PL
 1558079416,1558079423,GB
 1558079424,1558081175,FR
 1558081176,1558081183,BE
-1558081184,1558085055,FR
+1558081184,1558083775,FR
+1558083776,1558083791,DE
+1558083792,1558084655,FR
+1558084656,1558084659,BE
+1558084660,1558085055,FR
 1558085056,1558085071,GB
-1558085072,1558093531,FR
+1558085072,1558091351,FR
+1558091352,1558091352,ES
+1558091353,1558093531,FR
 1558093532,1558093532,HR
-1558093533,1558118399,FR
+1558093533,1558097919,FR
+1558097920,1558098175,GB
+1558098176,1558103159,FR
+1558103160,1558103167,GB
+1558103168,1558118399,FR
 1558118400,1558119423,DE
 1558119424,1558122495,RU
 1558122496,1558123519,AT
@@ -31536,8 +30444,11 @@
 1559944192,1559945727,FR
 1559945728,1559946751,LU
 1559946752,1559950335,DE
-1559950336,1559950847,LU
-1559950848,1559953407,DE
+1559950336,1559951359,LU
+1559951360,1559952383,DE
+1559952384,1559952895,LU
+1559952896,1559953151,DE
+1559953152,1559953407,LU
 1559953408,1559986175,MT
 1559986176,1560018943,IE
 1560018944,1560051711,DE
@@ -31642,7 +30553,7 @@
 1566359552,1566363647,RU
 1566363648,1566365695,GB
 1566365696,1566367743,RU
-1566367744,1566371839,ES
+1566369792,1566371839,ES
 1566371840,1566373887,IT
 1566373888,1566375935,RS
 1566375936,1566377983,DE
@@ -31765,12 +30676,8 @@
 1567621120,1567696383,RO
 1567696384,1567696895,MD
 1567696896,1567703039,RO
-1567703040,1567709183,MD
-1567709184,1567710207,RO
-1567710208,1567711231,MD
-1567711232,1567713279,RO
-1567713280,1567714303,MD
-1567714304,1567715327,RO
+1567703040,1567707135,MD
+1567707136,1567715327,RO
 1567715328,1567717375,MD
 1567717376,1567727359,RO
 1567727360,1567727615,GB
@@ -31780,9 +30687,9 @@
 1567744000,1567748095,IR
 1567748096,1567749119,RO
 1567749120,1567750143,MD
-1567750144,1567752191,RO
-1567752192,1567756287,MD
-1567756288,1567762431,RO
+1567750144,1567756287,RO
+1567756288,1567760383,IR
+1567760384,1567762431,RO
 1567762432,1567762820,A1
 1567762821,1567762821,RO
 1567762822,1567763521,A1
@@ -31790,45 +30697,28 @@
 1567763523,1567763542,A1
 1567763543,1567763543,EU
 1567763544,1567764479,A1
-1567764480,1567775743,RO
+1567764480,1567767551,RO
+1567767552,1567768575,ES
+1567768576,1567775743,RO
 1567775744,1567776767,MD
-1567776768,1567830015,RO
-1567830016,1567831039,MD
-1567831040,1567838207,RO
+1567776768,1567838207,RO
 1567838208,1567842303,A1
 1567842304,1567852543,RO
 1567852544,1567856639,MD
-1567856640,1567873023,RO
+1567856640,1567858687,RO
+1567858688,1567860735,SE
+1567860736,1567871999,RO
+1567872000,1567873023,ES
 1567873024,1567879167,MD
 1567879168,1567880191,RO
 1567880192,1567881215,SE
-1567881216,1567883519,RO
-1567883520,1567883775,MD
-1567883776,1567887871,RO
-1567887872,1567888127,MD
-1567888128,1567890431,RO
-1567890432,1567890687,MD
-1567890688,1567894271,RO
-1567894272,1567894527,MD
-1567894528,1567905279,RO
-1567905280,1567905535,MD
-1567905536,1567907839,RO
-1567907840,1567911935,MD
-1567911936,1567913215,RO
-1567913216,1567913471,MD
-1567913472,1567928831,RO
-1567928832,1567929087,MD
-1567929088,1567935999,RO
-1567936000,1567936255,MD
-1567936256,1567940607,RO
-1567940608,1567941119,MD
-1567941120,1567941631,RO
-1567941632,1567941887,MD
-1567941888,1567961087,RO
-1567961088,1567965183,MD
-1567965184,1567966207,RO
+1567881216,1567883263,RO
+1567883264,1567948799,MD
+1567948800,1567961087,IR
+1567961088,1567966207,RO
 1567966208,1567969279,MD
-1567969280,1567981567,RO
+1567969280,1567973375,RO
+1567973376,1567981567,IR
 1567981568,1567983615,MD
 1567983616,1567984639,RO
 1567984640,1567987711,MD
@@ -31840,13 +30730,14 @@
 1567993856,1567997951,IR
 1567997952,1568014335,NL
 1568014336,1568022527,DE
-1568022528,1568026623,RO
-1568026624,1568030719,MD
-1568030720,1568059391,RO
-1568059392,1568063487,MD
-1568063488,1568083967,RO
-1568083968,1568086015,MD
-1568086016,1568104447,RO
+1568022528,1568024063,RO
+1568024064,1568024319,SG
+1568024320,1568038911,RO
+1568038912,1568059391,IR
+1568059392,1568060415,RO
+1568060416,1568062463,MD
+1568062464,1568088063,RO
+1568088064,1568104447,IR
 1568104448,1568106495,MD
 1568106496,1568107519,RO
 1568107520,1568108543,MD
@@ -31861,54 +30752,23 @@
 1568133120,1568137215,IR
 1568137216,1568138239,RO
 1568138240,1568141311,MD
-1568141312,1568178175,RO
+1568141312,1568145407,DE
+1568145408,1568178175,RO
 1568178176,1568210943,RU
 1568210944,1568243711,GB
-1568243712,1568245759,GP
-1568245760,1568247295,FR
+1568243712,1568247295,GP
 1568247296,1568247551,GF
-1568247552,1568247807,GP
-1568247808,1568248063,FR
-1568248064,1568248831,GP
-1568248832,1568249087,FR
-1568249088,1568249855,GP
-1568249856,1568250111,FR
-1568250112,1568250879,GP
-1568250880,1568251135,FR
-1568251136,1568251903,GP
-1568251904,1568252159,FR
-1568252160,1568252927,GP
+1568247552,1568252927,GP
 1568252928,1568253183,GF
-1568253184,1568254207,GP
-1568254208,1568254975,FR
-1568254976,1568255487,GP
-1568255488,1568255999,FR
-1568256000,1568256255,GP
-1568256256,1568259327,FR
-1568259328,1568260095,GP
-1568260096,1568260351,FR
-1568260352,1568261119,GP
-1568261120,1568261375,FR
-1568261376,1568262143,GP
+1568253184,1568262143,GP
 1568262144,1568262399,MQ
-1568262400,1568263167,GP
-1568263168,1568264447,FR
-1568264448,1568266239,GP
-1568266240,1568266495,FR
-1568266496,1568267775,GP
-1568267776,1568268543,FR
-1568268544,1568269311,GP
-1568269312,1568269567,FR
-1568269568,1568270079,GP
+1568262400,1568270079,GP
 1568270080,1568270335,MQ
-1568270336,1568272383,GP
-1568272384,1568273151,FR
+1568270336,1568273151,GP
 1568273152,1568273407,GF
-1568273408,1568274687,FR
-1568274688,1568275455,GP
-1568275456,1568275711,FR
+1568273408,1568275711,GP
 1568275712,1568275967,MQ
-1568275968,1568276479,FR
+1568275968,1568276479,GP
 1568276480,1568309247,DE
 1568309248,1568342015,RO
 1568342016,1568374783,BG
@@ -31978,7 +30838,7 @@
 1570756608,1570764799,RU
 1570764800,1570766847,DE
 1570766848,1571291135,DK
-1571291136,1571422207,RO
+1571291136,1571422207,SA
 1571422208,1571422463,CZ
 1571422464,1571422719,UA
 1571422720,1571423231,RU
@@ -31996,14 +30856,16 @@
 1571425233,1571425279,CZ
 1571425280,1571425535,RU
 1571425536,1571425791,NL
-1571425792,1571428607,CZ
+1571425792,1571426047,CZ
+1571426048,1571426303,UA
+1571426304,1571428607,CZ
 1571428608,1571428863,UA
 1571428864,1571429375,CZ
 1571429376,1571435519,UA
 1571435520,1571435775,RU
 1571435776,1571436287,CZ
 1571436288,1571436543,UA
-1571436544,1571438591,RU
+1571436544,1571438591,BA
 1571438592,1571440639,UA
 1571440640,1571440895,RU
 1571440896,1571441407,CZ
@@ -32016,9 +30878,9 @@
 1571443712,1571444991,CZ
 1571444992,1571445247,UA
 1571445248,1571446271,NL
-1571446272,1571446783,CZ
+1571446272,1571446783,RU
 1571446784,1571447039,GB
-1571447040,1571447295,CZ
+1571447040,1571447295,UA
 1571447296,1571447807,RU
 1571447808,1571448063,CZ
 1571448064,1571448319,RU
@@ -32038,9 +30900,11 @@
 1571457536,1571458047,RU
 1571458048,1571459071,CZ
 1571459072,1571463167,UA
-1571463168,1571469311,CZ
+1571463168,1571468287,CZ
+1571468288,1571469311,RU
 1571469312,1571469823,BY
-1571469824,1571470847,CZ
+1571469824,1571470335,CZ
+1571470336,1571470847,UA
 1571470848,1571471103,RU
 1571471104,1571471359,CZ
 1571471360,1571475455,RU
@@ -32050,8 +30914,9 @@
 1571483648,1571484159,RU
 1571484160,1571487743,CZ
 1571487744,1571495935,SK
-1571495936,1571499007,CZ
-1571499008,1571500031,RU
+1571495936,1571496447,RU
+1571496448,1571497983,BY
+1571497984,1571500031,RU
 1571500032,1571504127,BY
 1571504128,1571508223,UA
 1571508224,1571514367,CZ
@@ -32067,7 +30932,9 @@
 1571530240,1571531263,CZ
 1571531264,1571532031,UA
 1571532032,1571532287,RU
-1571532288,1571534079,CZ
+1571532288,1571532543,CZ
+1571532544,1571532799,RU
+1571532800,1571534079,CZ
 1571534080,1571534847,RU
 1571534848,1571535103,LV
 1571535104,1571535617,CZ
@@ -32077,7 +30944,8 @@
 1571538944,1571540991,CZ
 1571540992,1571541247,RU
 1571541248,1571541503,UA
-1571541504,1571542527,CZ
+1571541504,1571542271,CZ
+1571542272,1571542527,RU
 1571542528,1571542783,SK
 1571542784,1571543039,CZ
 1571543040,1571543551,NL
@@ -32255,7 +31123,7 @@
 1572524032,1572528127,GE
 1572528128,1572532223,RU
 1572532224,1572536319,IT
-1572536320,1572538367,JE
+1572536320,1572538367,GB
 1572538368,1572540415,NL
 1572540416,1572542463,GB
 1572542464,1572544511,IT
@@ -32439,49 +31307,19 @@
 1578585088,1578586111,PT
 1578586112,1578588159,ES
 1578588160,1578590207,PL
-1578590208,1578590223,FR
-1578590224,1578590231,CH
-1578590232,1578590347,FR
-1578590348,1578590351,FI
-1578590352,1578590367,IT
-1578590368,1578590603,FR
-1578590604,1578590607,GB
-1578590608,1578590659,FR
-1578590660,1578590663,PL
-1578590664,1578590719,FR
-1578590720,1578590727,ES
-1578590728,1578590731,GB
-1578590732,1578590767,FR
-1578590768,1578590783,BE
-1578590784,1578590787,FR
+1578590208,1578590787,FR
 1578590788,1578590791,ES
 1578590792,1578590851,FR
 1578590852,1578590855,ES
 1578590856,1578590863,FR
 1578590864,1578590879,BE
-1578590880,1578590895,GB
-1578590896,1578590975,FR
-1578590976,1578590991,IT
-1578590992,1578591087,FR
-1578591088,1578591103,GB
-1578591104,1578591231,FR
-1578591232,1578591247,NL
-1578591248,1578591263,GB
-1578591264,1578591391,FR
-1578591392,1578591399,BE
-1578591400,1578591663,FR
-1578591664,1578591679,GB
-1578591680,1578591695,FR
+1578590880,1578591087,FR
+1578591088,1578591103,IT
+1578591104,1578591695,FR
 1578591696,1578591699,ES
-1578591700,1578591799,FR
-1578591800,1578591807,PL
-1578591808,1578591823,ES
-1578591824,1578591903,FR
-1578591904,1578591919,PL
-1578591920,1578591983,FR
-1578591984,1578591999,ES
-1578592000,1578592163,FR
-1578592164,1578592167,DE
+1578591700,1578592071,FR
+1578592072,1578592079,ES
+1578592080,1578592167,FR
 1578592168,1578592171,IT
 1578592172,1578592175,FR
 1578592176,1578592183,CZ
@@ -32490,129 +31328,29 @@
 1578592200,1578592207,CH
 1578592208,1578592295,FR
 1578592296,1578592303,NL
-1578592304,1578592379,FR
-1578592380,1578592383,GB
-1578592384,1578592511,FR
-1578592512,1578592519,ES
-1578592520,1578592543,FR
-1578592544,1578592559,GB
-1578592560,1578592575,BE
-1578592576,1578592687,FR
-1578592688,1578592695,ES
-1578592696,1578592735,FR
-1578592736,1578592743,FI
-1578592744,1578592799,FR
-1578592800,1578592803,NL
-1578592804,1578592811,FR
-1578592812,1578592815,ES
-1578592816,1578592855,FR
-1578592856,1578592859,PL
-1578592860,1578592863,FR
-1578592864,1578592879,DE
-1578592880,1578592883,GB
-1578592884,1578592991,FR
-1578592992,1578593007,NL
-1578593008,1578593023,FR
+1578592304,1578593023,FR
 1578593024,1578593279,DE
-1578593280,1578593323,FR
-1578593324,1578593327,DE
-1578593328,1578593415,FR
+1578593280,1578593415,FR
 1578593416,1578593423,IT
 1578593424,1578593439,FR
 1578593440,1578593443,ES
-1578593444,1578593479,FR
-1578593480,1578593483,ES
-1578593484,1578593491,FR
-1578593492,1578593495,GB
-1578593496,1578593551,FR
+1578593444,1578593551,FR
 1578593552,1578593559,NL
-1578593560,1578593587,FR
-1578593588,1578593591,GB
-1578593592,1578593671,FR
-1578593672,1578593679,CH
-1578593680,1578593703,FR
-1578593704,1578593711,ES
-1578593712,1578593807,FR
-1578593808,1578593823,DE
-1578593824,1578593939,FR
-1578593940,1578593943,PL
-1578593944,1578593955,FR
+1578593560,1578593955,FR
 1578593956,1578593959,ES
-1578593960,1578594063,FR
-1578594064,1578594079,PL
-1578594080,1578594095,FR
-1578594096,1578594111,PL
-1578594112,1578594143,FR
-1578594144,1578594147,ES
-1578594148,1578594151,FR
-1578594152,1578594159,ES
-1578594160,1578594163,IT
-1578594164,1578594239,FR
-1578594240,1578594255,PT
-1578594256,1578594271,IT
-1578594272,1578594303,BE
-1578594304,1578594359,FR
-1578594360,1578594363,NL
-1578594364,1578594367,FR
-1578594368,1578594371,IT
-1578594372,1578594383,FR
-1578594384,1578594399,IT
-1578594400,1578594523,FR
-1578594524,1578594527,CH
-1578594528,1578594547,FR
-1578594548,1578594551,IT
-1578594552,1578594607,FR
-1578594608,1578594623,CH
-1578594624,1578594703,FR
-1578594704,1578594707,DE
-1578594708,1578594719,FR
-1578594720,1578594735,DE
-1578594736,1578594879,FR
-1578594880,1578594895,FI
-1578594896,1578595203,FR
-1578595204,1578595207,GB
-1578595208,1578595215,FR
-1578595216,1578595231,IE
-1578595232,1578595367,FR
+1578593960,1578594559,FR
+1578594560,1578594815,ES
+1578594816,1578595295,FR
+1578595296,1578595327,DE
+1578595328,1578595367,FR
 1578595368,1578595371,IT
-1578595372,1578595379,FR
-1578595380,1578595383,ES
-1578595384,1578595419,FR
+1578595372,1578595419,FR
 1578595420,1578595423,GB
-1578595424,1578595439,FR
-1578595440,1578595447,NL
-1578595448,1578595535,FR
-1578595536,1578595543,LT
-1578595544,1578595551,FR
-1578595552,1578595559,NL
-1578595560,1578595583,FR
-1578595584,1578595599,BE
-1578595600,1578595607,FR
-1578595608,1578595611,GB
-1578595612,1578595615,FR
-1578595616,1578595619,ES
-1578595620,1578595627,FR
-1578595628,1578595631,ES
-1578595632,1578595663,FR
-1578595664,1578595679,ES
-1578595680,1578595747,FR
-1578595748,1578595751,CH
-1578595752,1578595767,FR
-1578595768,1578595775,ES
-1578595776,1578595871,FR
-1578595872,1578595903,IT
-1578595904,1578595911,GB
-1578595912,1578595987,FR
+1578595424,1578595807,FR
+1578595808,1578595823,ES
+1578595824,1578595987,FR
 1578595988,1578595991,ES
-1578595992,1578596119,FR
-1578596120,1578596123,IT
-1578596124,1578596143,FR
-1578596144,1578596147,ES
-1578596148,1578596159,FR
-1578596160,1578596167,DE
-1578596168,1578596239,FR
-1578596240,1578596255,ES
-1578596256,1578596351,FR
+1578595992,1578596351,FR
 1578596352,1578596863,GB
 1578596864,1578602495,FR
 1578602496,1578604543,NL
@@ -32621,87 +31359,19 @@
 1578607726,1578607726,FR
 1578607727,1578608639,DE
 1578608640,1578610687,CZ
-1578610688,1578610779,FR
-1578610780,1578610783,DE
-1578610784,1578610819,FR
-1578610820,1578610823,ES
-1578610824,1578610827,FR
-1578610828,1578610831,IT
-1578610832,1578610847,FR
-1578610848,1578610851,DE
-1578610852,1578610855,FR
-1578610856,1578610859,IT
-1578610860,1578610871,FR
-1578610872,1578610879,PL
-1578610880,1578611051,FR
-1578611052,1578611055,NL
-1578611056,1578611127,FR
-1578611128,1578611135,NL
-1578611136,1578611151,FR
-1578611152,1578611167,GB
-1578611168,1578611199,FR
-1578611200,1578611215,BE
-1578611216,1578611239,FR
-1578611240,1578611243,DE
-1578611244,1578611423,FR
-1578611424,1578611439,PT
-1578611440,1578611443,FR
-1578611444,1578611447,IT
-1578611448,1578611455,FI
-1578611456,1578611583,IE
-1578611584,1578611711,GB
-1578611712,1578611907,FR
-1578611908,1578611911,PT
-1578611912,1578611919,FR
-1578611920,1578611935,IT
-1578611936,1578612255,FR
-1578612256,1578612263,DE
-1578612264,1578612271,FR
-1578612272,1578612287,GB
-1578612288,1578612303,FR
-1578612304,1578612319,DE
-1578612320,1578612523,FR
-1578612524,1578612527,PL
-1578612528,1578612579,FR
-1578612580,1578612583,BE
-1578612584,1578612591,FI
-1578612592,1578612899,FR
-1578612900,1578612903,ES
-1578612904,1578612907,FR
+1578610688,1578611167,FR
+1578611168,1578611175,DE
+1578611176,1578612907,FR
 1578612908,1578612911,ES
-1578612912,1578612943,FR
-1578612944,1578612959,NL
-1578612960,1578612979,FR
-1578612980,1578612983,IE
-1578612984,1578612991,FR
-1578612992,1578613247,IT
-1578613248,1578613279,ES
-1578613280,1578613427,FR
-1578613428,1578613431,BE
-1578613432,1578613663,FR
-1578613664,1578613679,IT
-1578613680,1578613711,FR
-1578613712,1578613719,BE
-1578613720,1578613735,FR
+1578612912,1578613735,FR
 1578613736,1578613739,ES
-1578613740,1578613759,FR
-1578613760,1578613775,GB
-1578613776,1578613787,FR
-1578613788,1578613791,DE
-1578613792,1578613823,FR
-1578613824,1578613839,NL
-1578613840,1578613847,GB
-1578613848,1578613855,IT
-1578613856,1578613931,FR
+1578613740,1578613931,FR
 1578613932,1578613935,NL
-1578613936,1578614003,FR
-1578614004,1578614007,CZ
-1578614008,1578614047,FR
-1578614048,1578614055,ES
-1578614056,1578614271,FR
+1578613936,1578614271,FR
 1578614272,1578614527,ES
 1578614528,1578631167,FR
-1578631168,1578663935,RO
+1578631168,1578659839,RO
+1578659840,1578663935,ES
 1578663936,1578762239,RU
 1578762240,1578795007,BG
 1578795008,1578827775,RU
@@ -32728,7 +31398,7 @@
 1580134400,1580136447,ES
 1580136448,1580138495,PT
 1580138496,1580204031,IT
-1580204032,1580335103,RO
+1580204032,1580335103,SA
 1580335104,1580466175,RU
 1580466176,1580597247,RO
 1580597248,1580728319,TR
@@ -32810,25 +31480,25 @@
 1583767552,1583771647,AT
 1583771648,1583775743,RU
 1583775744,1583779839,IT
-1583779840,1583780047,GB
-1583780048,1583780055,IT
-1583780056,1583780263,GB
+1583779840,1583780263,GB
 1583780264,1583780271,IT
 1583780272,1583780335,GB
 1583780336,1583780343,IT
 1583780344,1583780423,GB
 1583780424,1583780431,IT
-1583780432,1583780767,GB
+1583780432,1583780727,GB
+1583780728,1583780735,IT
+1583780736,1583780767,GB
 1583780768,1583780775,IT
 1583780776,1583780791,GB
 1583780792,1583780799,IT
-1583780800,1583781359,GB
+1583780800,1583780815,GB
+1583780816,1583780823,IT
+1583780824,1583781359,GB
 1583781360,1583781367,IT
 1583781368,1583781863,GB
 1583781864,1583781871,IT
-1583781872,1583782223,GB
-1583782224,1583782231,IT
-1583782232,1583782415,GB
+1583781872,1583782415,GB
 1583782416,1583782423,IT
 1583782424,1583782431,GB
 1583782432,1583782439,IT
@@ -32863,9 +31533,7 @@
 1583874048,1584398335,BE
 1584398336,1584529407,CZ
 1584529408,1584660479,DE
-1584660480,1584857087,GB
-1584857088,1584858879,DE
-1584858880,1584922623,GB
+1584660480,1584922623,GB
 1584922624,1585184767,TR
 1585184768,1585190911,PL
 1585190912,1585192959,ES
@@ -33131,17 +31799,23 @@
 1588068352,1588592639,GB
 1588592640,1588593663,RO
 1588593664,1588593919,MD
-1588593920,1588609023,RO
+1588593920,1588596735,RO
+1588596736,1588602879,IR
+1588602880,1588604927,RO
+1588604928,1588609023,IR
 1588609024,1588613119,MD
-1588613120,1588621311,RO
-1588621312,1588625407,MD
-1588625408,1588641791,RO
-1588641792,1588643839,ES
-1588643840,1588653055,RO
-1588653056,1588654079,MD
-1588654080,1588673535,RO
+1588613120,1588617215,IR
+1588617216,1588619775,RO
+1588619776,1588620031,SG
+1588620032,1588642815,RO
+1588642816,1588643327,ES
+1588643328,1588649983,RO
+1588649984,1588652031,SE
+1588652032,1588673535,RO
 1588673536,1588674559,MD
-1588674560,1588723711,RO
+1588674560,1588676607,RO
+1588676608,1588678655,IR
+1588678656,1588723711,RO
 1588723712,1588854783,UA
 1588854784,1588985855,RU
 1588985856,1589182463,IR
@@ -33356,7 +32030,8 @@
 1593065472,1593081855,LT
 1593081856,1593098239,UA
 1593098240,1593114623,CH
-1593114624,1593122815,DK
+1593114624,1593118719,SE
+1593118720,1593122815,DK
 1593122816,1593131007,SE
 1593131008,1593136895,GB
 1593136896,1593137151,EU
@@ -33365,7 +32040,9 @@
 1593147392,1593163775,RU
 1593163776,1593180159,AT
 1593180160,1593196543,NO
-1593196544,1593212927,SE
+1593196544,1593203103,SE
+1593203104,1593203135,FI
+1593203136,1593212927,SE
 1593212928,1593229311,PL
 1593229312,1593245695,EE
 1593245696,1593247743,NL
@@ -33408,11 +32085,13 @@
 1593421568,1593421823,GB
 1593421824,1593422591,DE
 1593422592,1593422847,GB
-1593422848,1593431167,DE
+1593422848,1593423359,DE
+1593423360,1593423615,US
+1593423616,1593431167,DE
 1593431168,1593431295,GB
-1593431296,1593440511,DE
-1593440512,1593440767,GB
-1593440768,1593442303,DE
+1593431296,1593438719,DE
+1593438720,1593438975,US
+1593438976,1593442303,DE
 1593442304,1593475071,BA
 1593475072,1593491455,HR
 1593491456,1593499647,DE
@@ -33442,19 +32121,22 @@
 1596588032,1596719103,BG
 1596719104,1596850175,IE
 1596850176,1596866559,CZ
-1596866560,1596887039,RU
-1596887040,1596889087,UA
+1596866560,1596887295,RU
+1596887296,1596887551,KZ
+1596887552,1596888063,UA
+1596888064,1596889087,RU
 1596889088,1596889599,KZ
 1596889600,1596889855,CZ
 1596889856,1596890111,UA
 1596890112,1596890623,RU
-1596890624,1596891135,CZ
-1596891136,1596900351,RU
+1596890624,1596890879,CZ
+1596890880,1596900351,RU
 1596900352,1596907519,BY
 1596907520,1596909567,RU
 1596909568,1596911615,KZ
 1596911616,1596915711,RU
-1596915712,1596925951,CZ
+1596915712,1596923903,UA
+1596923904,1596925951,CZ
 1596925952,1596932095,RU
 1596932096,1596940543,CZ
 1596940544,1596940799,RU
@@ -33477,8 +32159,8 @@
 1596954624,1596954879,RU
 1596954880,1596955391,CZ
 1596955392,1596955647,RU
-1596955648,1596956415,CZ
-1596956416,1596956671,RU
+1596955648,1596956159,CZ
+1596956160,1596956671,RU
 1596956672,1596956927,CZ
 1596956928,1596956959,RU
 1596956960,1596956963,DE
@@ -33498,9 +32180,7 @@
 1596963328,1596963839,CZ
 1596963840,1596964095,KZ
 1596964096,1596964607,CZ
-1596964608,1596966399,RU
-1596966400,1596966911,CZ
-1596966912,1596967167,RU
+1596964608,1596967167,RU
 1596967168,1596967423,CZ
 1596967424,1596967935,RU
 1596967936,1596968959,UA
@@ -33553,7 +32233,8 @@
 1599356928,1599373311,BH
 1599373312,1599406079,RU
 1599406080,1599422463,NL
-1599422464,1599438847,RU
+1599422464,1599430655,RU
+1599430656,1599438847,TM
 1599438848,1599455231,RS
 1599455232,1599471615,CZ
 1599471616,1599487999,MK
@@ -33810,7 +32491,8 @@
 1603207168,1603215359,RU
 1603215360,1603219455,DE
 1603219456,1603223551,CH
-1603223552,1603227647,GB
+1603223552,1603223807,FR
+1603223808,1603227647,GB
 1603227648,1603231743,AT
 1603231744,1603235839,IT
 1603235840,1603239935,RU
@@ -33832,7 +32514,9 @@
 1603895296,1603928063,RU
 1603928064,1603944447,DK
 1603944448,1603977215,RU
-1603977216,1603993599,GB
+1603977216,1603990847,GB
+1603990848,1603990911,A1
+1603990912,1603993599,GB
 1603993600,1604009983,ME
 1604009984,1604026367,PL
 1604026368,1604042751,NL
@@ -33889,8 +32573,10 @@
 1605091328,1605099519,PL
 1605099520,1605107711,RU
 1605107712,1605108247,GB
-1605108248,1605108263,IT
-1605108264,1605108407,GB
+1605108248,1605108255,IT
+1605108256,1605108287,GB
+1605108288,1605108295,IT
+1605108296,1605108407,GB
 1605108408,1605108415,IT
 1605108416,1605108567,GB
 1605108568,1605108575,IT
@@ -33900,11 +32586,11 @@
 1605109432,1605109439,IT
 1605109440,1605109495,GB
 1605109496,1605109503,IT
-1605109504,1605109639,GB
+1605109504,1605109559,GB
+1605109560,1605109567,IT
+1605109568,1605109639,GB
 1605109640,1605109647,IT
-1605109648,1605110111,GB
-1605110112,1605110119,IT
-1605110120,1605110263,GB
+1605109648,1605110263,GB
 1605110264,1605110271,IT
 1605110272,1605111023,GB
 1605111024,1605111031,IT
@@ -33924,31 +32610,27 @@
 1605113384,1605113391,IT
 1605113392,1605113407,GB
 1605113408,1605113415,IT
-1605113416,1605113503,GB
-1605113504,1605113511,IT
-1605113512,1605113567,GB
+1605113416,1605113567,GB
 1605113568,1605113575,IT
-1605113576,1605113839,GB
-1605113840,1605113847,IT
-1605113848,1605114071,GB
-1605114072,1605114079,IT
-1605114080,1605114199,GB
+1605113576,1605114031,GB
+1605114032,1605114039,IT
+1605114040,1605114199,GB
 1605114200,1605114207,IT
-1605114208,1605114263,GB
-1605114264,1605114271,IT
-1605114272,1605114295,GB
-1605114296,1605114303,IT
+1605114208,1605114287,GB
+1605114288,1605114303,IT
 1605114304,1605114327,GB
 1605114328,1605114335,IT
 1605114336,1605114871,GB
 1605114872,1605114879,IT
-1605114880,1605115007,GB
+1605114880,1605114975,GB
+1605114976,1605114983,IT
+1605114984,1605115007,GB
 1605115008,1605115015,IT
-1605115016,1605115599,GB
+1605115016,1605115583,GB
+1605115584,1605115591,IT
+1605115592,1605115599,GB
 1605115600,1605115607,IT
-1605115608,1605115863,GB
-1605115864,1605115871,IT
-1605115872,1605115903,GB
+1605115608,1605115903,GB
 1605115904,1605124095,RU
 1605124096,1605125263,GB
 1605125264,1605125267,DE
@@ -34004,19 +32686,14 @@
 1605599232,1605631999,GR
 1605632000,1605664767,RS
 1605664768,1605697535,MK
-1605697536,1605734399,RU
-1605734400,1605734535,GB
-1605734536,1605734536,RU
-1605734537,1605735423,GB
-1605735424,1605742591,RU
-1605742592,1605744639,GB
-1605744640,1605763071,RU
-1605763072,1605767167,KZ
-1605767168,1605795839,RU
+1605697536,1605763071,RU
+1605763072,1605769215,KZ
+1605769216,1605771263,PL
+1605771264,1605795839,RU
 1605795840,1605828607,BE
 1605828608,1605828863,GB
-1605828864,1605829119,US
-1605829120,1605830399,IL
+1605828864,1605829375,US
+1605829376,1605830399,IL
 1605830400,1605830655,US
 1605830656,1605840895,RU
 1605840896,1605844991,CH
@@ -34024,9 +32701,7 @@
 1605861376,1605894143,TR
 1605894144,1606156287,SA
 1606156288,1606418431,RU
-1606418432,1606636287,SE
-1606636288,1606636543,GB
-1606636544,1607467007,SE
+1606418432,1607467007,SE
 1607467008,1607532543,DE
 1607532544,1607569407,SE
 1607569408,1607572479,DK
@@ -34108,8 +32783,9 @@
 1607949312,1607950335,UA
 1607950336,1607952383,RU
 1607952384,1607953407,UA
-1607953408,1607954431,RU
-1607954432,1607956479,UA
+1607953408,1607955711,RU
+1607955712,1607955967,UA
+1607955968,1607956479,RU
 1607956480,1607957503,ES
 1607957504,1607958527,UA
 1607958528,1607959551,PS
@@ -34141,7 +32817,7 @@
 1607988224,1607989247,KG
 1607989248,1607991295,RU
 1607991296,1608122367,UA
-1608122368,1608253439,RO
+1608122368,1608253439,SA
 1608253440,1608384511,RU
 1608384512,1608515583,DE
 1608515584,1610612735,IT
@@ -34249,7 +32925,33 @@
 1680535552,1680539647,CA
 1680539648,1680564223,US
 1680564224,1680572415,CA
-1680572416,1681915903,US
+1680572416,1680627199,US
+1680627200,1680627263,CA
+1680627264,1680646399,US
+1680646400,1680646655,CA
+1680646656,1680646911,US
+1680646912,1680647423,CA
+1680647424,1680651775,US
+1680651776,1680652031,CA
+1680652032,1680652351,US
+1680652352,1680652543,CA
+1680652544,1680734719,US
+1680734720,1680734975,CA
+1680734976,1680749567,US
+1680749568,1680749695,CA
+1680749696,1680780927,US
+1680780928,1680781055,CA
+1680781056,1680781439,US
+1680781440,1680781567,CA
+1680781568,1680798591,US
+1680798592,1680798719,CA
+1680798720,1680801023,US
+1680801024,1680801151,CA
+1680801152,1680808703,US
+1680808704,1680808831,CA
+1680808832,1680814399,US
+1680814400,1680814463,PR
+1680814464,1681915903,US
 1686110208,1694498815,US
 1694498816,1694499839,CN
 1694499840,1694500863,ID
@@ -34698,7 +33400,7 @@
 1728501504,1728502783,AU
 1728502784,1728503807,CN
 1728503808,1728504831,JP
-1728505856,1728506879,NZ
+1728505856,1728506879,NL
 1728506880,1728507903,MY
 1728507904,1728508927,JP
 1728508928,1728509951,MY
@@ -34943,7 +33645,6 @@
 1728750592,1728751615,JP
 1728751616,1728751871,IN
 1728751872,1728752639,ID
-1728752640,1728753663,LK
 1728753664,1728754687,PH
 1728754688,1728755711,IN
 1728755712,1728756735,ID
@@ -35502,7 +34203,6 @@
 1729274880,1729276927,IN
 1729276928,1729277951,BN
 1729277952,1729278975,VN
-1729278976,1729279999,MN
 1729280000,1729281023,HK
 1729281024,1729281535,AU
 1729281536,1729282047,ID
@@ -35593,7 +34293,7 @@
 1729376768,1729377023,SG
 1729377024,1729377279,ID
 1729377280,1729378303,BD
-1729378304,1729378815,IN
+1729378560,1729378815,IN
 1729379072,1729379327,SG
 1729379328,1729380351,HK
 1729380352,1729381375,IN
@@ -35639,7 +34339,6 @@
 1729419264,1729419519,AU
 1729419520,1729419775,SG
 1729419776,1729420031,IN
-1729420032,1729420287,AU
 1729420288,1729421311,HK
 1729421312,1729422335,MY
 1729422336,1729423359,HK
@@ -35650,7 +34349,6 @@
 1729426432,1729427455,AU
 1729427456,1729428479,CN
 1729428480,1729430527,AU
-1729431552,1729432575,JP
 1729432576,1729433599,PH
 1729433600,1729433855,IN
 1729433856,1729434111,AU
@@ -35787,14 +34485,12 @@
 1729596672,1729596927,ID
 1729596928,1729597439,NZ
 1729597440,1729598463,VN
-1729598464,1729598975,AU
 1729598976,1729599231,IN
 1729599232,1729599487,ID
 1729599488,1729600511,AU
 1729600512,1729601535,VN
 1729601536,1729603583,CN
 1729603584,1729604607,HK
-1729604608,1729605119,AU
 1729605376,1729605631,ID
 1729605632,1729606655,CN
 1729606656,1729607679,ID
@@ -35909,8 +34605,7 @@
 1729717248,1729718271,JP
 1729718272,1729719295,HK
 1729719296,1729720319,ID
-1729720320,1729721087,AU
-1729721088,1729721343,IN
+1729720320,1729721343,AU
 1729721344,1729722367,NZ
 1729723392,1729726463,IN
 1729726464,1729727487,PK
@@ -36041,7 +34736,6 @@
 1729856512,1729857535,AU
 1729857536,1729858559,JP
 1729858560,1729859583,IN
-1729859584,1729860607,HK
 1729860608,1729861631,KR
 1729861632,1729862655,AU
 1729862656,1729863679,JP
@@ -36142,7 +34836,8 @@
 1729946624,1729949695,JP
 1729949696,1729950207,IN
 1729950208,1729950719,KH
-1729951744,1729952767,JP
+1729951744,1729952511,JP
+1729952512,1729952767,NZ
 1729952768,1729953791,IN
 1729953792,1729954815,MY
 1729954816,1729955839,ID
@@ -36256,7 +34951,6 @@
 1730066432,1730067455,AU
 1730067456,1730068479,BD
 1730068480,1730069503,IN
-1730069504,1730070527,JP
 1730070528,1730071551,CN
 1730071552,1730072575,KR
 1730072576,1730073599,SG
@@ -36286,7 +34980,8 @@
 1730094080,1730095103,ID
 1730095104,1730096127,JP
 1730096128,1730097151,ID
-1730097152,1730104319,CN
+1730097152,1730103295,CN
+1730103296,1730104319,HK
 1730104320,1730105343,JP
 1730105344,1730106367,PK
 1730106368,1730107391,MV
@@ -36479,7 +35174,8 @@
 1730597888,1730598911,PH
 1730598912,1730599423,AU
 1730599424,1730599935,VU
-1730599936,1730605055,CN
+1730599936,1730604031,CN
+1730604032,1730605055,NP
 1730605056,1730607103,IN
 1730607104,1730608127,JP
 1730608128,1730609151,CN
@@ -36555,15 +35251,456 @@
 1730701312,1730702335,JP
 1730702336,1730702591,ID
 1730702592,1730702847,AU
+1730702848,1730703359,HK
 1730703360,1730704383,CN
 1730704384,1730705407,TH
 1730705408,1730706431,ID
 1730706432,1730708479,JP
+1730708480,1730713599,TH
+1730713600,1730714623,HK
+1730714624,1730715647,JP
+1730715648,1730716671,HK
+1730716672,1730717183,PH
+1730717184,1730717695,AU
+1730717696,1730718719,IN
+1730718720,1730720767,HK
+1730720768,1730723839,TH
+1730723840,1730724863,CN
+1730724864,1730727935,IN
+1730727936,1730728959,HK
+1730728960,1730729983,CN
+1730729984,1730731007,JP
+1730731008,1730732031,CN
+1730732032,1730732287,AU
+1730732288,1730732543,HK
+1730732544,1730733055,BD
+1730733056,1730741247,CN
+1730741248,1730742271,HK
+1730742272,1730742783,AF
+1730742784,1730743295,IN
+1730743296,1730744319,SG
+1730744320,1730745343,CN
+1730745344,1730752511,IN
+1730752512,1730753535,HK
+1730753536,1730754559,CN
+1730754560,1730755071,IN
+1730755072,1730755583,TH
+1730755584,1730756607,JP
+1730756608,1730757631,HK
+1730757632,1730758655,SG
+1730758656,1730759679,JP
+1730759680,1730760703,SG
+1730760704,1730761727,HK
+1730761728,1730762751,TH
+1730762752,1730766847,IN
+1730766848,1730767871,HK
+1730767872,1730768127,AU
+1730768128,1730768639,ID
+1730768640,1730768895,BD
+1730768896,1730769919,JP
+1730769920,1730770943,CN
+1730770944,1730771967,ID
+1730771968,1730772991,HK
+1730772992,1730774015,SG
+1730774016,1730775039,HK
+1730775040,1730776063,JP
+1730776064,1730777087,CN
+1730777088,1730778111,IN
+1730778112,1730780159,CN
+1730780160,1730781183,AU
+1730781184,1730783231,CN
+1730783232,1730783487,IN
+1730783488,1730783743,ID
+1730783744,1730783999,IN
+1730784000,1730784255,ID
+1730784256,1730785279,HK
+1730785280,1730785535,NL
+1730785536,1730786303,AU
+1730786304,1730788351,HK
+1730788352,1730790399,ID
+1730790400,1730791423,IN
+1730791424,1730794495,ID
+1730794496,1730795007,BD
+1730795008,1730795519,IN
+1730795520,1730796543,AU
+1730796544,1730800639,CN
+1730800640,1730801663,IN
+1730801664,1730802687,JP
+1730802688,1730803199,BD
+1730803200,1730803711,ID
+1730803712,1730804735,HK
+1730804736,1730805759,JP
+1730805760,1730806783,AF
+1730806784,1730807807,JP
+1730807808,1730808831,CN
+1730808832,1730809855,HK
+1730809856,1730810623,IN
+1730810624,1730811903,AU
+1730811904,1730814975,CN
+1730814976,1730815999,HK
+1730816000,1730817023,ID
+1730817024,1730818047,JP
+1730818048,1730818815,AU
+1730818816,1730819071,IN
+1730819072,1730820095,JP
+1730820096,1730821119,VN
+1730821120,1730822143,HK
+1730822144,1730824191,CN
+1730824192,1730825215,IN
+1730825216,1730826239,CN
+1730826240,1730827263,JP
+1730827264,1730829311,IN
+1730829312,1730831359,PH
+1730831360,1730832383,HK
+1730832384,1730833407,CN
+1730833408,1730834431,AU
+1730834432,1730834943,TW
+1730834944,1730835455,IN
+1730835456,1730837503,ID
+1730837504,1730838527,IN
+1730838528,1730839551,TH
+1730839552,1730840575,AU
+1730840576,1730841599,SG
+1730841600,1730842623,AU
+1730842624,1730844671,TW
+1730844672,1730845695,BD
+1730845696,1730848767,IN
+1730848768,1730849791,JP
+1730849792,1730850815,IN
+1730850816,1730851839,HK
+1730851840,1730852863,CN
+1730852864,1730853887,KR
+1730853888,1730854143,IN
+1730854144,1730854399,AU
+1730854400,1730854655,NZ
+1730854656,1730854911,HK
+1730854912,1730856959,IN
+1730856960,1730857983,JP
+1730857984,1730858239,AU
+1730858240,1730858495,ID
+1730858496,1730859007,IN
+1730859008,1730860031,BN
+1730860032,1730861055,MY
+1730861056,1730862079,MM
+1730862080,1730863103,JP
+1730863104,1730864127,AU
+1730864128,1730865151,TW
+1730865152,1730866175,CN
+1730866176,1730867199,AU
+1730867200,1730868223,JP
+1730868224,1730869247,KR
+1730869248,1730870271,IN
+1730870272,1730871807,ID
+1730871808,1730873343,IN
+1730873344,1730875391,HK
+1730875392,1730876415,CN
+1730876416,1730877439,AU
+1730877440,1730878463,CN
+1730878464,1730879487,HK
+1730879488,1730881023,IN
+1730881024,1730881535,AU
+1730881536,1730882559,IN
+1730882560,1730883583,ID
+1730883584,1730884607,TW
+1730884608,1730885631,BD
+1730885632,1730886655,AU
+1730886656,1730887679,HK
+1730887680,1730887935,KR
+1730887936,1730888191,IN
+1730888192,1730888703,ID
+1730888704,1730889727,HK
+1730889728,1730889743,AU
+1730889744,1730890751,JP
+1730890752,1730891775,LA
+1730891776,1730892799,IN
+1730892800,1730893823,CN
+1730893824,1730895103,AU
+1730895104,1730895359,BD
+1730895360,1730895871,IN
+1730895872,1730898943,CN
+1730898944,1730899967,MY
+1730899968,1730900991,IN
+1730900992,1730901503,AU
+1730901504,1730901759,DE
+1730901760,1730902015,AU
+1730902016,1730903039,KR
+1730903040,1730904063,CN
+1730904064,1730905087,ID
+1730905088,1730906111,CN
+1730906112,1730906367,TH
+1730906368,1730907135,AU
+1730907136,1730908159,JP
+1730908160,1730909183,PG
+1730909184,1730910207,BD
+1730910208,1730911231,IN
+1730911232,1730912255,NC
+1730912256,1730913279,IN
+1730913280,1730914303,CN
+1730914304,1730915327,NP
+1730915328,1730916351,HK
+1730916352,1730918399,AU
+1730918400,1730919423,CN
+1730919424,1730920447,SG
+1730920448,1730922495,CN
+1730922496,1730923519,IN
+1730923520,1730924031,NF
+1730924032,1730924543,NZ
+1730924544,1730925567,CN
+1730925568,1730926591,NZ
+1730926592,1730927615,HK
+1730927616,1730929663,CN
+1730929664,1730929919,IN
+1730929920,1730930175,TH
+1730930176,1730930431,BD
+1730930432,1730930687,IN
+1730930688,1730931711,CN
+1730931712,1730932735,HK
+1730932736,1730933759,CN
+1730933760,1730934783,HK
+1730934784,1730936063,IN
+1730936064,1730936831,AU
+1730936832,1730937855,IN
+1730937856,1730938879,SG
+1730938880,1730939903,JP
+1730939904,1730940927,IN
+1730940928,1730941439,JP
+1730941440,1730941951,IN
+1730941952,1730942975,HK
+1730942976,1730943487,AU
+1730943488,1730943999,ID
+1730944000,1730945023,HK
+1730945024,1730946047,AU
+1730946048,1730947071,ID
+1730947072,1730948095,AU
+1730948096,1730948351,TH
+1730948352,1730948607,NZ
+1730948608,1730949119,AU
+1730949120,1730951167,IN
+1730951168,1730952191,CN
+1730952192,1730954239,HK
+1730954240,1730955263,SG
+1730955264,1730957311,BD
+1730957312,1730958335,CN
+1730958336,1730959359,JP
+1730959360,1730960383,CN
+1730960384,1730961407,AU
+1730961408,1730962431,IN
+1730962432,1730962687,ID
+1730962688,1730962943,AU
+1730962944,1730963455,JP
+1730963456,1730964479,IN
+1730964480,1730964735,MY
+1730964736,1730964991,HK
+1730964992,1730965503,NZ
+1730965504,1730966527,SG
+1730966528,1730967551,IN
+1730967552,1730969599,CN
+1730969600,1730970623,JP
+1730970624,1730971647,CN
+1730971648,1730973695,IN
+1730973696,1730974719,CN
+1730974720,1730974975,AU
+1730974976,1730975231,ID
+1730975232,1730975743,BD
+1730975744,1730976767,CN
+1730976768,1730977791,IN
+1730977792,1730978815,HK
+1730978816,1730979839,NZ
+1730979840,1730980863,CN
+1730980864,1730981887,IN
+1730981888,1730990079,CN
+1730990080,1730992127,JP
+1730992128,1730993151,TH
+1730993152,1730993407,SG
+1730993408,1730993663,IN
+1730993664,1730993919,NZ
+1730993920,1730994175,PK
+1730994176,1730995199,CN
+1730995200,1730996223,AU
+1730996224,1730997247,HK
+1730997248,1731018751,CN
+1731018752,1731020799,HK
+1731020800,1731060735,CN
+1731060736,1731063807,VN
+1731063808,1731064831,NZ
+1731064832,1731065855,JP
+1731065856,1731066879,CN
+1731066880,1731067391,PH
+1731067392,1731067903,AU
+1731067904,1731068927,CN
+1731068928,1731070975,JP
+1731070976,1731103743,CN
+1731103744,1731103871,TH
+1731103872,1731103999,FR
+1731104000,1731104127,KR
+1731104128,1731104255,JP
+1731104256,1731104511,CN
+1731104512,1731104639,MY
+1731104640,1731104767,SG
+1731104768,1731105791,TW
+1731105792,1731106815,BD
+1731106816,1731115007,CN
+1731115008,1731116031,HK
+1731116032,1731117055,TW
+1731117056,1731118847,IN
+1731118848,1731119103,AU
+1731119104,1731120127,IN
+1731120128,1731121151,JP
+1731121152,1731122175,AF
+1731122176,1731123199,AU
+1731123200,1731124223,PF
+1731124224,1731125247,AU
+1731125248,1731126271,HK
+1731126272,1731127295,AU
+1731127296,1731130367,IN
+1731130368,1731132415,CN
+1731132416,1731133439,SG
+1731133440,1731133951,AU
+1731133952,1731134207,JP
+1731134208,1731134463,NZ
+1731134464,1731135487,CN
+1731135488,1731136511,JP
+1731136512,1731138559,IN
+1731138560,1731139583,CN
+1731139584,1731140607,HK
+1731140608,1731141631,SG
+1731141632,1731142655,IN
+1731142656,1731144703,CN
+1731144704,1731145727,IN
+1731145728,1731146751,CN
+1731146752,1731148799,IN
+1731148800,1731149055,ID
+1731149056,1731149311,HK
+1731149312,1731149823,AU
+1731149824,1731152895,IN
+1731152896,1731153407,SG
+1731153408,1731153919,IN
+1731153920,1731154943,CN
+1731154944,1731155967,TH
+1731155968,1731156479,HK
+1731156480,1731158015,IN
+1731158016,1731159039,CN
+1731159040,1731160063,JP
+1731160064,1731161087,IN
+1731161088,1731162111,CN
+1731162112,1731163135,HK
+1731163136,1731165183,CN
+1731165184,1731167231,IN
+1731167232,1731168255,ID
+1731168256,1731170559,CN
+1731170560,1731171327,PK
+1731171328,1731172863,IN
+1731172864,1731173375,MY
+1731173376,1731178495,IN
+1731178496,1731179519,HK
+1731179520,1731180543,JP
+1731180544,1731181055,MM
+1731181056,1731181311,IN
+1731181312,1731181567,AU
+1731181568,1731182591,KH
+1731182592,1731183615,VN
+1731183616,1731184639,IN
+1731184640,1731185663,CN
+1731185664,1731186687,NZ
+1731186688,1731187711,SG
+1731187712,1731188735,CN
+1731188736,1731189759,IN
+1731189760,1731190783,CN
+1731190784,1731191807,SG
+1731191808,1731192831,ID
+1731192832,1731193087,SG
+1731193088,1731193855,AU
+1731193856,1731194879,IN
+1731194880,1731196159,SG
+1731196160,1731196927,AU
+1731196928,1731197951,CN
+1731197952,1731199999,MY
+1731200000,1731201023,HK
+1731201024,1731202047,NZ
+1731202048,1731202303,TH
+1731202304,1731202559,ID
+1731202560,1731203071,AU
+1731203072,1731204095,BD
+1731204096,1731205119,CN
+1731205120,1731205631,PK
+1731205632,1731205887,HK
+1731205888,1731206143,ID
+1731206144,1731206655,HK
+1731206656,1731206911,PH
+1731206912,1731207167,JP
+1731207168,1731208191,IN
+1731208192,1731210239,JP
+1731210240,1731211263,IN
+1731211264,1731211775,HK
+1731211776,1731212287,IN
+1731212288,1731213311,CN
+1731213312,1731218431,IN
+1731218432,1731221503,VN
+1731221504,1731221759,NP
+1731221760,1731222015,AU
+1731222016,1731222527,IN
+1731222528,1731223551,CN
+1731223552,1731228671,IN
+1731228672,1731228927,MN
+1731228928,1731229183,AU
+1731229184,1731229439,NZ
+1731229440,1731229695,BD
+1731229696,1731230719,JP
+1731230720,1731231743,IN
+1731231744,1731232767,ID
+1731232768,1731233791,HK
+1731233792,1731234815,JP
+1731234816,1731235839,HK
+1731235840,1731239935,CN
+1731239936,1731241983,JP
+1731241984,1731243007,HK
+1731243008,1731244031,SG
+1731244032,1731247103,IN
+1731247104,1731249151,VN
+1731249152,1731250175,IN
+1731250176,1731250687,AU
+1731250688,1731251199,CN
+1731251200,1731252223,TH
+1731252224,1731253247,AU
+1731253248,1731253759,IN
+1731253760,1731254271,AU
+1731254272,1731262463,CN
+1731262464,1731263487,JP
+1731263488,1731264511,IN
+1731264512,1731265535,JP
+1731265536,1731266559,AU
+1731266560,1731267583,HK
+1731267584,1731268607,CN
+1731268608,1731269631,AU
+1731269632,1731270655,CN
+1731270656,1731271679,MY
+1731271680,1731272703,ID
+1731272704,1731273727,SG
+1731273728,1731273983,PH
+1731273984,1731274239,ID
+1731274240,1731274751,AU
+1731274752,1731275775,KH
+1731275776,1731276799,KR
+1731276800,1731279871,IN
+1731279872,1731280895,HK
+1731280896,1731281919,JP
+1731281920,1731282175,IN
+1731282176,1731282431,PK
+1731282432,1731282943,PH
+1731282944,1731284991,CN
+1731284992,1731286015,AU
+1731286016,1731288063,JP
+1731288064,1731290111,CN
+1731290112,1731291135,PH
+1731291136,1731291647,ID
+1731291648,1731292159,AU
+1731292160,1731293183,CN
+1731293184,1731294207,SG
+1731294208,1731297279,IN
 1742733312,1742734335,HK
 1742734336,1742735359,IN
 1742735360,1742736383,JP
 1742736384,1742737407,PK
-1742737408,1742738431,SG
 1742738432,1742738687,HK
 1742738688,1742738943,AU
 1742738944,1742739199,HK
@@ -37532,7 +36669,6 @@
 1743864832,1743865855,TW
 1743865856,1743866879,CN
 1743866880,1743867903,KR
-1743867904,1743868927,JP
 1743868928,1743870975,NZ
 1743870976,1743873023,CN
 1743873024,1743874047,AU
@@ -37561,7 +36697,6 @@
 1743897600,1743899647,AU
 1743899648,1743900671,ID
 1743900672,1743901695,JP
-1743901696,1743902719,IN
 1743902720,1743903743,AU
 1743903744,1743904767,CN
 1743904768,1743908863,IN
@@ -37592,7 +36727,7 @@
 1743931392,1743932415,HK
 1743932416,1743933439,IN
 1743933440,1743934463,AU
-1743934464,1743936511,SG
+1743935488,1743936511,SG
 1743936512,1743937535,AU
 1743937536,1743938559,MM
 1743938560,1743939583,HK
@@ -37603,7 +36738,6 @@
 1743944704,1743945215,ID
 1743945216,1743945727,TO
 1743945728,1743947775,CN
-1743947776,1743948799,JP
 1743948800,1743949823,HK
 1743949824,1743950847,TH
 1743950848,1743951359,HK
@@ -37633,7 +36767,6 @@
 1743976448,1743977471,AU
 1743977472,1743978495,JP
 1743978496,1743979519,HK
-1743979520,1743980543,JP
 1743980544,1743981567,IN
 1743981568,1743982591,SG
 1743982592,1743983359,AU
@@ -37657,7 +36790,6 @@
 1744006656,1744006911,AU
 1744006912,1744009215,IN
 1744009216,1744010239,JP
-1744010240,1744011263,ID
 1744011264,1744012287,HK
 1744012288,1744013311,IN
 1744013312,1744014335,CN
@@ -37675,7 +36807,6 @@
 1744024320,1744024575,AF
 1744024576,1744025599,HK
 1744025600,1744026623,IN
-1744026624,1744027647,JP
 1744027648,1744028671,MY
 1744028672,1744029695,JP
 1744029696,1744030719,KR
@@ -37699,7 +36830,6 @@
 1744049152,1744050175,BD
 1744050176,1744051199,HK
 1744051200,1744052223,PH
-1744052224,1744053247,MN
 1744053248,1744054271,ID
 1744054272,1744055295,KR
 1744055296,1744056319,HK
@@ -37794,7 +36924,6 @@
 1744151552,1744152575,LA
 1744152576,1744153599,JP
 1744153600,1744154623,NZ
-1744154624,1744154879,IN
 1744154880,1744155135,ID
 1744155136,1744155647,BD
 1744155648,1744156671,ID
@@ -37866,7 +36995,7 @@
 1744220928,1744221183,JP
 1744221184,1744222207,NZ
 1744222208,1744222719,ID
-1744222720,1744223231,AU
+1744222720,1744222975,AU
 1744223232,1744224255,TH
 1744225280,1744226303,IN
 1744226304,1744227327,SG
@@ -38107,7 +37236,6 @@
 1744473344,1744474111,SG
 1744474112,1744481279,IN
 1744481280,1744482303,JP
-1744482304,1744483327,IN
 1744483328,1744484351,CN
 1744484352,1744485119,IN
 1744485120,1744485375,MY
@@ -38143,9 +37271,7 @@
 1744514048,1744514559,ID
 1744514560,1744514815,IN
 1744514816,1744515071,AU
-1744515072,1744516095,IN
-1744516096,1744517119,HK
-1744517120,1744519167,IN
+1744515072,1744519167,IN
 1744519168,1744520191,AU
 1744520192,1744521215,TH
 1744521216,1744523263,JP
@@ -38164,7 +37290,6 @@
 1744534528,1744536575,CN
 1744536576,1744537087,PW
 1744537088,1744538623,AU
-1744538624,1744539647,HK
 1744539648,1744540671,AU
 1744540672,1744541695,IN
 1744541696,1744542719,ID
@@ -38184,12 +37309,10 @@
 1744562176,1744563199,BD
 1744563200,1744564223,HK
 1744564224,1744565247,CN
-1744565248,1744566271,HK
 1744566272,1744567295,IN
 1744567296,1744568319,JP
 1744568320,1744569343,VN
 1744569344,1744570367,IN
-1744570368,1744570879,JP
 1744570880,1744571391,AU
 1744571392,1744571903,ID
 1744571904,1744572415,AU
@@ -38203,7 +37326,6 @@
 1744580608,1744580863,PH
 1744580864,1744581119,SG
 1744581120,1744581631,ID
-1744581632,1744582655,JP
 1744582656,1744583679,AU
 1744583680,1744584703,IN
 1744584704,1744585727,CN
@@ -38221,7 +37343,7 @@
 1744594944,1744595967,CN
 1744595968,1744596991,IN
 1744596992,1744598015,SG
-1744598016,1744602111,JP
+1744599040,1744601087,JP
 1744602112,1744603135,HK
 1744603136,1744604159,JP
 1744604160,1744607231,IN
@@ -38237,11 +37359,9 @@
 1744616448,1744616959,ID
 1744616960,1744617471,AU
 1744617472,1744618495,IN
-1744618496,1744619519,JP
 1744619520,1744620543,SG
 1744620544,1744622591,CN
 1744622592,1744625663,IN
-1744625664,1744626687,SG
 1744626688,1744627711,KR
 1744627712,1744628735,CN
 1744628736,1744629759,IN
@@ -38263,7 +37383,6 @@
 1744643584,1744644095,BD
 1744644096,1744645119,HK
 1744645120,1744646143,BD
-1744646144,1744647167,PH
 1744647168,1744648191,IN
 1744648192,1744649215,KR
 1744649216,1744650239,CN
@@ -38290,7 +37409,6 @@
 1744665856,1744666111,IN
 1744666112,1744666367,AU
 1744666368,1744666623,PH
-1744666624,1744667647,JP
 1744667648,1744668671,TH
 1744668672,1744669695,NZ
 1744669696,1744670719,HK
@@ -38352,8 +37470,7 @@
 1744733184,1744734207,NZ
 1744734208,1744736255,AU
 1744736256,1744737279,JP
-1744737280,1744738047,HK
-1744738048,1744738303,CN
+1744737280,1744738303,HK
 1744738304,1744739327,SG
 1744739328,1744740351,NZ
 1744740352,1744741375,IN
@@ -38365,7 +37482,6 @@
 1744744448,1744745471,CN
 1744745472,1744747519,NP
 1744747520,1744748543,CN
-1744748544,1744749055,JP
 1744749056,1744749567,NZ
 1744749568,1744749823,CN
 1744749824,1744750591,AU
@@ -38474,7 +37590,25 @@
 1747304448,1747308543,CA
 1747308544,1747316735,US
 1747316736,1747317759,CA
-1747317760,1753251839,US
+1747317760,1747801855,US
+1747801856,1747802111,IE
+1747802112,1749061631,US
+1749061632,1749069823,NL
+1749069824,1749094399,US
+1749094400,1749098495,NL
+1749098496,1749172223,US
+1749172224,1749188607,NL
+1749188608,1749196799,US
+1749196800,1749204991,NL
+1749204992,1749213183,US
+1749213184,1749229567,NL
+1749229568,1749327871,US
+1749327872,1749344255,NL
+1749344256,1749372927,US
+1749372928,1749381119,NL
+1749381120,1749590015,US
+1749590016,1749598207,NL
+1749598208,1753251839,US
 1753251840,1753252095,MN
 1753252096,1753252351,SY
 1753252352,1753252607,BY
@@ -38502,7 +37636,9 @@
 1753483264,1753483519,IE
 1753483520,1753486335,US
 1753486336,1753486591,IN
-1753486592,1754136575,US
+1753486592,1753735167,US
+1753735168,1753743359,IE
+1753743360,1754136575,US
 1754136576,1754169343,CA
 1754169344,1754206719,US
 1754206720,1754206975,GW
@@ -38511,7 +37647,11 @@
 1754207488,1754207743,KI
 1754207744,1754207999,MM
 1754208000,1754208255,VU
-1754208256,1754208511,NA
+1754208256,1754208326,NA
+1754208327,1754208327,AO
+1754208328,1754208353,NA
+1754208354,1754208354,AO
+1754208355,1754208511,NA
 1754208512,1754208767,DJ
 1754208768,1754209023,BF
 1754209024,1754209279,BW
@@ -38521,7 +37661,9 @@
 1754210048,1754210303,BJ
 1754210304,1754251519,US
 1754251520,1754251775,LY
-1754251776,1754252543,US
+1754251776,1754252031,US
+1754252032,1754252287,MR
+1754252288,1754252543,US
 1754252544,1754252799,MZ
 1754252800,1754253055,US
 1754253056,1754253311,GN
@@ -38697,9 +37839,9 @@
 1755833856,1755834111,SZ
 1755834112,1755834367,CN
 1755834368,1755834623,TN
-1755834624,1755834879,US
+1755834624,1755834879,AS
 1755834880,1755835135,PG
-1755835136,1755835391,US
+1755835136,1755835391,PR
 1755835392,1755835647,BA
 1755835648,1755835903,LS
 1755835904,1755836159,GN
@@ -38720,10 +37862,13 @@
 1755839744,1755839999,ER
 1755840000,1755840255,AL
 1755840256,1755840511,RU
-1755840512,1755971583,US
-1756037120,1756049407,US
+1755840512,1756049407,US
 1756049408,1756053503,CA
-1756053504,1757417471,US
+1756053504,1756066719,US
+1756066720,1756066751,RO
+1756066752,1756086271,US
+1756086272,1756090367,CA
+1756090368,1757417471,US
 1757417472,1757419519,CA
 1757419520,1757424639,US
 1757424640,1757425663,CA
@@ -38747,42 +37892,425 @@
 1757487104,1757489151,CA
 1757489152,1757491199,US
 1757491200,1757497343,CA
-1757497344,1757501439,US
+1757497344,1757502463,US
 1757502464,1757503487,CA
 1757503488,1757505535,US
 1757505536,1757506559,CA
 1757506560,1757512703,US
 1757512704,1757513727,CA
-1757513728,1757519871,US
-1757521920,1757522943,US
+1757513728,1757522943,US
 1757522944,1757523967,CA
 1757523968,1757529087,US
 1757529088,1757530111,AI
 1757530112,1757532159,US
 1757532160,1757534207,CA
-1757534208,1757552639,US
+1757534208,1757543295,US
+1757543296,1757543327,AU
+1757543328,1757552639,US
 1757552640,1757560831,CA
-1757560832,1757569023,US
-1757577216,1757642751,US
+1757560832,1757597695,US
+1757597696,1757599743,GB
+1757599744,1757642751,US
 1757642752,1757675519,CA
 1757675520,1757937663,US
 1757937664,1757941759,CA
-1757941760,1757958143,US
+1757941760,1757957631,US
+1757957632,1757957887,NL
+1757957888,1757958143,US
 1757958144,1757962239,CA
 1757962240,1757966335,BB
-1757966336,1758019583,US
-1758068736,1758265343,US
+1757966336,1758265343,US
 1758265344,1758330879,CA
-1758330880,1759125503,US
+1758330880,1758412799,US
+1758412800,1758413055,BG
+1758413056,1758413311,SE
+1758413312,1758413567,PS
+1758413568,1758414335,US
+1758414336,1758414591,LV
+1758414592,1758414847,IN
+1758414848,1758415103,GD
+1758415104,1758415359,GB
+1758415360,1758415615,FR
+1758415616,1758415871,CY
+1758415872,1758416127,IT
+1758416128,1758416383,US
+1758416384,1758416639,CF
+1758416640,1758416895,IL
+1758416896,1758417151,VC
+1758417152,1758417407,ID
+1758417408,1758417663,CL
+1758417664,1758417919,HK
+1758417920,1758418175,DE
+1758418176,1758418431,RU
+1758418432,1758418687,CN
+1758418688,1758418943,BL
+1758418944,1758419199,US
+1758419200,1758419455,CR
+1758419456,1758419711,EG
+1758419712,1758419967,VE
+1758419968,1758420223,US
+1758420224,1758420479,HU
+1758420480,1758420735,CH
+1758420736,1758420991,MM
+1758420992,1759128575,US
 1759128576,1759129599,CA
 1759129600,1759131647,US
 1759131648,1759133695,CA
-1759133696,1759141887,US
-1759444992,1759510527,US
+1759133696,1759138815,US
+1759138816,1759139839,CA
+1759139840,1759140863,US
+1759140864,1759141887,CA
+1759141888,1759149055,US
+1759149056,1759150079,CA
+1759150080,1759160319,US
+1759160320,1759162367,BM
+1759162368,1759163391,BB
+1759163392,1759166463,US
+1759166464,1759167487,CA
+1759167488,1759172607,US
+1759172608,1759173631,VC
+1759173632,1759178751,US
+1759178752,1759179775,PR
+1759179776,1759184895,US
+1759184896,1759186943,CA
+1759186944,1759188991,US
+1759188992,1759190015,VC
+1759190016,1759191039,PR
+1759191040,1759201279,US
+1759201280,1759202303,VG
+1759202304,1759208447,US
+1759208448,1759209471,CA
+1759209472,1759212543,US
+1759212544,1759217663,CA
+1759217664,1759222783,US
+1759222784,1759223807,CA
+1759223808,1759230975,US
+1759230976,1759233023,CA
+1759233024,1759234047,US
+1759234048,1759236095,CA
+1759236096,1759239167,US
+1759239168,1759240191,CA
+1759240192,1759313919,US
+1759313920,1759346687,CA
+1759346688,1759408127,US
+1759408128,1759412223,CA
+1759412224,1759412991,US
+1759412992,1759413247,AU
+1759413248,1759414271,US
+1759414272,1759414527,SE
+1759414528,1759415295,US
+1759415296,1759415551,SG
+1759415552,1759416575,US
+1759416576,1759416831,HK
+1759416832,1759417599,US
+1759417600,1759417855,FR
+1759417856,1759419391,US
+1759419392,1759419647,MX
+1759419648,1759428607,US
+1759428608,1759428863,LB
+1759428864,1759429119,US
+1759429120,1759429375,LK
+1759429376,1759429631,MO
+1759429632,1759429887,CN
+1759429888,1759430143,DK
+1759430144,1759430399,QA
+1759430400,1759430655,BA
+1759430656,1759430911,AR
+1759430912,1759431167,MX
+1759431168,1759431423,AW
+1759431424,1759431679,BZ
+1759431680,1759431935,BS
+1759431936,1759432191,IN
+1759432192,1759432447,HR
+1759432448,1759432703,OM
+1759432704,1759432959,PK
+1759432960,1759433215,PS
+1759433216,1759433471,SA
+1759433472,1759433983,US
+1759433984,1759434239,MA
+1759434240,1759434495,DE
+1759434496,1759434751,JP
+1759434752,1759435007,SY
+1759435008,1759435263,US
+1759435264,1759435519,HK
+1759435520,1759435775,IQ
+1759435776,1759436031,KE
+1759436032,1759436287,AE
+1759436288,1759510527,US
+1759510528,1759510783,VE
+1759510784,1759511039,AG
+1759511040,1759511295,GT
+1759511296,1759511551,VC
+1759511552,1759511807,PY
+1759511808,1759512063,JM
+1759512064,1759512319,MS
+1759512320,1759512575,GD
+1759512576,1759512831,LC
+1759512832,1759513087,HT
+1759513088,1759513343,EC
+1759513344,1759513599,KN
+1759513600,1759513855,SR
+1759513856,1759514111,NI
+1759514112,1759514367,BB
+1759514368,1759514623,PE
+1759514624,1759514879,KY
+1759514880,1759515135,TT
+1759515136,1759515391,GY
+1759515392,1759515647,BO
+1759515648,1759515903,CU
+1759515904,1759516159,DM
+1759516160,1759516415,SH
+1759516416,1759516671,BM
+1759516672,1759516927,FJ
+1759516928,1759517183,HN
+1759517184,1759517439,GL
+1759517440,1759517695,MQ
+1759517696,1759517951,GF
+1759517952,1759518207,MF
+1759518208,1759518463,BZ
+1759518464,1759518719,GP
+1759518720,1759518975,AW
+1759518976,1759519231,AI
+1759519232,1759519487,BL
+1759519488,1759519743,CO
+1759519744,1759519999,TC
+1759520000,1759520255,VG
+1759520256,1759520511,WF
+1759520512,1759520767,UM
+1759520768,1759521023,SV
+1759521024,1759521279,TK
+1759521280,1759521535,SJ
+1759521536,1759521791,PM
+1759521792,1759522047,GS
+1759522048,1759522303,DO
+1759522304,1759522559,RE
+1759522560,1759522815,PN
+1759522816,1759523071,MP
+1759523072,1759523327,NF
+1759523328,1759523583,US
+1759523584,1759523839,NU
+1759523840,1759524095,NC
+1759524096,1759524351,NL
+1759524352,1759524607,CX
+1759524608,1759524863,BS
+1759524864,1759525119,PF
+1759525120,1759525375,CK
+1759525376,1759525631,TF
+1759525632,1759525887,FK
+1759525888,1759526143,GG
+1759526144,1759526399,CC
+1759526400,1759526655,JE
+1759526656,1759526911,FO
+1759526912,1759535103,US
+1759535104,1759543295,CA
+1759543296,1759547391,US
+1759547392,1759549439,NL
+1759549440,1760047103,US
+1760047104,1760051199,CA
+1760051200,1760116735,US
+1760116736,1760133119,CA
+1760133120,1760165887,US
+1760165888,1760231423,CA
+1760231424,1760383743,US
+1760383744,1760383999,MO
+1760384000,1760384255,GB
+1760384256,1760384511,BZ
+1760384512,1760384767,US
+1760384768,1760385023,KE
+1760385024,1760385279,US
+1760385280,1760385535,SG
+1760385536,1760385791,US
+1760385792,1760386047,HK
+1760386048,1760386303,US
+1760386304,1760386559,GB
+1760386560,1760386815,US
+1760386816,1760387071,HK
+1760387072,1760391167,US
+1760395264,1760440831,US
+1760440832,1760441343,AU
+1760441344,1760657407,US
+1760657408,1760677887,CA
+1760677888,1760690175,US
+1760690176,1760755711,CA
+1760755712,1760776191,US
+1760776192,1760784383,CA
+1760784384,1760817151,US
+1760817152,1760817407,MO
+1760817408,1760817663,BZ
+1760817664,1760817919,BS
+1760817920,1760818175,PA
+1760818176,1760818431,AR
+1760818432,1760818687,MX
+1760818688,1760818943,AW
+1760818944,1760819199,SE
+1760819200,1760819455,ES
+1760819456,1760819711,GB
+1760819712,1760819967,MA
+1760819968,1760820223,HK
+1760820224,1760820479,JP
+1760820480,1760820735,CA
+1760820736,1760837631,US
+1760837632,1760839679,CA
+1760839680,1760867327,US
+1760867328,1760868351,PR
+1760868352,1760869375,US
+1760869376,1760870399,CA
+1760870400,1760871423,US
+1760871424,1760872447,CA
+1760872448,1760878591,US
+1760878592,1760880639,JM
+1760880640,1760883711,US
+1760883712,1760884735,CA
+1760884736,1760886783,US
+1760886784,1760888831,CA
+1760888832,1760899071,US
+1760899072,1760900095,GD
+1760900096,1760903167,US
+1760903168,1760904191,CA
+1760904192,1760909311,US
+1760909312,1760910335,VG
+1760910336,1760911359,GD
+1760911360,1760923647,US
+1760923648,1760924671,CA
+1760924672,1760925695,US
+1760925696,1760929791,CA
+1760929792,1760937983,US
+1760937984,1760939007,CA
+1760939008,1760940031,DM
+1760940032,1760944127,US
+1760944128,1760945151,CA
+1760945152,1760985087,US
+1760985088,1761017855,CA
+1761017856,1761075199,US
+1761075200,1761083391,CA
+1761083392,1761181695,US
+1761181696,1761181951,MX
+1761181952,1761185791,US
+1761185792,1761186047,MX
+1761186048,1761189887,US
+1761189888,1761190143,JP
+1761190144,1761198079,US
+1761198080,1761214463,CA
+1761214464,1761222655,GP
+1761222656,1761230847,US
+1761230848,1761239039,CA
+1761239040,1761255423,US
+1761255424,1761255679,CN
+1761255680,1761255935,NZ
+1761255936,1761256191,DK
+1761256192,1761256447,HR
+1761256448,1761256703,LI
+1761256704,1761256959,ME
+1761256960,1761257215,AM
+1761257216,1761257471,GE
+1761257472,1761257727,MC
+1761257728,1761257983,BA
+1761257984,1761258239,RS
+1761258240,1761258495,SI
+1761258496,1761258751,IT
+1761258752,1761259007,LU
+1761259008,1761259263,PT
+1761259264,1761259519,FR
+1761259520,1761259775,KH
+1761259776,1761260031,AZ
+1761260032,1761260287,ET
+1761260288,1761260543,CU
+1761260544,1761260799,EC
+1761260800,1761261055,MU
+1761261056,1761261311,JM
+1761261312,1761261567,PR
+1761261568,1761261823,VG
+1761261824,1761262079,SG
+1761262080,1761288191,US
+1761288192,1761292287,CA
+1761292288,1761302015,US
+1761302016,1761302271,CA
+1761302272,1761304575,US
+1761304576,1761308671,CA
+1761308672,1761478655,US
+1761478656,1761479679,CA
+1761479680,1761484799,US
+1761484800,1761485823,CA
+1761485824,1761488895,US
+1761488896,1761489919,CA
+1761489920,1761499135,US
+1761499136,1761501183,CA
+1761501184,1761502207,VG
+1761502208,1761515519,US
+1761515520,1761517567,CA
+1761517568,1761522687,US
+1761522688,1761523711,CA
+1761523712,1761524735,US
+1761524736,1761525759,CA
+1761526784,1761527807,CA
+1761527808,1761544191,US
+1761544192,1761546239,CA
+1761546240,1761554431,US
+1761554432,1761555455,CA
+1761556480,1761574911,US
+1761576960,1761579007,VG
+1761579008,1761581055,US
+1761581056,1761583103,CA
+1761583104,1761587199,US
+1761587200,1761588223,AI
+1761589248,1761593343,US
+1761595392,1761596415,CA
 1761607680,1762656255,ZA
-1762656256,1763000335,MU
-1763000336,1763000339,UG
-1763000340,1763704831,MU
+1762656256,1762660351,MU
+1762660352,1762661375,KE
+1762661376,1762661887,MU
+1762661888,1762662399,TZ
+1762662400,1762662911,MZ
+1762662912,1762664447,ZA
+1762664448,1762664959,FR
+1762664960,1762665471,GB
+1762665472,1762680063,MU
+1762680064,1762680575,NL
+1762680576,1762681087,SE
+1762681088,1762681599,DE
+1762681600,1762684927,MU
+1762684928,1762689023,KE
+1762689024,1762691071,MU
+1762691072,1762693119,TZ
+1762693120,1762695167,MZ
+1762695168,1762701311,ZA
+1762701312,1762703359,FR
+1762703360,1762705407,GB
+1762705408,1762983935,MU
+1762983936,1763000319,KE
+1763000320,1763008511,UG
+1763008512,1763016703,RW
+1763016704,1763024895,DJ
+1763024896,1763041279,TZ
+1763041280,1763049471,MZ
+1763049472,1763074047,ZA
+1763074048,1763082239,FR
+1763082240,1763090431,GB
+1763090432,1763327999,MU
+1763328000,1763336191,NL
+1763336192,1763344383,SE
+1763344384,1763344895,UG
+1763344896,1763352575,DE
+1763352576,1763402239,MU
+1763402240,1763402751,KE
+1763402752,1763428351,MU
+1763428352,1763428863,ZA
+1763428864,1763430399,MU
+1763430400,1763438591,KE
+1763438592,1763442687,UG
+1763442688,1763450879,MU
+1763450880,1763459071,TZ
+1763459072,1763463167,MZ
+1763463168,1763471359,ZA
+1763471360,1763657727,MU
+1763657728,1763659775,ZA
+1763659776,1763661823,MU
+1763661824,1763663871,FR
+1763663872,1763690495,MU
+1763690496,1763692543,ZA
+1763692544,1763694591,MU
+1763694592,1763696639,FR
+1763696640,1763704831,MU
 1763704832,1764753407,EG
 1764753408,1765801983,KE
 1765801984,1766850559,MA
@@ -38840,9 +38368,7 @@
 1784676352,1785200639,KR
 1785200640,1785462783,TW
 1785462784,1786773503,CN
-1786773504,1790672387,JP
-1790672388,1790672388,AP
-1790672389,1790967807,JP
+1786773504,1790967807,JP
 1790967808,1793064959,IN
 1793064960,1794113535,CN
 1794113536,1795162111,KR
@@ -38880,7 +38406,25 @@
 1795593728,1795595775,NL
 1795595776,1795596287,US
 1795596288,1795603455,NL
-1795603456,1805000058,US
+1795603456,1796253695,US
+1796253696,1796253951,CA
+1796253952,1796257919,US
+1796257920,1796258047,PR
+1796258048,1796262911,US
+1796262912,1796263167,PR
+1796263168,1796325375,US
+1796325376,1796325631,PR
+1796325632,1796402431,US
+1796402432,1796402559,CA
+1796402560,1796403199,US
+1796403200,1796403327,CA
+1796403328,1796404095,US
+1796404096,1796404223,CA
+1796404224,1796404735,US
+1796404736,1796404863,CA
+1796404864,1796406655,US
+1796406656,1796406783,CA
+1796406784,1805000058,US
 1805000059,1805000059,CA
 1805000060,1805049855,US
 1805049856,1805058047,CA
@@ -38896,7 +38440,20 @@
 1805190400,1805190655,ES
 1805190656,1805210623,US
 1805210624,1805210879,EG
-1805210880,1805582335,US
+1805210880,1805251583,US
+1805251584,1805251839,DE
+1805251840,1805252095,GB
+1805252096,1805252351,DE
+1805252352,1805252607,GB
+1805252608,1805252863,DE
+1805252864,1805253119,GB
+1805253120,1805253375,DE
+1805253376,1805253631,GB
+1805253632,1805253887,DE
+1805253888,1805254143,GB
+1805254144,1805254399,DE
+1805254400,1805254655,GB
+1805254656,1805582335,US
 1805582336,1805647871,CA
 1805647872,1805713407,US
 1805713408,1805717503,CA
@@ -38910,7 +38467,12 @@
 1805752576,1805753087,CA
 1805753088,1805754111,US
 1805754112,1805754367,CA
-1805754368,1806174207,US
+1805754368,1806172159,US
+1806172160,1806172415,DE
+1806172416,1806172671,GB
+1806172672,1806172927,DE
+1806172928,1806173183,GB
+1806173184,1806174207,US
 1806174208,1806174463,BR
 1806174464,1806205183,US
 1806205184,1806205439,CA
@@ -38924,7 +38486,9 @@
 1807056896,1807057151,AU
 1807057152,1807057663,US
 1807057664,1807057919,GB
-1807057920,1807597567,US
+1807057920,1807548415,US
+1807548416,1807548927,LU
+1807548928,1807597567,US
 1807597568,1807646719,CA
 1807646720,1807655679,US
 1807655680,1807655935,IE
@@ -38934,7 +38498,11 @@
 1807657984,1807658239,SG
 1807658240,1807658495,GB
 1807658496,1807658751,BS
-1807658752,1807695871,US
+1807658752,1807691263,US
+1807691264,1807691519,CA
+1807691520,1807693242,US
+1807693243,1807693243,JP
+1807693244,1807695871,US
 1807695872,1807699967,VI
 1807699968,1807707311,US
 1807707312,1807707312,JP
@@ -38974,12 +38542,22 @@
 1815966976,1815967231,US
 1815967232,1815967487,CA
 1815967488,1815968255,US
-1815968256,1815968511,FR
-1815968512,1815968639,US
-1815968640,1815968767,FR
+1815968256,1815968767,FR
 1815968768,1815969279,US
 1815969280,1815969791,JP
-1815969792,1815987199,US
+1815969792,1815977983,US
+1815977984,1815979007,JP
+1815979008,1815980031,NL
+1815980032,1815980543,AU
+1815980544,1815981055,DE
+1815981056,1815982079,GB
+1815982080,1815982591,FR
+1815982592,1815983103,DE
+1815983104,1815984127,JP
+1815984128,1815984639,AU
+1815984640,1815985151,US
+1815985152,1815985663,NL
+1815985664,1815987199,US
 1815987200,1815987711,GB
 1815987712,1815988223,NL
 1815988224,1815988735,JP
@@ -38998,7 +38576,10 @@
 1815996160,1815996415,CA
 1815996416,1815997695,US
 1815997696,1815997951,FR
-1815997952,1816001791,US
+1815997952,1816001023,US
+1816001024,1816001279,JP
+1816001280,1816001535,AU
+1816001536,1816001791,US
 1816001792,1816002559,NL
 1816002560,1816068095,US
 1816068096,1816133631,CA
@@ -39054,7 +38635,9 @@
 1823170560,1823178751,US
 1823178752,1823179007,GB
 1823179008,1823179263,DE
-1823179264,1823186687,US
+1823179264,1823180287,US
+1823180288,1823180543,AU
+1823180544,1823186687,US
 1823186688,1823186943,IN
 1823186944,1823211519,US
 1823211520,1823342591,CA
@@ -39262,7 +38845,9 @@
 1833455616,1833459711,NL
 1833459712,1833463807,ME
 1833463808,1833467903,UA
-1833467904,1833471999,CH
+1833467904,1833468579,CH
+1833468580,1833468580,RU
+1833468581,1833471999,CH
 1833472000,1833473023,NL
 1833473024,1833474047,EU
 1833474048,1833475071,UA
@@ -39287,14 +38872,16 @@
 1833542912,1833543167,GB
 1833543168,1833543423,IN
 1833543424,1833544959,GB
-1833544960,1833545087,IN
+1833544960,1833545001,IN
+1833545002,1833545002,GB
+1833545003,1833545087,IN
 1833545088,1833545215,GB
 1833545216,1833545471,NL
 1833545472,1833545727,GB
 1833545728,1833549823,IT
 1833549824,1833553919,RU
 1833553920,1833558015,CZ
-1833558016,1833562111,BG
+1833558016,1833562111,US
 1833562112,1833566207,PS
 1833566208,1833570303,SE
 1833570304,1833571583,NL
@@ -39422,29 +39009,31 @@
 1835917856,1835917863,IT
 1835917864,1835917919,GB
 1835917920,1835917935,IT
-1835917936,1835918439,GB
+1835917936,1835918383,GB
+1835918384,1835918391,IT
+1835918392,1835918439,GB
 1835918440,1835918447,IT
 1835918448,1835918519,GB
 1835918520,1835918527,IT
-1835918528,1835918711,GB
+1835918528,1835918679,GB
+1835918680,1835918687,IT
+1835918688,1835918711,GB
 1835918712,1835918719,IT
 1835918720,1835918735,GB
 1835918736,1835918743,IT
-1835918744,1835918823,GB
-1835918824,1835918831,IT
-1835918832,1835918847,GB
+1835918744,1835918847,GB
 1835918848,1835918855,IT
 1835918856,1835919127,GB
 1835919128,1835919135,IT
 1835919136,1835919151,GB
 1835919152,1835919159,IT
-1835919160,1835919327,GB
-1835919328,1835919335,IT
-1835919336,1835919751,GB
+1835919160,1835919751,GB
 1835919752,1835919759,IT
 1835919760,1835920479,GB
 1835920480,1835920487,IT
-1835920488,1835920991,GB
+1835920488,1835920519,GB
+1835920520,1835920527,IT
+1835920528,1835920991,GB
 1835920992,1835920999,IT
 1835921000,1835921119,GB
 1835921120,1835921127,IT
@@ -39458,17 +39047,22 @@
 1835922560,1835922567,IT
 1835922568,1835922647,GB
 1835922648,1835922655,IT
-1835922656,1835923351,GB
+1835922656,1835922671,GB
+1835922672,1835922679,IT
+1835922680,1835923007,GB
+1835923008,1835923015,IT
+1835923016,1835923351,GB
 1835923352,1835923359,IT
 1835923360,1835924375,GB
 1835924376,1835924383,IT
 1835924384,1835925159,GB
 1835925160,1835925167,IT
-1835925168,1835925503,GB
+1835925168,1835925303,GB
+1835925304,1835925311,IT
+1835925312,1835925503,GB
 1835925504,1835933695,LV
-1835933696,1835942399,RU
-1835942400,1835942655,UA
-1835942656,1835950079,RU
+1835933696,1835941887,RU
+1835941888,1835950079,UA
 1835950080,1835958271,LB
 1835958272,1835966463,HU
 1835966464,1835974655,IR
@@ -39492,9 +39086,9 @@
 1836627968,1836630015,RU
 1836630016,1836646399,BG
 1836646400,1836679167,RS
-1836679168,1836686335,BG
-1836686336,1836687359,GR
-1836687360,1836711935,BG
+1836679168,1836680703,BG
+1836680704,1836681215,MK
+1836681216,1836711935,BG
 1836711936,1836728319,UA
 1836728320,1836744703,RS
 1836744704,1836745983,FR
@@ -39578,9 +39172,13 @@
 1839693824,1839726591,RU
 1839726592,1839759359,IT
 1839759360,1839792127,RU
-1839792128,1839794847,GB
+1839792128,1839793279,GB
+1839793280,1839793407,A1
+1839793408,1839794847,GB
 1839794848,1839794879,CH
-1839794880,1839816703,GB
+1839794880,1839796479,GB
+1839796480,1839796671,A1
+1839796672,1839816703,GB
 1839816704,1839824895,NO
 1839824896,1839890431,RU
 1839890432,1839923199,GB
@@ -39659,7 +39257,8 @@
 1841758208,1841766399,PL
 1841766400,1841774591,HU
 1841774592,1841782783,PL
-1841782784,1841799167,BG
+1841782784,1841790975,US
+1841790976,1841799167,BG
 1841799168,1841807359,DE
 1841807360,1841815551,NO
 1841815552,1841823743,BG
@@ -39677,7 +39276,7 @@
 1841880064,1841881087,JP
 1841881088,1841889279,UA
 1841889280,1841897471,IR
-1841897472,1841905663,RO
+1841897472,1841905663,KZ
 1841905664,1841922047,RU
 1841922048,1841924351,NL
 1841924352,1841924607,GB
@@ -39699,7 +39298,9 @@
 1842017024,1842017279,BE
 1842017280,1842020351,GB
 1842020352,1842028543,NO
-1842028544,1842036735,CH
+1842028544,1842029567,CH
+1842029568,1842030591,FR
+1842030592,1842036735,CH
 1842036736,1842042879,FR
 1842042880,1842044927,LU
 1842044928,1842053119,GB
@@ -39761,7 +39362,6 @@
 1842249728,1842257919,RU
 1842257920,1842266111,EU
 1842266112,1842274303,PL
-1842274304,1842282495,RO
 1842282496,1842286591,RU
 1842286592,1842290687,GB
 1842290688,1842294783,RS
@@ -39932,7 +39532,9 @@
 1844174848,1844178943,DE
 1844178944,1844180991,EE
 1844180992,1844183039,TR
-1844183040,1844191231,IT
+1844183040,1844185087,IT
+1844185088,1844186111,IE
+1844186112,1844191231,IT
 1844191232,1844195327,AL
 1844199424,1844203519,RU
 1844203520,1844207615,NL
@@ -39999,7 +39601,8 @@
 1844772864,1844838399,RS
 1844838400,1844903935,GB
 1844903936,1844969471,NO
-1844969472,1845035007,RU
+1844969472,1845034751,RU
+1845034752,1845035007,BY
 1845035008,1845100543,GB
 1845100544,1845166079,DE
 1845166080,1845231615,UA
@@ -40214,7 +39817,9 @@
 1866858496,1866989567,TW
 1866989568,1867513855,CN
 1867513856,1867775999,TW
-1867776000,1867841535,TH
+1867776000,1867825151,TH
+1867825152,1867825663,MM
+1867825664,1867841535,TH
 1867841536,1867907071,CN
 1867907072,1868038143,JP
 1868038144,1868103679,PK
@@ -40238,7 +39843,6 @@
 1868341248,1868345343,ID
 1868345344,1868346367,GU
 1868346368,1868347391,TH
-1868347392,1868348415,AU
 1868348416,1868349439,KR
 1868349440,1868357631,SG
 1868357632,1868361727,HK
@@ -40327,8 +39931,7 @@
 1883770880,1883783167,KR
 1883783168,1883799551,VN
 1883799552,1883832319,KR
-1883832320,1883833855,HK
-1883833856,1884028927,CN
+1883832320,1884028927,CN
 1884028928,1884159999,KR
 1884160000,1884164095,VN
 1884164096,1884168191,TW
@@ -40442,7 +40045,6 @@
 1897170944,1897172991,ID
 1897172992,1897175039,PH
 1897175040,1897176063,JP
-1897176064,1897177087,SG
 1897177088,1897185279,PH
 1897185280,1897201663,JP
 1897201664,1897209855,KR
@@ -40450,8 +40052,7 @@
 1897213952,1897218047,JP
 1897218048,1897222143,IN
 1897222144,1897226239,TW
-1897226240,1897231103,NC
-1897231104,1897234431,VU
+1897226240,1897234431,NC
 1897234432,1897242623,AP
 1897242624,1897250815,TW
 1897250816,1897259007,HK
@@ -40902,7 +40503,11 @@
 1947205632,1948254207,CN
 1948254208,1949302783,KR
 1949302784,1949391103,HK
-1949391104,1949391359,CN
+1949391104,1949391116,CN
+1949391117,1949391117,HK
+1949391118,1949391218,CN
+1949391219,1949391219,HK
+1949391220,1949391359,CN
 1949391360,1949433855,HK
 1949433856,1949437951,CN
 1949437952,1949439999,AU
@@ -41017,8 +40622,8 @@
 1958830080,1958838271,JP
 1958838272,1958842367,IN
 1958842368,1958844415,NZ
-1958845440,1958845695,MY
-1958845696,1958846463,HK
+1958845440,1958845951,MY
+1958845952,1958846463,HK
 1958846464,1958847487,IN
 1958848512,1958850559,BD
 1958850560,1958852607,CN
@@ -41112,9 +40717,10 @@
 1964122112,1964122367,SG
 1964122368,1964122879,JP
 1964122880,1964123135,HK
-1964123136,1964123391,SG
+1964123136,1964123391,GB
 1964123392,1964123647,US
-1964123648,1964126207,SG
+1964123648,1964123903,CN
+1964123904,1964126207,SG
 1964126208,1964126463,HK
 1964126464,1964130303,SG
 1964130304,1964134399,HK
@@ -41385,7 +40991,8 @@
 1997176832,1997180927,AU
 1997180928,1997185023,HK
 1997185024,1997187071,JP
-1997187072,1997189119,HK
+1997187072,1997188095,HK
+1997188096,1997189119,BD
 1997189120,1997191167,ID
 1997191168,1997209599,JP
 1997209600,1997242367,AU
@@ -41530,11 +41137,7 @@
 2001798408,2001798415,US
 2001798416,2001799687,SG
 2001799688,2001799695,US
-2001799696,2001799711,SG
-2001799712,2001799743,US
-2001799744,2001799807,SG
-2001799808,2001799935,US
-2001799936,2001799967,SG
+2001799696,2001799967,SG
 2001799968,2001799971,US
 2001799972,2001800391,SG
 2001800392,2001800399,US
@@ -41548,25 +41151,19 @@
 2001801136,2001801151,US
 2001801152,2001801339,SG
 2001801340,2001801343,US
-2001801344,2001801663,SG
-2001801664,2001801695,US
-2001801696,2001801711,SG
+2001801344,2001801711,SG
 2001801712,2001801727,US
 2001801728,2001801775,SG
-2001801776,2001801807,US
-2001801808,2001801919,SG
+2001801776,2001801791,US
+2001801792,2001801919,SG
 2001801920,2001801935,US
 2001801936,2001801983,SG
 2001801984,2001801999,US
 2001802000,2001802191,SG
 2001802192,2001802199,US
-2001802200,2001802879,SG
-2001802880,2001803007,US
-2001803008,2001803215,SG
+2001802200,2001803215,SG
 2001803216,2001803223,US
-2001803224,2001803647,SG
-2001803648,2001803679,US
-2001803680,2001803735,SG
+2001803224,2001803735,SG
 2001803736,2001803743,US
 2001803744,2001803839,SG
 2001803840,2001803871,US
@@ -41576,23 +41173,21 @@
 2001803920,2001803935,US
 2001803936,2001804015,SG
 2001804016,2001804023,US
-2001804024,2001804295,SG
-2001804296,2001804303,US
-2001804304,2001805943,SG
+2001804024,2001805943,SG
 2001805944,2001805951,US
 2001805952,2001806527,SG
 2001806528,2001806559,SA
-2001806560,2001807959,SG
-2001807960,2001807967,US
-2001807968,2001809039,SG
-2001809040,2001809047,US
-2001809048,2001809127,SG
-2001809128,2001809135,US
-2001809136,2001809383,SG
+2001806560,2001806735,SG
+2001806736,2001806739,MY
+2001806740,2001807703,SG
+2001807704,2001807711,CA
+2001807712,2001809383,SG
 2001809384,2001809391,US
 2001809392,2001810111,SG
 2001810112,2001810143,US
-2001810144,2001810559,SG
+2001810144,2001810343,SG
+2001810344,2001810351,PH
+2001810352,2001810559,SG
 2001810560,2001810623,MY
 2001810624,2001812127,SG
 2001812128,2001812159,SA
@@ -41608,17 +41203,19 @@
 2001814576,2001814583,US
 2001814584,2001815191,SG
 2001815192,2001815199,US
-2001815200,2001816071,SG
-2001816072,2001816079,US
-2001816080,2001816407,SG
-2001816408,2001816415,US
-2001816416,2001818063,SG
+2001815200,2001818063,SG
 2001818064,2001818071,US
-2001818072,2001818615,SG
+2001818072,2001818215,SG
+2001818216,2001818223,US
+2001818224,2001818471,SG
+2001818472,2001818479,CA
+2001818480,2001818615,SG
 2001818616,2001818623,IN
 2001818624,2001818639,SG
 2001818640,2001818647,US
-2001818648,2001819703,SG
+2001818648,2001819335,SG
+2001819336,2001819343,TH
+2001819344,2001819703,SG
 2001819704,2001819711,US
 2001819712,2001819887,SG
 2001819888,2001819895,IE
@@ -41626,195 +41223,72 @@
 2001820000,2001820031,IE
 2001820032,2001820719,SG
 2001820720,2001820727,CA
-2001820728,2001820871,SG
-2001820872,2001820879,US
-2001820880,2001821335,SG
+2001820728,2001821335,SG
 2001821336,2001821343,US
 2001821344,2001821367,SG
 2001821368,2001821375,US
-2001821376,2001821423,SG
-2001821424,2001821431,US
-2001821432,2001821439,SG
-2001821440,2001821447,US
-2001821448,2001822263,SG
-2001822264,2001822271,US
-2001822272,2001823007,SG
+2001821376,2001823007,SG
 2001823008,2001823015,US
-2001823016,2001823215,SG
-2001823216,2001823223,US
-2001823224,2001823303,SG
+2001823016,2001823303,SG
 2001823304,2001823311,US
 2001823312,2001823447,SG
 2001823448,2001823455,US
-2001823456,2001824175,SG
+2001823456,2001823903,SG
+2001823904,2001823911,US
+2001823912,2001824175,SG
 2001824176,2001824183,US
-2001824184,2001824335,SG
-2001824336,2001824343,US
-2001824344,2001824543,SG
+2001824184,2001824543,SG
 2001824544,2001824551,PH
-2001824552,2001825247,SG
-2001825248,2001825255,US
-2001825256,2001825511,SG
-2001825512,2001825519,US
-2001825520,2001825623,SG
-2001825624,2001825631,US
-2001825632,2001826199,SG
-2001826200,2001826207,US
-2001826208,2001826639,SG
-2001826640,2001826671,US
-2001826672,2001826847,SG
-2001826848,2001826863,US
+2001824552,2001826607,SG
+2001826608,2001826623,CA
+2001826624,2001826655,SG
+2001826656,2001826671,US
+2001826672,2001826831,SG
+2001826832,2001826863,US
 2001826864,2001826911,SG
-2001826912,2001826943,US
-2001826944,2001827103,SG
+2001826912,2001826927,US
+2001826928,2001827103,SG
 2001827104,2001827111,CA
-2001827112,2001827199,SG
-2001827200,2001827215,US
-2001827216,2001827551,SG
+2001827112,2001827407,SG
+2001827408,2001827415,US
+2001827416,2001827551,SG
 2001827552,2001827567,PH
 2001827568,2001828351,SG
 2001828352,2001828367,US
 2001828368,2001828383,SG
 2001828384,2001828399,AU
-2001828400,2001828799,SG
-2001828800,2001828863,US
+2001828400,2001828831,SG
+2001828832,2001828863,US
 2001828864,2001828927,SG
 2001828928,2001828991,US
-2001828992,2001829087,SG
-2001829088,2001829439,US
-2001829440,2001829887,SG
+2001828992,2001829375,SG
+2001829376,2001829439,US
+2001829440,2001829535,SG
+2001829536,2001829567,US
+2001829568,2001829887,SG
 2001829888,2001846271,HK
-2001846272,2001846311,US
-2001846312,2001846335,SG
-2001846336,2001846359,US
-2001846360,2001846479,SG
-2001846480,2001846495,US
-2001846496,2001846503,SG
-2001846504,2001846511,US
-2001846512,2001846519,SG
-2001846520,2001846523,US
-2001846524,2001846531,SG
-2001846532,2001846543,US
-2001846544,2001846559,SG
-2001846560,2001846567,US
-2001846568,2001846571,SG
-2001846572,2001846607,US
-2001846608,2001846615,SG
-2001846616,2001846727,US
+2001846272,2001846719,SG
+2001846720,2001846727,US
 2001846728,2001846735,SG
 2001846736,2001846755,US
-2001846756,2001846847,SG
-2001846848,2001846911,US
-2001846912,2001846927,SG
-2001846928,2001846943,US
-2001846944,2001846959,SG
+2001846756,2001846959,SG
 2001846960,2001846975,IN
-2001846976,2001847071,SG
-2001847072,2001847103,US
-2001847104,2001847167,SG
-2001847168,2001847416,US
-2001847417,2001847417,SG
-2001847418,2001847429,US
-2001847430,2001847439,SG
-2001847440,2001847455,US
-2001847456,2001847463,SG
-2001847464,2001847479,US
-2001847480,2001847487,SG
-2001847488,2001847491,US
-2001847492,2001847493,SG
-2001847494,2001847495,US
-2001847496,2001847519,SG
-2001847520,2001847535,US
-2001847536,2001847537,SG
-2001847538,2001847559,US
-2001847560,2001847567,SG
-2001847568,2001847575,US
-2001847576,2001847591,SG
-2001847592,2001847599,US
-2001847600,2001847623,SG
-2001847624,2001847647,US
-2001847648,2001847663,SG
-2001847664,2001847671,US
-2001847672,2001847679,SG
-2001847680,2001847703,US
-2001847704,2001847711,SG
-2001847712,2001847727,US
-2001847728,2001847743,SG
-2001847744,2001847747,US
-2001847748,2001847755,SG
-2001847756,2001847771,US
-2001847772,2001847783,SG
-2001847784,2001847791,US
-2001847792,2001847799,SG
-2001847800,2001847839,US
-2001847840,2001847855,SG
-2001847856,2001847871,US
-2001847872,2001847875,SG
-2001847876,2001847879,US
-2001847880,2001847895,SG
-2001847896,2001847903,US
-2001847904,2001847935,SG
-2001847936,2001847951,US
-2001847952,2001847955,SG
-2001847956,2001847959,US
-2001847960,2001847963,SG
-2001847964,2001847967,US
-2001847968,2001847975,SG
-2001847976,2001847979,US
-2001847980,2001847981,SG
-2001847982,2001847991,US
-2001847992,2001848007,SG
-2001848008,2001848015,US
-2001848016,2001848047,SG
-2001848048,2001848055,US
-2001848056,2001848071,SG
-2001848072,2001848079,IN
-2001848080,2001848103,SG
-2001848104,2001848111,US
-2001848112,2001848135,SG
-2001848136,2001848143,US
-2001848144,2001848151,SG
-2001848152,2001848167,US
-2001848168,2001848189,SG
-2001848190,2001848199,US
-2001848200,2001848207,SG
-2001848208,2001848231,US
-2001848232,2001848247,SG
-2001848248,2001848253,US
-2001848254,2001848254,SG
-2001848255,2001848255,MY
-2001848256,2001848279,SG
-2001848280,2001848287,US
-2001848288,2001848303,SG
-2001848304,2001848327,US
-2001848328,2001848335,SG
-2001848336,2001848367,US
-2001848368,2001848383,SG
-2001848384,2001848407,US
-2001848408,2001848415,SG
-2001848416,2001848447,US
-2001848448,2001848479,SG
-2001848480,2001848575,US
-2001848576,2001848623,SG
-2001848624,2001848679,US
-2001848680,2001848687,SG
-2001848688,2001848767,US
-2001848768,2001848863,SG
-2001848864,2001848879,US
-2001848880,2001848895,SG
-2001848896,2001848943,US
-2001848944,2001848951,SG
-2001848952,2001848975,US
-2001848976,2001848991,SG
-2001848992,2001849015,US
-2001849016,2001849023,SG
-2001849024,2001849167,US
-2001849168,2001849183,SG
-2001849184,2001849247,US
-2001849248,2001849255,SG
-2001849256,2001849271,US
-2001849272,2001849279,SG
-2001849280,2001850391,US
+2001846976,2001847199,SG
+2001847200,2001847231,US
+2001847232,2001847455,SG
+2001847456,2001847487,US
+2001847488,2001847703,SG
+2001847704,2001847711,US
+2001847712,2001848767,SG
+2001848768,2001848783,US
+2001848784,2001849471,SG
+2001849472,2001849503,US
+2001849504,2001849631,SG
+2001849632,2001849663,US
+2001849664,2001849951,SG
+2001849952,2001849983,US
+2001849984,2001850367,SG
+2001850368,2001850391,US
 2001850392,2001850399,SG
 2001850400,2001850415,US
 2001850416,2001850423,SG
@@ -42418,13 +41892,16 @@
 2047082496,2047410175,CN
 2047410176,2047492095,HK
 2047492096,2047496191,KR
-2047496192,2047506431,HK
+2047496192,2047504383,HK
+2047504384,2047506431,CN
 2047506432,2047508479,US
 2047508480,2047517695,CN
 2047517696,2047518719,HK
 2047518720,2047574015,CN
 2047574016,2047606783,SG
-2047606784,2047803391,CN
+2047606784,2047770879,CN
+2047770880,2047773184,HK
+2047773185,2047803391,CN
 2047803392,2047868927,IN
 2047868928,2048917503,JP
 2048917504,2049966079,KR
@@ -42472,9 +41949,7 @@
 2053534720,2053537791,IN
 2053537792,2053636095,JP
 2053636096,2054160383,AU
-2054160384,2054189567,CN
-2054189568,2054190591,HK
-2054190592,2054376447,CN
+2054160384,2054376447,CN
 2054376448,2054377471,HK
 2054377472,2054422527,CN
 2054422528,2054619135,TW
@@ -43057,7 +42532,9 @@
 2111832064,2112487423,TW
 2112487424,2112618495,VN
 2112618496,2112880639,NZ
-2112880640,2113683455,KR
+2112880640,2113560063,KR
+2113560064,2113560319,SG
+2113560320,2113683455,KR
 2113683456,2113687999,JP
 2113688000,2113688031,AU
 2113688032,2113693599,JP
@@ -43198,9 +42675,7 @@
 2155827200,2155831295,PL
 2155831296,2155833343,RU
 2155833344,2155833855,SE
-2155833856,2155834084,NL
-2155834085,2155834111,SE
-2155834112,2155834367,NL
+2155833856,2155834367,NL
 2155834368,2155834464,SE
 2155834465,2155834512,NL
 2155834513,2155834532,SE
@@ -43256,7 +42731,9 @@
 2159673344,2159869951,US
 2159869952,2159935487,CA
 2159935488,2160525311,US
-2160525312,2160590847,SG
+2160525312,2160533503,SG
+2160533504,2160541695,NL
+2160541696,2160590847,SG
 2160590848,2160852991,US
 2160852992,2160885759,RU
 2160885760,2160893951,AT
@@ -43271,7 +42748,7 @@
 2161573888,2162687999,US
 2162688000,2162753535,GB
 2162753536,2162819071,CA
-2162819072,2162884607,RO
+2162819072,2162884607,SA
 2162884608,2163212287,US
 2163212288,2163277823,GB
 2163277824,2163408895,US
@@ -43303,7 +42780,9 @@
 2166571008,2166575103,GB
 2166575104,2166575359,US
 2166575360,2166575615,GB
-2166575616,2166606847,US
+2166575616,2166594563,US
+2166594564,2166594564,DE
+2166594565,2166606847,US
 2166606848,2166607009,GB
 2166607010,2166607010,DE
 2166607011,2166607103,GB
@@ -43385,6 +42864,7 @@
 2179392000,2179397632,US
 2179397633,2179397633,GB
 2179397634,2179465215,US
+2179465216,2179497983,LS
 2179530752,2179596287,DE
 2179596288,2179661823,GB
 2179661824,2179989503,US
@@ -43623,15 +43103,17 @@
 2193707656,2193707663,IT
 2193707664,2193707751,GB
 2193707752,2193707759,IT
-2193707760,2193708423,GB
-2193708424,2193708431,IT
-2193708432,2193708647,GB
+2193707760,2193708303,GB
+2193708304,2193708311,IT
+2193708312,2193708647,GB
 2193708648,2193708655,IT
 2193708656,2193708735,GB
 2193708736,2193708743,IT
 2193708744,2193709087,GB
 2193709088,2193709095,IT
-2193709096,2193711103,GB
+2193709096,2193709631,GB
+2193709632,2193709639,IT
+2193709640,2193711103,GB
 2193711104,2193713151,DE
 2193713152,2193715199,ES
 2193715200,2193717247,DE
@@ -43687,9 +43169,7 @@
 2197776384,2197778431,DE
 2197778432,2197780479,IT
 2197780480,2197782527,DE
-2197782528,2197782685,RU
-2197782686,2197782686,UA
-2197782687,2197786623,RU
+2197782528,2197786623,UA
 2197786624,2197788671,IT
 2197788672,2197790719,PL
 2197790720,2197792767,SE
@@ -43763,6 +43243,7 @@
 2204386304,2204391423,BR
 2204391424,2204392447,AR
 2204392448,2204394495,BR
+2204394496,2204395519,AR
 2204395520,2204396543,BR
 2204396544,2204397567,AR
 2204397568,2204404735,BR
@@ -43863,16 +43344,19 @@
 2208389120,2208390143,AR
 2208390144,2208392191,BR
 2208392192,2208393215,PE
-2208394240,2208404479,BR
+2208393216,2208404479,BR
 2208404480,2208405503,BZ
 2208405504,2208406527,AR
 2208406528,2208413695,BR
 2208413696,2208414719,AR
-2208414720,2208416767,BR
+2208414720,2208417791,BR
 2208417792,2208418815,CL
-2208418816,2208424959,BR
+2208418816,2208425983,BR
 2208425984,2208428031,AR
 2208428032,2208429055,BR
+2208429056,2208430079,MX
+2208430080,2208431103,BR
+2208431104,2208432127,PY
 2208432128,2208563199,CA
 2208563200,2208759807,DK
 2208759808,2208890879,US
@@ -43897,7 +43381,54 @@
 2210594816,2210660351,CA
 2210660352,2211053567,US
 2211053568,2211119103,CA
-2211119104,2211184639,NZ
+2211119104,2211120127,AU
+2211120128,2211120383,NZ
+2211120384,2211121151,AU
+2211121152,2211121407,NZ
+2211121408,2211122431,AU
+2211122432,2211122687,NZ
+2211122688,2211135231,AU
+2211135232,2211135999,NZ
+2211136000,2211137791,AU
+2211137792,2211138047,NZ
+2211138048,2211138559,AU
+2211138560,2211138815,NZ
+2211138816,2211140351,AU
+2211140352,2211140607,NZ
+2211140608,2211140863,AU
+2211140864,2211141119,NZ
+2211141120,2211142399,AU
+2211142400,2211142911,NZ
+2211142912,2211144703,AU
+2211144704,2211144959,NZ
+2211144960,2211147007,AU
+2211147008,2211147263,NZ
+2211147264,2211148031,AU
+2211148032,2211148543,NZ
+2211148544,2211148671,AU
+2211148672,2211149567,NZ
+2211149568,2211149823,AU
+2211149824,2211150079,NZ
+2211150080,2211150847,AU
+2211150848,2211151359,NZ
+2211151360,2211151615,AU
+2211151616,2211151871,NZ
+2211151872,2211152639,AU
+2211152640,2211153151,NZ
+2211153152,2211153407,AU
+2211153408,2211153663,NZ
+2211153664,2211154175,AU
+2211154176,2211154431,NZ
+2211154432,2211179519,AU
+2211179520,2211179775,NZ
+2211179776,2211180287,AU
+2211180288,2211181823,NZ
+2211181824,2211182079,AU
+2211182080,2211182591,NZ
+2211182592,2211183103,AU
+2211183104,2211184127,NZ
+2211184128,2211184383,AU
+2211184384,2211184639,NZ
 2211184640,2211250175,US
 2211250176,2211315711,SE
 2211315712,2211381247,JP
@@ -43910,9 +43441,28 @@
 2212036608,2212102143,AU
 2212102144,2212233215,US
 2212233216,2212298751,DE
+2212298752,2212299775,AR
+2212299776,2212300799,DO
 2212300800,2212301823,HN
 2212301824,2212302847,BR
+2212302848,2212303871,AR
+2212303872,2212304895,BR
 2212304896,2212305919,PA
+2212305920,2212306943,TT
+2212306944,2212307967,CL
+2212307968,2212308991,BR
+2212308992,2212310015,CO
+2212310016,2212315135,BR
+2212315136,2212316159,AR
+2212316160,2212327423,BR
+2212327424,2212328447,VE
+2212328448,2212335615,BR
+2212335616,2212336639,CW
+2212336640,2212337663,BR
+2212337664,2212338687,PE
+2212338688,2212340735,BR
+2212340736,2212341759,CL
+2212341760,2212364287,BR
 2212364288,2212495359,US
 2212495360,2212560895,NL
 2212560896,2212691967,US
@@ -43949,6 +43499,25 @@
 2214264832,2214330367,GB
 2214330368,2214461439,US
 2214461440,2214526975,FR
+2214526976,2214527999,BR
+2214528000,2214529023,AR
+2214529024,2214530047,BR
+2214530048,2214531071,AR
+2214531072,2214537215,BR
+2214537216,2214538239,BZ
+2214538240,2214542335,BR
+2214542336,2214543359,AR
+2214543360,2214553599,BR
+2214553600,2214554623,VE
+2214554624,2214561791,BR
+2214561792,2214562815,PE
+2214562816,2214573055,BR
+2214573056,2214574079,AR
+2214574080,2214576127,BR
+2214576128,2214577151,PE
+2214577152,2214590463,BR
+2214590464,2214591487,AR
+2214591488,2214592511,BR
 2214592512,2218786815,US
 2218786816,2219769855,IL
 2219769856,2224160767,US
@@ -44023,6 +43592,29 @@
 2231107584,2231173119,DE
 2231173120,2231238655,US
 2231238656,2231304191,MX
+2231304192,2231305215,PE
+2231305216,2231307263,AR
+2231307264,2231309311,BR
+2231309312,2231310335,CO
+2231310336,2231321599,BR
+2231321600,2231322623,CL
+2231322624,2231332863,BR
+2231332864,2231333887,AR
+2231333888,2231335935,BR
+2231335936,2231336959,MX
+2231336960,2231337983,BR
+2231337984,2231339007,HN
+2231339008,2231346175,BR
+2231346176,2231347199,PY
+2231347200,2231355391,BR
+2231355392,2231356415,AR
+2231356416,2231357439,BR
+2231357440,2231358463,SV
+2231358464,2231361535,BR
+2231361536,2231362559,AR
+2231362560,2231364607,BR
+2231364608,2231365631,CL
+2231365632,2231369727,BR
 2231369728,2248146943,JP
 2248146944,2248148991,IT
 2248148992,2248151039,ES
@@ -44172,22 +43764,11 @@
 2258580032,2258582783,TW
 2258582784,2258582791,GB
 2258582792,2258583551,TW
-2258583552,2258583935,GB
-2258583936,2258583967,TW
-2258583968,2258584007,GB
-2258584008,2258584351,TW
-2258584352,2258584383,GB
-2258584384,2258584574,TW
-2258584575,2258584575,GB
-2258584576,2258584831,TW
-2258584832,2258585087,GB
-2258585088,2258591575,TW
-2258591576,2258591579,GB
-2258591580,2258591631,TW
-2258591632,2258591639,GB
-2258591640,2258591935,TW
+2258583552,2258591743,GB
+2258591744,2258591935,TW
 2258591936,2258591967,HK
-2258591968,2258592271,TW
+2258591968,2258591999,AU
+2258592000,2258592271,TW
 2258592272,2258592279,JP
 2258592280,2258592287,TW
 2258592288,2258592291,JP
@@ -44197,16 +43778,15 @@
 2258592480,2258592495,AU
 2258592496,2258592511,TW
 2258592512,2258592767,AU
-2258592768,2258592791,TW
-2258592792,2258592803,HK
-2258592804,2258593279,TW
+2258592768,2258593023,HK
+2258593024,2258593279,TW
 2258593280,2258593535,HK
 2258593536,2258594047,TW
 2258594048,2258594111,HK
-2258594112,2258594303,TW
-2258594304,2258594319,HK
-2258594320,2258594559,TW
-2258594560,2258594607,HK
+2258594112,2258594143,TW
+2258594144,2258594175,HK
+2258594176,2258594303,TW
+2258594304,2258594607,HK
 2258594608,2258594613,AP
 2258594614,2258594614,HK
 2258594615,2258594623,AP
@@ -44229,18 +43809,9 @@
 2258596104,2258596159,TW
 2258596160,2258596255,HK
 2258596256,2258596351,TW
-2258596352,2258596383,AP
-2258596384,2258596415,HK
-2258596416,2258596447,AP
-2258596448,2258596511,HK
-2258596512,2258596703,AP
-2258596704,2258596863,HK
-2258596864,2258596887,TW
-2258596888,2258596903,HK
-2258596904,2258596991,TW
-2258596992,2258597023,HK
-2258597024,2258597115,TW
-2258597116,2258597215,HK
+2258596352,2258597071,HK
+2258597072,2258597079,TW
+2258597080,2258597215,HK
 2258597216,2258597263,TW
 2258597264,2258597293,HK
 2258597294,2258597294,PG
@@ -44253,9 +43824,7 @@
 2258597568,2258597583,HK
 2258597584,2258597599,TW
 2258597600,2258597631,HK
-2258597632,2258597759,AU
-2258597760,2258597887,HK
-2258597888,2258597895,AU
+2258597632,2258597895,AU
 2258597896,2258597903,TW
 2258597904,2258597919,JP
 2258597920,2258597927,AU
@@ -44295,9 +43864,11 @@
 2258599676,2258599679,JP
 2258599680,2258599743,TW
 2258599744,2258599747,AU
-2258599748,2258600263,TW
-2258600264,2258600267,HK
-2258600268,2258600515,TW
+2258599748,2258599935,TW
+2258599936,2258599971,HK
+2258599972,2258599975,AU
+2258599976,2258600447,HK
+2258600448,2258600515,TW
 2258600516,2258600519,IN
 2258600520,2258600523,TW
 2258600524,2258600527,IN
@@ -44322,18 +43893,10 @@
 2258601408,2258601423,AU
 2258601424,2258601471,TW
 2258601472,2258601983,JP
-2258601984,2258602303,TW
-2258602304,2258602327,HK
-2258602328,2258602335,TW
-2258602336,2258602367,HK
-2258602368,2258602399,TW
-2258602400,2258602447,HK
-2258602448,2258602479,TW
-2258602480,2258602495,HK
-2258602496,2258602815,TW
-2258602816,2258602879,HK
-2258602880,2258603007,TW
-2258603008,2258603071,HK
+2258601984,2258602239,TW
+2258602240,2258602495,HK
+2258602496,2258602751,TW
+2258602752,2258603071,HK
 2258603072,2258603087,TW
 2258603088,2258603089,HK
 2258603090,2258603090,PG
@@ -44353,15 +43916,13 @@
 2258603944,2258603951,TW
 2258603952,2258603967,HK
 2258603968,2258604031,TW
-2258604032,2258604287,HK
-2258604288,2258604671,TW
+2258604032,2258604543,HK
+2258604544,2258604671,TW
 2258604672,2258604735,SG
-2258604736,2258604799,AU
-2258604800,2258604831,AP
+2258604736,2258604831,AU
 2258604832,2258605039,HK
-2258605040,2258605047,AP
-2258605048,2258605055,HK
-2258605056,2258605311,TW
+2258605040,2258605047,AU
+2258605048,2258605311,HK
 2258605312,2258605439,SG
 2258605440,2258605823,TW
 2258605824,2258605951,AU
@@ -44369,12 +43930,7 @@
 2258606000,2258606015,AU
 2258606016,2258606047,TW
 2258606048,2258606079,AU
-2258606080,2258606143,TW
-2258606144,2258606147,HK
-2258606148,2258606151,TW
-2258606152,2258606191,HK
-2258606192,2258606199,TW
-2258606200,2258606367,HK
+2258606080,2258606367,HK
 2258606368,2258606415,TW
 2258606416,2258606423,HK
 2258606424,2258606463,TW
@@ -44394,17 +43950,17 @@
 2258607088,2258607091,AU
 2258607092,2258607095,NZ
 2258607096,2258607103,AU
-2258607104,2258607263,TW
+2258607104,2258607171,TW
+2258607172,2258607172,AU
+2258607173,2258607263,TW
 2258607264,2258607279,AU
 2258607280,2258607351,TW
 2258607352,2258607359,NZ
 2258607360,2258607519,AU
 2258607520,2258607543,TW
 2258607544,2258607551,AU
-2258607552,2258607819,TW
-2258607820,2258607823,HK
-2258607824,2258607871,TW
-2258607872,2258607879,HK
+2258607552,2258607615,TW
+2258607616,2258607879,HK
 2258607880,2258607903,TW
 2258607904,2258607999,HK
 2258608000,2258608063,TW
@@ -44413,7 +43969,8 @@
 2258608256,2258608259,JP
 2258608260,2258608279,TW
 2258608280,2258608283,JP
-2258608284,2258608639,TW
+2258608284,2258608383,TW
+2258608384,2258608639,HK
 2258608640,2258608647,AU
 2258608648,2258608655,TW
 2258608656,2258608663,JP
@@ -44442,13 +43999,14 @@
 2258611216,2258611223,NZ
 2258611224,2258611567,TW
 2258611568,2258611583,AU
-2258611584,2258612223,TW
+2258611584,2258611967,TW
+2258611968,2258612223,HK
 2258612224,2258612303,AU
 2258612304,2258612351,TW
 2258612352,2258612367,AU
 2258612368,2258612383,TW
-2258612384,2258612743,AU
-2258612744,2258612767,TW
+2258612384,2258612751,AU
+2258612752,2258612767,TW
 2258612768,2258612799,AU
 2258612800,2258613503,TW
 2258613504,2258613567,AU
@@ -44464,13 +44022,9 @@
 2258616208,2258616303,AU
 2258616304,2258616311,TW
 2258616312,2258616319,AU
-2258616320,2258620447,TW
-2258620448,2258620455,HK
-2258620456,2258620463,TW
-2258620464,2258620467,HK
-2258620468,2258620471,TW
-2258620472,2258620475,HK
-2258620476,2258632703,TW
+2258616320,2258620415,TW
+2258620416,2258621951,HK
+2258621952,2258632703,TW
 2258632704,2258698239,JP
 2258698240,2259222527,US
 2259222528,2259288063,DE
@@ -44514,7 +44068,9 @@
 2262171648,2262237183,FR
 2262237184,2262499327,US
 2262499328,2262630399,GB
-2262630400,2262724071,NL
+2262630400,2262722809,NL
+2262722810,2262722810,EU
+2262722811,2262724071,NL
 2262724072,2262724073,IE
 2262724074,2262761471,NL
 2262761472,2262892543,US
@@ -44548,7 +44104,9 @@
 2266431488,2266497023,CA
 2266497024,2266694655,US
 2266694656,2266694911,SG
-2266694912,2276786175,US
+2266694912,2270490623,US
+2270490624,2270494719,IN
+2270494720,2276786175,US
 2276786176,2276851711,CA
 2276851712,2277769215,US
 2277769216,2277834751,GB
@@ -44671,8 +44229,10 @@
 2304638976,2304704511,CA
 2304704512,2304770047,US
 2304770048,2304835583,FI
-2304835584,2305097727,US
-2305097728,2305163263,PK
+2304835584,2304901119,US
+2304901120,2304966655,CZ
+2304966656,2305097727,US
+2305097728,2305163263,ES
 2305163264,2305359871,US
 2305359872,2305425407,GB
 2305425408,2305556479,US
@@ -44680,7 +44240,10 @@
 2305622016,2305687551,AU
 2305687552,2305753087,US
 2305753088,2305818623,AU
-2305818624,2306342911,US
+2305818624,2306129919,US
+2306129920,2306138111,NL
+2306138112,2306146303,IE
+2306146304,2306342911,US
 2306342912,2306408447,NL
 2306408448,2306473983,FR
 2306473984,2306539519,CA
@@ -44751,6 +44314,29 @@
 2314993664,2315059199,US
 2315059200,2315124735,GB
 2315124736,2315190271,US
+2315255808,2315257855,BR
+2315257856,2315258879,AR
+2315258880,2315259903,CL
+2315259904,2315266047,BR
+2315266048,2315267071,VE
+2315267072,2315270143,BR
+2315270144,2315271167,AR
+2315271168,2315278335,BR
+2315278336,2315279359,CO
+2315279360,2315282431,BR
+2315282432,2315283455,AR
+2315283456,2315285503,BR
+2315285504,2315286527,PA
+2315286528,2315287551,CL
+2315287552,2315293695,BR
+2315294720,2315296767,AR
+2315296768,2315302911,BR
+2315302912,2315303935,AR
+2315303936,2315314175,BR
+2315314176,2315315199,HN
+2315315200,2315317247,BR
+2315317248,2315318271,HN
+2315318272,2315321343,BR
 2315321344,2315452415,US
 2315452416,2315517951,GB
 2315517952,2315583487,ES
@@ -44786,6 +44372,26 @@
 2317487360,2317487615,US
 2317487616,2317549567,CA
 2317549568,2317615103,US
+2317615104,2317619199,BR
+2317619200,2317620223,AR
+2317620224,2317621247,BR
+2317621248,2317622271,DO
+2317622272,2317628415,BR
+2317628416,2317629439,AR
+2317629440,2317631487,BR
+2317631488,2317632511,CO
+2317632512,2317634559,BR
+2317634560,2317635583,BO
+2317635584,2317638655,BR
+2317638656,2317639679,HN
+2317639680,2317640703,AR
+2317641728,2317649919,BR
+2317649920,2317650943,HN
+2317650944,2317651967,BR
+2317651968,2317652991,PE
+2317655040,2317668351,BR
+2317674496,2317675519,BR
+2317675520,2317676543,AR
 2317680640,2317811711,GB
 2317811712,2317877247,US
 2317877248,2317942783,GB
@@ -44821,11 +44427,15 @@
 2321874944,2321940479,JP
 2321940480,2322006015,FR
 2322006016,2322071551,US
-2322071552,2322137087,GB
+2322071552,2322130431,GB
+2322130432,2322130687,SG
+2322130688,2322137087,GB
 2322137088,2322202623,US
 2322202624,2322268159,SE
 2322268160,2322333695,JP
-2322333696,2322923519,US
+2322333696,2322368511,US
+2322368512,2322368767,MY
+2322368768,2322923519,US
 2323054592,2323120127,CA
 2323316736,2323382271,US
 2323382272,2323447807,NO
@@ -44879,7 +44489,9 @@
 2330656768,2330722303,NZ
 2330722304,2330956287,US
 2330956288,2330956543,GB
-2330956544,2330968063,US
+2330956544,2330956799,US
+2330956800,2330957311,NZ
+2330957312,2330968063,US
 2330968064,2330968319,IN
 2330968320,2331181055,US
 2331181056,2331246591,JP
@@ -44995,8 +44607,7 @@
 2342387712,2342453247,FR
 2342453248,2342518783,CN
 2342518784,2342584319,FR
-2342584320,2342649855,US
-2342649856,2342715391,NL
+2342584320,2342715391,US
 2342715392,2342780927,AU
 2342780928,2342846463,NO
 2342846464,2342911999,BE
@@ -45172,7 +44783,9 @@
 2366149536,2366149543,UA
 2366149544,2366149551,BY
 2366149552,2366149559,KZ
-2366149560,2366162943,RU
+2366149560,2366160223,RU
+2366160224,2366160255,DE
+2366160256,2366162943,RU
 2366162944,2366164991,AL
 2366164992,2366167039,GE
 2366167040,2366169087,GB
@@ -45197,7 +44810,8 @@
 2372075520,2372206591,DE
 2372206592,2372214783,UA
 2372214784,2372218879,DE
-2372218880,2372222975,FR
+2372218880,2372222463,FR
+2372222464,2372222975,CH
 2372222976,2372224511,EU
 2372224512,2372224767,GB
 2372224768,2372227071,EU
@@ -45220,12 +44834,12 @@
 2372238730,2372238730,US
 2372238731,2372239359,EU
 2372239360,2372240383,SK
-2372240384,2372240895,NL
-2372240896,2372241151,AE
+2372240384,2372240511,NL
+2372240512,2372240639,LU
+2372240640,2372240895,NL
+2372240896,2372241151,CH
 2372241152,2372241407,NL
-2372241408,2372264447,RU
-2372264448,2372266495,UA
-2372266496,2372272127,RU
+2372241408,2372272127,RU
 2372272128,2372337663,US
 2372337664,2372403199,ID
 2372403200,2372468735,US
@@ -45248,7 +44862,7 @@
 2372510336,2372510336,ES
 2372510337,2372510463,AO
 2372510464,2372511743,A2
-2372511744,2372513791,SI
+2372511744,2372513791,BA
 2372513792,2372534271,GB
 2372534272,2372665343,US
 2372665344,2372730879,IT
@@ -45339,7 +44953,9 @@
 2377449472,2377515007,FR
 2377515008,2377842687,US
 2377842688,2377908223,GB
-2377908224,2378025983,US
+2377908224,2378022911,US
+2378022912,2378023423,HK
+2378023424,2378025983,US
 2378025984,2378026239,NL
 2378026240,2378026495,EU
 2378026496,2378027007,FR
@@ -45616,13 +45232,13 @@
 2418312960,2418313215,IN
 2418313216,2418323007,US
 2418323008,2418323008,PH
-2418323009,2418337023,US
-2418337024,2418337279,IN
-2418337280,2418338303,US
-2418338304,2418338815,IN
+2418323009,2418334719,US
+2418334720,2418338815,IN
 2418338816,2418341887,US
 2418341888,2418342143,IN
-2418342144,2418606079,US
+2418342144,2418342399,US
+2418342400,2418342911,IN
+2418342912,2418606079,US
 2418606080,2418671615,DE
 2418671616,2418737151,US
 2418737152,2418802687,NL
@@ -45679,7 +45295,9 @@
 2424111104,2424242175,US
 2424242176,2424307711,NO
 2424307712,2424438783,US
-2424438784,2425159679,AU
+2424438784,2424471551,AU
+2424471552,2424475647,US
+2424475648,2425159679,AU
 2425159680,2425421823,US
 2425421824,2425487359,DE
 2425487360,2426667007,US
@@ -45743,7 +45361,9 @@
 2436767744,2436767874,EU
 2436767875,2436767875,DE
 2436767876,2436767999,EU
-2436768000,2436825087,GB
+2436768000,2436775935,GB
+2436775936,2436784127,DE
+2436784128,2436825087,GB
 2436825088,2436955647,NL
 2436955648,2436955903,DE
 2436955904,2441150463,NL
@@ -45808,7 +45428,8 @@
 2449479680,2449481727,FR
 2449481728,2449485823,DE
 2449485824,2449487871,IE
-2449487872,2449489919,RO
+2449487872,2449488127,GB
+2449488128,2449489919,RO
 2449489920,2449490943,FR
 2449490944,2449491199,DE
 2449491200,2449491967,FR
@@ -45816,7 +45437,8 @@
 2449494016,2449496063,UA
 2449496064,2449498111,FR
 2449498112,2449506303,DE
-2449506304,2449539071,RO
+2449506304,2449534975,RO
+2449534976,2449539071,DE
 2449539072,2449604607,US
 2449604608,2449670143,NO
 2449670144,2449735679,LU
@@ -45863,7 +45485,12 @@
 2453831680,2453833727,IQ
 2453833728,2453835775,ES
 2453835776,2453837823,FR
-2453837824,2453839871,EU
+2453837824,2453838079,LU
+2453838080,2453838335,EU
+2453838336,2453838591,LU
+2453838592,2453838847,AT
+2453838848,2453839359,SE
+2453839360,2453839871,LU
 2453839872,2453852159,RU
 2453852160,2453856255,RO
 2453856256,2453858303,DE
@@ -45908,7 +45535,7 @@
 2455175168,2455240703,GB
 2455240704,2455244799,US
 2455244800,2455245567,AU
-2455245568,2455245823,US
+2455245568,2455245823,SG
 2455245824,2455246847,AU
 2455246848,2455247871,IN
 2455247872,2455248895,US
@@ -45919,7 +45546,9 @@
 2455263232,2455265279,PH
 2455265280,2455273471,US
 2455273472,2455275519,AU
-2455275520,2455371775,US
+2455275520,2455281663,US
+2455281664,2455285759,IN
+2455285760,2455371775,US
 2455371776,2455437311,GB
 2455437312,2455830527,US
 2455830528,2455896063,GB
@@ -45958,7 +45587,8 @@
 2457367552,2457372671,CZ
 2457372672,2457376767,RU
 2457376768,2457378815,DE
-2457378816,2457393151,RU
+2457378816,2457379839,NL
+2457379840,2457393151,RU
 2457393152,2457397247,CZ
 2457397248,2457403391,RU
 2457403392,2457599999,US
@@ -46149,8 +45779,8 @@
 2471165952,2471198719,CH
 2471198720,2471202815,US
 2471202816,2471206911,CH
-2471206912,2471211007,US
-2471211008,2471231487,CH
+2471206912,2471215103,US
+2471215104,2471231487,CH
 2471231488,2471297023,AU
 2471297024,2471362559,GB
 2471428096,2471690239,US
@@ -46187,7 +45817,9 @@
 2473721856,2473730559,GB
 2473730560,2473731071,HK
 2473731072,2473785599,GB
-2473785600,2473785855,AP
+2473785600,2473785708,AP
+2473785709,2473785709,HK
+2473785710,2473785855,AP
 2473785856,2473787391,GB
 2473787392,2474049535,US
 2474049536,2474115071,GB
@@ -46271,21 +45903,17 @@
 2483027968,2483093503,DO
 2483093504,2483159039,US
 2483159040,2483224575,SE
-2483224576,2483290111,GB
+2483224576,2483290111,ES
 2483290112,2483421183,US
 2483421184,2483486719,HU
 2483486720,2486566911,US
 2486566912,2486632447,CH
 2486632448,2486697983,US
-2486697984,2486763519,AT
+2486697984,2486763519,DE
 2486763520,2486960127,US
 2486960128,2487025663,FR
 2487025664,2487369727,US
-2487369728,2487369983,PF
-2487369984,2487370495,US
-2487370496,2487384319,PF
-2487384320,2487384575,US
-2487384576,2487386111,PF
+2487369728,2487386111,PF
 2487386112,2487877631,US
 2487877632,2487943167,A2
 2487943168,2488205311,US
@@ -46409,7 +46037,9 @@
 2500150528,2500150783,GB
 2500150784,2500161023,US
 2500161024,2500161535,GB
-2500161536,2500162559,US
+2500161536,2500161791,US
+2500161792,2500162047,GB
+2500162048,2500162559,US
 2500162560,2500162815,GB
 2500162816,2500166143,US
 2500166144,2500166399,GB
@@ -46417,7 +46047,9 @@
 2500175872,2500175879,RO
 2500175880,2500188679,US
 2500188680,2500188687,CH
-2500188688,2500198911,US
+2500188688,2500196351,US
+2500196352,2500198399,FI
+2500198400,2500198911,US
 2500198912,2500199167,GB
 2500199168,2500199423,US
 2500199424,2500199679,IE
@@ -46433,7 +46065,9 @@
 2500212992,2500213247,ES
 2500213248,2500219135,US
 2500219136,2500219391,DE
-2500219392,2500225551,US
+2500219392,2500221455,US
+2500221456,2500221459,FR
+2500221460,2500225551,US
 2500225552,2500225559,ES
 2500225560,2500228607,US
 2500228608,2500228863,FR
@@ -46455,21 +46089,27 @@
 2500245504,2500245759,GB
 2500245760,2500246015,US
 2500246016,2500246527,GB
-2500246528,2500272127,US
+2500246528,2500247551,US
+2500247552,2500248575,ES
+2500248576,2500272127,US
 2500272128,2500272639,GB
 2500272640,2500276223,US
 2500276224,2500276735,GB
 2500276736,2500276991,US
 2500276992,2500277247,GB
-2500277248,2500289023,US
+2500277248,2500278751,US
+2500278752,2500278783,GB
+2500278784,2500289023,US
 2500289024,2500289151,FR
 2500289152,2500292607,US
 2500292608,2500292863,DE
 2500292864,2500293375,US
 2500293376,2500293631,DE
-2500293632,2500319231,US
-2500319232,2500319743,ES
-2500319744,2500392959,US
+2500293632,2500313855,US
+2500313856,2500314111,AT
+2500314112,2500319231,US
+2500319232,2500321279,ES
+2500321280,2500392959,US
 2500392960,2500393215,IN
 2500393216,2500393983,US
 2500393984,2500394239,GB
@@ -46491,7 +46131,11 @@
 2500554380,2500554487,DE
 2500554488,2500555263,US
 2500555264,2500555519,FR
-2500555520,2500591615,US
+2500555520,2500562959,US
+2500562960,2500562967,ES
+2500562968,2500568679,US
+2500568680,2500568683,GB
+2500568684,2500591615,US
 2500591616,2500595711,GB
 2500595712,2500608511,US
 2500608512,2500608767,ES
@@ -46509,15 +46153,25 @@
 2500646912,2500647935,ES
 2500647936,2500666111,US
 2500666112,2500666367,EU
-2500666368,2500687871,US
+2500666368,2500666463,US
+2500666464,2500666471,LU
+2500666472,2500681759,US
+2500681760,2500681767,PL
+2500681768,2500687871,US
 2500687872,2500689919,FR
 2500689920,2500694271,US
-2500694272,2500694527,IT
-2500694528,2500719103,US
+2500694272,2500694783,IT
+2500694784,2500719103,US
 2500719104,2500720639,IE
-2500720640,2500723799,US
+2500720640,2500720652,US
+2500720653,2500720653,IE
+2500720654,2500723799,US
 2500723800,2500723807,ES
-2500723808,2501574655,US
+2500723808,2500743215,US
+2500743216,2500743223,GB
+2500743224,2500984831,US
+2500984832,2501001215,GB
+2501001216,2501574655,US
 2501574656,2501640191,KZ
 2501640192,2503016447,US
 2503016448,2503081983,IL
@@ -46535,7 +46189,9 @@
 2503911424,2503915519,ES
 2503915520,2503917567,IT
 2503917568,2503933951,BG
-2503933952,2504470527,US
+2503933952,2504180735,US
+2504180736,2504180991,ES
+2504180992,2504470527,US
 2504470528,2504470783,ES
 2504470784,2504472831,US
 2504472832,2504473599,ES
@@ -46546,19 +46202,33 @@
 2504491008,2504499199,IT
 2504499200,2504916991,US
 2504916992,2504982527,IL
-2504982528,2505469951,US
+2504982528,2505457663,US
+2505457664,2505459711,IE
+2505459712,2505469439,US
+2505469440,2505469951,ES
 2505469952,2505474047,NL
-2505474048,2505572351,US
+2505474048,2505482239,US
+2505482240,2505484287,NL
+2505484288,2505488383,US
+2505488384,2505490431,FR
+2505490432,2505504767,US
+2505504768,2505506815,FI
+2505506816,2505572351,US
 2505572352,2505637887,IL
-2505637888,2505793535,US
+2505637888,2505789439,US
+2505789440,2505790463,FR
+2505790464,2505791487,US
+2505791488,2505792511,FR
+2505792512,2505793535,US
 2505793536,2505801727,ES
 2505801728,2506293247,US
 2506293248,2506358783,CA
-2506358784,2506359039,US
-2506359040,2506359295,ES
+2506358784,2506359295,ES
 2506359296,2506360831,US
 2506360832,2506361087,ES
-2506361088,2507124735,US
+2506361088,2506401791,US
+2506401792,2506402815,IT
+2506402816,2507124735,US
 2507124736,2507124991,IN
 2507124992,2508062719,US
 2508062720,2508064767,CH
@@ -46569,8 +46239,13 @@
 2508075008,2508077055,CH
 2508077056,2508079103,BE
 2508079104,2508081151,DE
-2508081152,2508082175,US
-2508082176,2508083199,GB
+2508081152,2508081407,NL
+2508081408,2508081663,US
+2508081664,2508081919,GB
+2508081920,2508082175,US
+2508082176,2508082431,GB
+2508082432,2508082943,DE
+2508082944,2508083199,GB
 2508083200,2508085247,IS
 2508085248,2508087295,PS
 2508087296,2508089343,RU
@@ -46883,11 +46558,20 @@
 2533097472,2533228543,US
 2533228544,2533294079,PL
 2533294080,2533359615,CN
-2533359616,2533373951,UA
-2533373952,2533375999,BG
+2533359616,2533369855,UA
+2533369856,2533371903,BG
+2533371904,2533375999,UA
 2533376000,2533392383,HU
 2533392384,2533425151,RO
-2533425152,2539978751,IT
+2533425152,2538602495,IT
+2538602496,2538604967,FR
+2538604968,2538604975,ES
+2538604976,2538606031,FR
+2538606032,2538606039,ES
+2538606040,2538619903,FR
+2538619904,2538619911,ES
+2538619912,2538668031,FR
+2538668032,2539978751,IT
 2539978752,2540240895,US
 2540240896,2540306431,FI
 2540306432,2540896255,US
@@ -46935,7 +46619,7 @@
 2547318784,2547515391,US
 2547523584,2547535871,GB
 2547540480,2547540735,SE
-2547553024,2547553279,RU
+2547548160,2547580927,BE
 2548039680,2548563967,GB
 2548563968,2548826111,IR
 2548826112,2548829695,AT
@@ -47007,7 +46691,11 @@
 2549874688,2549876735,GB
 2549876736,2549878783,NO
 2549878784,2549880831,DE
-2549880832,2549882879,SE
+2549880832,2549882335,SE
+2549882336,2549882351,FI
+2549882352,2549882383,SE
+2549882384,2549882399,FI
+2549882400,2549882879,SE
 2549882880,2549884927,CH
 2549884928,2549891071,DE
 2549891072,2549899263,RU
@@ -47021,7 +46709,7 @@
 2549929984,2549932031,DE
 2549932032,2549940223,HR
 2549940224,2550005759,AE
-2550005760,2550136831,RO
+2550005760,2550136831,SA
 2550136832,2550202367,DO
 2550202368,2553544703,US
 2553544704,2553610239,IN
@@ -47173,7 +46861,9 @@
 2574647296,2574778367,CN
 2574778368,2576297471,JP
 2576297472,2576302079,US
-2576302080,2583691263,JP
+2576302080,2583582207,JP
+2583582208,2583582463,HK
+2583582464,2583691263,JP
 2583691264,2583695359,ZA
 2583695360,2583697407,BW
 2583697408,2583699455,CI
@@ -47194,7 +46884,109 @@
 2584412160,2584477695,CA
 2584477696,2584608767,US
 2584608768,2584739839,CH
-2584739840,2584805375,MU
+2584739840,2584739903,SG
+2584739904,2584740351,MU
+2584740352,2584740415,HK
+2584740416,2584740863,MU
+2584740864,2584740927,SG
+2584740928,2584741375,MU
+2584741376,2584741439,HK
+2584741440,2584741887,MU
+2584741888,2584741951,SG
+2584741952,2584742399,MU
+2584742400,2584742463,HK
+2584742464,2584742911,MU
+2584742912,2584742975,SG
+2584742976,2584743423,MU
+2584743424,2584743487,HK
+2584743488,2584743935,MU
+2584743936,2584743999,SG
+2584744000,2584744447,MU
+2584744448,2584744511,HK
+2584744512,2584744959,MU
+2584744960,2584745023,SG
+2584745024,2584745471,MU
+2584745472,2584745535,HK
+2584745536,2584745983,MU
+2584745984,2584746047,SG
+2584746048,2584746495,MU
+2584746496,2584746559,HK
+2584746560,2584747007,MU
+2584747008,2584747071,SG
+2584747072,2584747519,MU
+2584747520,2584747583,HK
+2584747584,2584748031,MU
+2584748032,2584748095,SG
+2584748096,2584748543,MU
+2584748544,2584748607,HK
+2584748608,2584749055,MU
+2584749056,2584749119,SG
+2584749120,2584749567,MU
+2584749568,2584749631,HK
+2584749632,2584750079,MU
+2584750080,2584750143,SG
+2584750144,2584750591,MU
+2584750592,2584750655,HK
+2584750656,2584751103,MU
+2584751104,2584751167,SG
+2584751168,2584751615,MU
+2584751616,2584751679,HK
+2584751680,2584752127,MU
+2584752128,2584752191,SG
+2584752192,2584752639,MU
+2584752640,2584752703,HK
+2584752704,2584753151,MU
+2584753152,2584753215,SG
+2584753216,2584753663,MU
+2584753664,2584753727,HK
+2584753728,2584754175,MU
+2584754176,2584754239,SG
+2584754240,2584754687,MU
+2584754688,2584754751,HK
+2584754752,2584755199,MU
+2584755200,2584755263,SG
+2584755264,2584755711,MU
+2584755712,2584755775,HK
+2584755776,2584756223,MU
+2584756224,2584756287,SG
+2584756288,2584756735,MU
+2584756736,2584756799,HK
+2584756800,2584757247,MU
+2584757248,2584757311,SG
+2584757312,2584757759,MU
+2584757760,2584757823,HK
+2584757824,2584758271,MU
+2584758272,2584758335,SG
+2584758336,2584758783,MU
+2584758784,2584758847,HK
+2584758848,2584759295,MU
+2584759296,2584759359,SG
+2584759360,2584759807,MU
+2584759808,2584759871,HK
+2584759872,2584760319,MU
+2584760320,2584760383,SG
+2584760384,2584760831,MU
+2584760832,2584760895,HK
+2584760896,2584761343,MU
+2584761344,2584761407,SG
+2584761408,2584761855,MU
+2584761856,2584761919,HK
+2584761920,2584762367,MU
+2584762368,2584762431,SG
+2584762432,2584762879,MU
+2584762880,2584762943,HK
+2584762944,2584763391,MU
+2584763392,2584763455,SG
+2584763456,2584763903,MU
+2584763904,2584763967,HK
+2584763968,2584764671,MU
+2584764672,2584768511,US
+2584768512,2584770559,MU
+2584770560,2584775423,US
+2584775424,2584775679,KE
+2584775680,2584777727,MU
+2584777728,2584803327,US
+2584803328,2584805375,MU
 2584805376,2585001983,US
 2585001984,2585067519,CA
 2585067520,2585788415,US
@@ -47215,13 +47007,17 @@
 2586619904,2586620415,FR
 2586620416,2586622463,US
 2586622464,2586622975,ES
-2586622976,2586640895,US
+2586622976,2586640383,US
+2586640384,2586640399,MC
+2586640400,2586640895,US
 2586640896,2586641407,FR
 2586641408,2586650687,US
 2586650688,2586650703,DE
 2586650704,2586650879,US
 2586650880,2586651135,NL
-2586651136,2586733567,US
+2586651136,2586714879,US
+2586714880,2586715135,NL
+2586715136,2586733567,US
 2586733568,2586733823,LT
 2586733824,2586734591,US
 2586734592,2586735615,LT
@@ -47232,18 +47028,26 @@
 2586804480,2586828799,US
 2586828800,2586829055,CH
 2586829056,2586870783,US
-2586870784,2586874879,ES
-2586874880,2586875135,US
-2586875136,2586875903,ES
-2586875904,2586876927,US
-2586876928,2586877951,ES
-2586877952,2586952191,US
+2586870784,2586875903,ES
+2586875904,2586876415,US
+2586876416,2586876671,ES
+2586876672,2586876927,US
+2586876928,2586882047,ES
+2586882048,2586952191,US
 2586952192,2586952447,FR
-2586952448,2587017215,US
+2586952448,2586952703,US
+2586952704,2586953471,FR
+2586953472,2586953727,ES
+2586953728,2586953983,MX
+2586953984,2587017215,US
 2587017216,2587017471,IE
 2587017472,2587018239,US
 2587018240,2587018495,IE
-2587018496,2587021823,US
+2587018496,2587018671,US
+2587018672,2587018687,IE
+2587018688,2587019263,US
+2587019264,2587019775,IE
+2587019776,2587021823,US
 2587021824,2587022335,IE
 2587022336,2587066879,US
 2587066880,2587067135,GB
@@ -47271,7 +47075,9 @@
 2587394816,2587395071,ES
 2587395072,2587396095,US
 2587396096,2587399167,ES
-2587399168,2587443199,US
+2587399168,2587412479,US
+2587412480,2587414527,IT
+2587414528,2587443199,US
 2587443200,2587447295,CH
 2587447296,2587476760,US
 2587476761,2587476761,LB
@@ -47285,13 +47091,17 @@
 2587481970,2587481970,LB
 2587481971,2587492351,US
 2587492352,2587493375,ES
-2587493376,2587508735,US
+2587493376,2587494399,US
+2587494400,2587496447,ES
+2587496448,2587508735,US
 2587508736,2587525119,GB
 2587525120,2587542527,US
 2587542528,2587544063,ES
 2587544064,2587582463,US
 2587582464,2587586559,NL
-2587586560,2587926527,US
+2587586560,2587592703,US
+2587592704,2587594751,GB
+2587594752,2587926527,US
 2587926528,2587930623,BG
 2587930624,2587939071,US
 2587939072,2587939583,PR
@@ -47310,7 +47120,6 @@
 2587964028,2587964028,SS
 2587964029,2587964415,SD
 2587964416,2587965439,ZA
-2587965440,2587966463,KE
 2587966464,2587967487,BF
 2587967488,2587975679,ZA
 2587975680,2587983871,GH
@@ -47416,21 +47225,34 @@
 2588512256,2588514303,TZ
 2588514304,2588516351,ZA
 2588516352,2588518399,TD
-2588522496,2588526591,ZA
+2588518400,2588519423,TZ
+2588519424,2588520447,SN
+2588520448,2588521471,SL
+2588521472,2588526591,ZA
 2588526592,2588528639,CM
 2588528640,2588534783,ZA
 2588534784,2588535807,ZM
 2588535808,2588536831,NG
 2588536832,2588540927,ZA
+2588540928,2588671999,TZ
 2588672000,2588934143,KE
 2588934144,2589982719,SC
 2589982720,2590507007,SD
 2590507008,2591031295,TN
 2591031296,2591096831,GA
+2591096832,2591162367,NG
 2591293440,2591326207,GA
 2591326208,2591358975,AO
+2591424512,2591457279,NG
+2591473664,2591481855,AO
+2591481856,2591483903,TZ
+2591485952,2591486975,SO
+2591486976,2591487999,ZA
+2591488000,2591489023,GA
+2591489024,2591490047,ZA
 2591490048,2591498239,BI
 2591498240,2591510527,ZA
+2591510528,2591514623,ZW
 2591514624,2591522815,SZ
 2591522816,2591526911,LR
 2591526912,2591539199,ZA
@@ -47448,26 +47270,26 @@
 2592006144,2592022527,TZ
 2592022528,2592026623,BJ
 2592026624,2592026879,US
-2592026880,2592027391,MU
+2592026880,2592027391,ZA
 2592027392,2592027647,GB
-2592027648,2592028159,MU
+2592027648,2592028159,ZA
 2592028160,2592028415,CA
-2592028416,2592028671,MU
+2592028416,2592028671,ZA
 2592028672,2592028799,NG
 2592028800,2592028927,KE
-2592028928,2592029183,MU
+2592028928,2592029183,ZA
 2592029184,2592029311,CI
-2592029312,2592029695,MU
-2592029696,2592030207,ZA
+2592029312,2592030207,ZA
 2592030208,2592030335,GH
 2592030336,2592030463,CM
 2592030464,2592030591,UG
-2592030592,2592030719,MU
+2592030592,2592030719,ZA
 2592030720,2592034815,LY
 2592034816,2592038911,NE
 2592038912,2592043007,DZ
 2592043008,2592047103,ZA
 2592047104,2592079871,AO
+2600468480,2600534015,ZM
 2600534016,2600665087,US
 2600665088,2600730623,CA
 2600730624,2600796159,NO
@@ -47588,11 +47410,13 @@
 2617049088,2617114623,IT
 2617114624,2617123839,US
 2617123840,2617124095,DE
-2617124096,2617131007,US
+2617124096,2617124863,US
+2617124864,2617126911,NL
+2617126912,2617131007,US
 2617131008,2617139199,CA
 2617139200,2617139455,PE
 2617139456,2617139711,SZ
-2617139712,2617139967,JM
+2617139712,2617139967,AU
 2617139968,2617140223,PA
 2617140224,2617140479,CO
 2617140480,2617140735,SC
@@ -47760,13 +47584,16 @@
 2625961984,2626027519,LU
 2626027520,2626093055,US
 2626093056,2626158591,CH
-2626158592,2626879487,US
+2626158592,2626224127,US
+2626224128,2626289663,CZ
+2626289664,2626879487,US
 2626879488,2626945023,KR
 2626945024,2627010559,IT
 2627010560,2627076095,NZ
 2627076096,2627141631,NL
 2627141632,2627469311,US
 2627469312,2627731455,TZ
+2627731456,2629828607,EG
 2634022912,2634088447,CN
 2634088448,2635202559,JP
 2635202560,2635268095,CN
@@ -48128,9 +47955,7 @@
 2668106952,2668106959,US
 2668106960,2668107599,NL
 2668107600,2668107607,US
-2668107608,2668107679,NL
-2668107680,2668107687,US
-2668107688,2668107711,NL
+2668107608,2668107711,NL
 2668107712,2668107759,US
 2668107760,2668107767,NL
 2668107768,2668107775,US
@@ -48174,7 +47999,89 @@
 2668109752,2668109759,US
 2668109760,2668109951,NL
 2668109952,2668110047,US
-2668110048,2668134399,NL
+2668110048,2668110271,NL
+2668110272,2668110303,US
+2668110304,2668110335,NL
+2668110336,2668110911,US
+2668110912,2668110943,NL
+2668110944,2668111039,US
+2668111040,2668111071,NL
+2668111072,2668111231,US
+2668111232,2668111327,NL
+2668111328,2668111359,US
+2668111360,2668111471,NL
+2668111472,2668111487,US
+2668111488,2668111743,NL
+2668111744,2668111903,US
+2668111904,2668111967,NL
+2668111968,2668112159,US
+2668112160,2668112191,NL
+2668112192,2668112223,US
+2668112224,2668112303,NL
+2668112304,2668112319,US
+2668112320,2668112575,NL
+2668112576,2668112607,US
+2668112608,2668112735,NL
+2668112736,2668112767,US
+2668112768,2668112799,NL
+2668112800,2668112895,US
+2668112896,2668112959,NL
+2668112960,2668112991,US
+2668112992,2668113055,NL
+2668113056,2668113151,US
+2668113152,2668113183,NL
+2668113184,2668113407,US
+2668113408,2668113567,NL
+2668113568,2668113585,US
+2668113586,2668113586,NL
+2668113587,2668113599,US
+2668113600,2668113607,JO
+2668113608,2668113623,US
+2668113624,2668113631,JO
+2668113632,2668113639,NL
+2668113640,2668113647,US
+2668113648,2668113759,NL
+2668113760,2668113791,US
+2668113792,2668113823,NL
+2668113824,2668113919,US
+2668113920,2668113951,NL
+2668113952,2668113983,US
+2668113984,2668114015,NL
+2668114016,2668114271,US
+2668114272,2668114335,NL
+2668114336,2668114367,US
+2668114368,2668114591,NL
+2668114592,2668114623,US
+2668114624,2668114639,NL
+2668114640,2668114719,US
+2668114720,2668114879,NL
+2668114880,2668114943,US
+2668114944,2668114959,NL
+2668114960,2668114991,US
+2668114992,2668115007,NL
+2668115008,2668115039,US
+2668115040,2668115071,NL
+2668115072,2668115087,US
+2668115088,2668115135,NL
+2668115136,2668115151,US
+2668115152,2668115279,NL
+2668115280,2668115343,US
+2668115344,2668115375,NL
+2668115376,2668115391,US
+2668115392,2668115711,NL
+2668115712,2668115775,US
+2668115776,2668115807,NL
+2668115808,2668115839,US
+2668115840,2668116319,NL
+2668116320,2668116335,IT
+2668116336,2668116511,NL
+2668116512,2668116543,US
+2668116544,2668116863,NL
+2668116864,2668116895,US
+2668116896,2668116927,NL
+2668116928,2668116991,US
+2668116992,2668118015,NL
+2668118016,2668134399,FR
 2668134400,2668150783,GB
 2668150784,2668167167,NL
 2668167168,2668286463,US
@@ -48230,7 +48137,11 @@
 2671378432,2671443967,NO
 2671443968,2671509503,US
 2671509504,2671575039,NL
-2671575040,2671749119,US
+2671575040,2671711479,US
+2671711480,2671711483,DE
+2671711484,2671718827,US
+2671718828,2671718831,GB
+2671718832,2671749119,US
 2671749120,2671750143,CA
 2671750144,2672295935,US
 2672295936,2672361471,SE
@@ -48251,7 +48162,9 @@
 2673737728,2673803263,US
 2673803264,2673868799,FR
 2673868800,2674130943,US
-2674130944,2674175999,GB
+2674130944,2674147327,GB
+2674147328,2674163711,NL
+2674163712,2674175999,GB
 2674176000,2674192383,US
 2674192384,2674196479,CH
 2674196480,2674249727,GB
@@ -48270,9 +48183,9 @@
 2675048448,2675113983,GB
 2675113984,2675245055,US
 2675245056,2675310591,NZ
-2675310592,2675572735,US
-2675572736,2675638271,NL
-2675638272,2675965951,US
+2675310592,2675573599,US
+2675573600,2675573631,IE
+2675573632,2675965951,US
 2675965952,2676031487,CA
 2676031488,2676097023,US
 2676097024,2676162559,NO
@@ -48298,9 +48211,7 @@
 2677642496,2677642751,CA
 2677642752,2677643007,SE
 2677643008,2677644287,US
-2677644288,2677644347,GB
-2677644348,2677644348,EU
-2677644349,2677644543,GB
+2677644288,2677644543,GB
 2677644544,2677648383,US
 2677648384,2677649407,JP
 2677649408,2677650431,US
@@ -48309,7 +48220,8 @@
 2677651456,2677652479,SG
 2677652480,2677658367,US
 2677658368,2677658623,AU
-2677658624,2677659903,US
+2677658624,2677659647,US
+2677659648,2677659903,AU
 2677659904,2677660159,IN
 2677660160,2677660415,KR
 2677660416,2677669887,US
@@ -48361,10 +48273,17 @@
 2679242752,2679308287,US
 2679308288,2679373823,CH
 2679373824,2679406591,GB
-2679406592,2679422975,BR
+2679406592,2679414783,US
+2679414784,2679415307,PR
+2679415308,2679415308,DE
+2679415309,2679418879,PR
+2679418880,2679420927,SG
+2679420928,2679422975,PR
 2679422976,2679431167,US
 2679431168,2679439359,FR
-2679439360,2679523327,US
+2679439360,2679515391,US
+2679515392,2679515903,GB
+2679515904,2679523327,US
 2679523328,2679525375,GB
 2679525376,2679535615,US
 2679535616,2679537663,GB
@@ -48465,17 +48384,13 @@
 2684191988,2684191999,US
 2684192000,2684192103,NL
 2684192104,2684192107,US
-2684192108,2684192151,NL
-2684192152,2684192159,US
-2684192160,2684192303,NL
+2684192108,2684192303,NL
 2684192304,2684192311,US
 2684192312,2684192387,NL
 2684192388,2684192391,US
 2684192392,2684192459,NL
 2684192460,2684192463,US
-2684192464,2684192495,NL
-2684192496,2684192503,US
-2684192504,2684192511,NL
+2684192464,2684192511,NL
 2684192512,2684192519,US
 2684192520,2684192523,NL
 2684192524,2684192535,US
@@ -48495,9 +48410,7 @@
 2684193176,2684193183,US
 2684193184,2684193275,NL
 2684193276,2684193279,US
-2684193280,2684193447,NL
-2684193448,2684193455,AZ
-2684193456,2684193583,NL
+2684193280,2684193583,NL
 2684193584,2684193591,IE
 2684193592,2684193735,NL
 2684193736,2684193743,US
@@ -48507,8 +48420,7 @@
 2684193888,2684193911,US
 2684193912,2684193931,NL
 2684193932,2684193935,US
-2684193936,2684194002,NL
-2684194003,2684194003,BH
+2684193936,2684194003,NL
 2684194004,2684194007,US
 2684194008,2684194071,NL
 2684194072,2684194079,US
@@ -48530,9 +48442,7 @@
 2684194560,2684194623,US
 2684194624,2684194723,NL
 2684194724,2684194727,US
-2684194728,2684194815,NL
-2684194816,2684194823,US
-2684194824,2684195119,NL
+2684194728,2684195119,NL
 2684195120,2684195123,US
 2684195124,2684195199,NL
 2684195200,2684195263,US
@@ -48542,9 +48452,7 @@
 2684195336,2684195339,US
 2684195340,2684195663,NL
 2684195664,2684195667,US
-2684195668,2684195695,NL
-2684195696,2684195703,US
-2684195704,2684195867,NL
+2684195668,2684195867,NL
 2684195868,2684195871,US
 2684195872,2684195927,NL
 2684195928,2684195935,JP
@@ -48552,9 +48460,7 @@
 2684195980,2684195983,US
 2684195984,2684196095,NL
 2684196096,2684196159,US
-2684196160,2684196215,NL
-2684196216,2684196223,US
-2684196224,2684196343,NL
+2684196160,2684196343,NL
 2684196344,2684196351,US
 2684196352,2684196391,NL
 2684196392,2684196399,US
@@ -48711,7 +48617,10 @@
 2691366912,2691760127,US
 2691825664,2691891199,HU
 2691891200,2692546559,ZA
-2692546560,2694840319,US
+2692546560,2694316031,US
+2694381568,2694447103,US
+2694578176,2694840319,TN
+2694840320,2696151039,MA
 2696151040,2696216575,IT
 2696216576,2696282111,ZA
 2696413184,2696478719,ZA
@@ -48752,7 +48661,8 @@
 2701156352,2701160447,CW
 2701160448,2701162495,TT
 2701162496,2701164543,UY
-2701164544,2701172735,HT
+2701164544,2701170687,HT
+2701170688,2701172735,TT
 2701172736,2701176831,CL
 2701176832,2701178879,AR
 2701178880,2701180927,CL
@@ -48787,7 +48697,7 @@
 2702835712,2702901247,US
 2702901248,2702966783,IT
 2702966784,2703032319,US
-2703032320,2703097855,NZ
+2703032320,2703097855,AU
 2703097856,2703163391,GB
 2703163392,2703556607,US
 2703556608,2703622143,ES
@@ -48815,7 +48725,12 @@
 2705195008,2705260543,CH
 2705260544,2705326079,US
 2705326080,2705391615,MO
-2705391616,2705522687,NZ
+2705391616,2705399807,AU
+2705399808,2705407999,NZ
+2705408000,2705432575,AU
+2705432576,2705440767,NZ
+2705440768,2705456895,AU
+2705456896,2705522687,NZ
 2705522688,2705588223,ES
 2705588224,2705596159,US
 2705596160,2705596415,CA
@@ -48890,9 +48805,17 @@
 2713976832,2714042367,VE
 2714042368,2714238975,US
 2714238976,2714304511,TH
-2714304512,2714370047,US
-2714370048,2714435583,NL
-2714435584,2714697727,US
+2714304512,2714386943,US
+2714386944,2714387199,JP
+2714387200,2714387455,US
+2714387456,2714387471,JP
+2714387472,2714389663,US
+2714389664,2714389695,A1
+2714389696,2714390079,US
+2714390080,2714390095,JP
+2714390096,2714402303,US
+2714402304,2714402559,JP
+2714402560,2714697727,US
 2714697728,2714763263,CN
 2714763264,2715025407,US
 2715025408,2715090943,VE
@@ -48941,7 +48864,9 @@
 2723832576,2723832831,GB
 2723832832,2724268287,US
 2724268288,2724268415,MX
-2724268416,2724790271,US
+2724268416,2724303989,US
+2724303990,2724303990,GB
+2724303991,2724790271,US
 2724790272,2724855807,CN
 2724855808,2724921343,CA
 2724921344,2725249023,US
@@ -49046,7 +48971,8 @@
 2732086272,2732087295,CA
 2732087296,2732105727,US
 2732105728,2732107775,JM
-2732107776,2732111871,US
+2732107776,2732109823,US
+2732110848,2732111871,US
 2732111872,2732113919,CA
 2732113920,2732136447,US
 2732136448,2732138495,CA
@@ -49063,9 +48989,7 @@
 2732220416,2732227583,US
 2732227584,2732228607,CA
 2732228608,2732261375,US
-2732261376,2732262399,CA
-2732262400,2732263423,US
-2732263424,2732265471,CA
+2732261376,2732265471,CA
 2732265472,2732273663,US
 2732273664,2732275711,CA
 2732275712,2732278783,US
@@ -49209,7 +49133,9 @@
 2734200832,2734205951,CA
 2734205952,2734206975,US
 2734206976,2734209023,CA
-2734209024,2734229503,US
+2734209024,2734218239,US
+2734218240,2734218751,CA
+2734218752,2734229503,US
 2734229504,2734230527,CA
 2734230528,2734237695,US
 2734237696,2734238719,CA
@@ -49244,7 +49170,9 @@
 2734376960,2734379007,CA
 2734379008,2734381055,VG
 2734381056,2734389247,US
-2734389248,2734390271,CA
+2734389248,2734389503,CA
+2734389504,2734389535,US
+2734389536,2734390271,CA
 2734390272,2734398463,US
 2734398464,2734399487,PR
 2734399488,2734407679,US
@@ -49293,11 +49221,21 @@
 2734588928,2734589951,CA
 2734589952,2734599167,US
 2734599168,2734600191,CA
-2734600192,2734633983,US
+2734600192,2734605311,US
+2734605312,2734605567,GB
+2734605568,2734605823,DE
+2734605824,2734606079,SE
+2734606080,2734633983,US
 2734633984,2734635007,CA
 2734635008,2734649343,US
 2734649344,2734650367,CA
-2734650368,2734657535,US
+2734650368,2734655927,US
+2734655928,2734655935,GB
+2734655936,2734656127,US
+2734656128,2734656255,GB
+2734656256,2734656383,US
+2734656384,2734656511,GB
+2734656512,2734657535,US
 2734657536,2734658559,VG
 2734658560,2734659583,CA
 2734659584,2734665727,US
@@ -49331,7 +49269,8 @@
 2737769472,2737770495,IN
 2737770496,2737771263,AU
 2737771264,2737771519,JP
-2737771520,2737772031,AU
+2737771520,2737771775,AU
+2737771776,2737772031,NZ
 2737772288,2737774591,JP
 2737774592,2737776639,BD
 2737776640,2737777663,AU
@@ -49383,7 +49322,6 @@
 2738167808,2738168831,AU
 2738168832,2738177023,CN
 2738177024,2738178047,AU
-2738178048,2738179071,HK
 2738179072,2738182143,IN
 2738182144,2738195455,CN
 2738195456,2738196479,BD
@@ -49432,7 +49370,7 @@
 2744975360,2745040383,SE
 2745040384,2745040639,EU
 2745040640,2745040895,SE
-2745040896,2745106431,DE
+2745040896,2745106431,NL
 2745106432,2745171967,SI
 2745171968,2745237503,GB
 2745237504,2745303039,CH
@@ -49593,7 +49531,7 @@
 2760529920,2760531967,RU
 2760534016,2760536063,BE
 2760536064,2760540159,IL
-2760540160,2760556543,RO
+2760540160,2760556543,IR
 2760556544,2760558591,DE
 2760558592,2760562687,ES
 2760562688,2760564735,BG
@@ -49661,6 +49599,7 @@
 2770337792,2770993151,US
 2770993152,2771124223,IN
 2771124224,2771451903,US
+2771517440,2771648511,TN
 2771648512,2771910655,ZA
 2771910656,2772434943,ZM
 2772434944,2772762623,US
@@ -49672,7 +49611,10 @@
 2773090304,2773221375,US
 2773221376,2773286911,JP
 2773286912,2773745663,US
-2773745664,2773811199,NZ
+2773745664,2773794815,NZ
+2773794816,2773798911,IN
+2773798912,2773807103,NZ
+2773807104,2773811199,IN
 2773811200,2773876735,US
 2773876736,2773942271,AU
 2773942272,2774335487,US
@@ -49738,7 +49680,9 @@
 2780933376,2780933631,GB
 2780933632,2780933887,US
 2780933888,2780934143,GB
-2780934144,2780954623,US
+2780934144,2780934911,US
+2780934912,2780935167,GB
+2780935168,2780954623,US
 2780954624,2781020159,KR
 2781020160,2781478911,US
 2781478912,2781544447,HK
@@ -49760,7 +49704,11 @@
 2782658560,2782724095,PH
 2782724096,2782789631,US
 2782789632,2782855167,CH
-2782855168,2783182847,US
+2782855168,2783002623,US
+2783002624,2783002879,DK
+2783002880,2783003647,US
+2783003648,2783003903,SE
+2783003904,2783182847,US
 2783182848,2783248383,AU
 2783248384,2783313919,KR
 2783313920,2783379455,US
@@ -49779,9 +49727,11 @@
 2784165888,2784296959,KR
 2784296960,2784362495,US
 2784362496,2784428031,KR
-2784428032,2785542143,US
-2785542144,2785673215,CH
-2785673216,2785738751,NL
+2784428032,2784952063,US
+2784952064,2784952319,NL
+2785017856,2785542143,US
+2785542144,2785607679,CH
+2785607680,2785738751,US
 2785738752,2786066431,CH
 2786066432,2788163583,US
 2788163584,2788229119,CA
@@ -49882,7 +49832,9 @@
 2808938496,2809069567,US
 2809069568,2809135103,SA
 2809135104,2809266175,US
-2809266176,2809331711,CA
+2809266176,2809286975,CA
+2809286976,2809286991,US
+2809286992,2809331711,CA
 2809331712,2809397247,US
 2809397248,2809462783,UY
 2809462784,2809855999,US
@@ -49989,10 +49941,9 @@
 2818038539,2818310143,US
 2818310144,2818375679,AR
 2818375680,2818572287,US
-2818637824,2818654207,NL
+2818637824,2818654207,US
 2818654208,2818670591,AU
-2818670592,2818703359,NL
-2818703360,2822731894,US
+2818670592,2822731894,US
 2822731895,2822731895,GB
 2822731896,2822848997,US
 2822848998,2822848998,EU
@@ -50138,20 +50089,28 @@
 2835283968,2835349503,MX
 2835349504,2837446655,US
 2837446656,2837839871,CH
-2837839872,2837905407,NL
+2837839872,2837905407,US
 2837905408,2838298623,CH
-2838298624,2838495231,NL
-2838495232,2838691839,CH
-2838691840,2838757375,NL
+2838298624,2838560767,NL
+2838560768,2838626303,CH
+2838626304,2838757375,US
 2838757376,2838822911,CH
-2838822912,2839019519,NL
-2839019520,2839085055,CH
-2839085056,2839101439,NL
-2839101440,2839117823,MX
-2839117824,2839150591,NL
-2839150592,2839281663,CH
-2839281664,2839412735,NL
-2839412736,2839543807,CH
+2838822912,2838832159,US
+2838832160,2838832175,KR
+2838832176,2838832351,US
+2838832352,2838832383,KR
+2838832384,2838837967,US
+2838837968,2838837983,NI
+2838837984,2838864431,US
+2838864432,2838864447,CO
+2838864448,2838864671,US
+2838864672,2838864687,CA
+2838864688,2838881055,US
+2838881056,2838881087,AT
+2838881088,2839085055,US
+2839085056,2839117823,MX
+2839117824,2839150591,US
+2839150592,2839543807,CH
 2839543808,2843803647,US
 2843803648,2843869183,ZA
 2843869184,2844524543,US
@@ -50171,6 +50130,8 @@
 2845704192,2845755391,CU
 2845755392,2845755647,EU
 2845755648,2845769727,CU
+2845769728,2845786111,GA
+2845786112,2845802495,NG
 2845835264,2848212991,US
 2848212992,2848215039,GB
 2848215040,2848244735,US
@@ -50183,14 +50144,26 @@
 2849964032,2850029567,HK
 2850029568,2851995647,US
 2852061184,2852062207,ZA
+2852062208,2852063231,CM
 2852063232,2852064255,KE
+2852064256,2852065279,ZA
 2852065280,2852066303,GH
+2852066304,2852067327,ZA
 2852067328,2852068351,SD
-2852069376,2852070399,ZA
+2852068352,2852071423,ZA
 2852071424,2852072447,NG
 2852072448,2852073471,ZA
 2852073472,2852074495,TZ
 2852074496,2852075519,MW
+2852075520,2852077567,ZA
+2852077568,2852078591,CD
+2852078592,2852079615,TN
+2852079616,2852080639,CG
+2852080640,2852081663,ZA
+2852081664,2852082687,BW
+2852082688,2852083711,EG
+2852083712,2852084735,AO
+2852084736,2852085759,TN
 2852126720,2852716653,US
 2852716654,2852716654,AU
 2852716655,2853306367,US
@@ -50262,7 +50235,11 @@
 2866953472,2867593215,US
 2867593216,2867724287,CH
 2867855360,2868117503,US
-2868379648,2868605376,US
+2868379648,2868420607,US
+2868420608,2868423679,IN
+2868423680,2868586495,US
+2868586496,2868588543,IN
+2868588544,2868605376,US
 2868605377,2868605377,NO
 2868605378,2868658175,US
 2868658176,2868658431,GB
@@ -50385,15 +50362,16 @@
 2895708160,2896035839,US
 2896035840,2896101375,DE
 2896101376,2896166911,GB
-2896166912,2897018879,US
+2896166912,2896429280,US
+2896429281,2896429281,CA
+2896429282,2897018879,US
 2897018880,2897149951,DE
 2897149952,2897215487,US
 2897215488,2897739775,DE
 2897739776,2898001919,FR
 2898001920,2898132991,GB
-2898132992,2898264063,US
-2898264064,2898264064,AU
-2898264065,2898788351,US
+2898132992,2898657279,US
+2898657280,2898788351,AU
 2898788352,2899050495,GB
 2899050496,2899116031,FR
 2899116032,2899148799,VN
@@ -50419,7 +50397,7 @@
 2904555520,2904817663,CA
 2904817664,2905001983,US
 2905001984,2905002152,GB
-2905002153,2905002153,EU
+2905002153,2905002153,US
 2905002154,2905002495,GB
 2905002496,2905044991,US
 2905044992,2905045503,SG
@@ -50475,7 +50453,9 @@
 2915795015,2915958783,US
 2915958784,2916024319,CA
 2916024320,2916163583,US
-2916163584,2916171775,CA
+2916163584,2916169015,CA
+2916169016,2916169023,US
+2916169024,2916171775,CA
 2916171776,2916184063,US
 2916184064,2916196351,CA
 2916196352,2916253695,US
@@ -50492,7 +50472,9 @@
 2916581376,2916614143,PR
 2916614144,2917117951,US
 2917117952,2917122047,NL
-2917122048,2917170822,US
+2917122048,2917167905,US
+2917167906,2917167906,BZ
+2917167907,2917170822,US
 2917170823,2917170823,UA
 2917170824,2917170854,US
 2917170855,2917170856,UA
@@ -50509,7 +50491,9 @@
 2917267968,2917268223,JM
 2917268224,2917268479,BB
 2917268480,2917268735,TC
-2917268736,2917269503,JM
+2917268736,2917269113,JM
+2917269114,2917269114,TC
+2917269115,2917269503,JM
 2917269504,2917449727,US
 2917449728,2917466111,PR
 2917466112,2917572607,US
@@ -50702,7 +50686,9 @@
 2921553408,2921553663,CO
 2921553664,2921562111,US
 2921562112,2921594879,CA
-2921594880,2925002751,US
+2921594880,2921681631,US
+2921681632,2921681639,JP
+2921681640,2925002751,US
 2925002752,2925527039,CA
 2925527040,2926575615,US
 2926575616,2927099903,CA
@@ -50909,990 +50895,200 @@
 2954647552,2954657791,ES
 2954657792,2954756095,JO
 2954756096,2954821631,TR
-2954821632,2954821651,FR
-2954821652,2954821655,IT
-2954821656,2954821775,FR
-2954821776,2954821783,IT
-2954821784,2954822047,FR
-2954822048,2954822063,ES
-2954822064,2954822159,FR
-2954822160,2954822167,GB
-2954822168,2954822175,NL
-2954822176,2954822255,FR
-2954822256,2954822263,PL
-2954822264,2954822311,FR
-2954822312,2954822319,GB
-2954822320,2954822335,FR
-2954822336,2954822339,PL
-2954822340,2954822347,FR
-2954822348,2954822351,BE
-2954822352,2954822527,FR
-2954822528,2954822531,ES
-2954822532,2954822559,FR
-2954822560,2954822575,NL
-2954822576,2954822591,FR
-2954822592,2954822599,GB
-2954822600,2954822655,FR
-2954822656,2954822687,GB
-2954822688,2954822783,FR
-2954822784,2954822791,GB
-2954822792,2954822927,FR
+2954821632,2954822079,FR
+2954822080,2954822143,ES
+2954822144,2954822927,FR
 2954822928,2954822931,DE
-2954822932,2954823071,FR
-2954823072,2954823103,BE
-2954823104,2954823263,FR
-2954823264,2954823295,CZ
-2954823296,2954823383,FR
-2954823384,2954823387,DE
-2954823388,2954823395,FR
+2954822932,2954823395,FR
 2954823396,2954823399,GB
-2954823400,2954823403,NL
-2954823404,2954823551,FR
-2954823552,2954823555,BE
-2954823556,2954823559,CZ
-2954823560,2954823567,FR
-2954823568,2954823583,GB
-2954823584,2954823703,FR
-2954823704,2954823707,NL
-2954823708,2954823767,FR
-2954823768,2954823771,GB
-2954823772,2954823779,FR
-2954823780,2954823791,GB
-2954823792,2954823891,FR
-2954823892,2954823895,CH
-2954823896,2954823903,FR
-2954823904,2954823911,DE
-2954823912,2954823927,FR
-2954823928,2954823935,CH
-2954823936,2954823999,FR
+2954823400,2954823999,FR
 2954824000,2954824015,ES
-2954824016,2954824031,FR
-2954824032,2954824047,IT
-2954824048,2954824255,FR
+2954824016,2954824255,FR
 2954824256,2954824259,ES
-2954824260,2954824271,FR
-2954824272,2954824275,ES
-2954824276,2954824279,FR
-2954824280,2954824283,PT
-2954824284,2954824431,FR
-2954824432,2954824447,PL
-2954824448,2954824711,FR
-2954824712,2954824719,ES
-2954824720,2954824735,FI
-2954824736,2954824767,DE
-2954824768,2954824775,FR
-2954824776,2954824783,IT
-2954824784,2954824911,FR
-2954824912,2954824919,CH
-2954824920,2954824943,FR
-2954824944,2954824959,BE
-2954824960,2954824975,FR
-2954824976,2954824991,ES
-2954824992,2954825023,FR
-2954825024,2954825039,NL
-2954825040,2954825063,FR
+2954824260,2954825063,FR
 2954825064,2954825067,ES
-2954825068,2954825159,FR
-2954825160,2954825167,GB
-2954825168,2954825183,FR
-2954825184,2954825191,GB
-2954825192,2954825271,FR
-2954825272,2954825275,ES
-2954825276,2954825315,FR
+2954825068,2954825151,FR
+2954825152,2954825159,NL
+2954825160,2954825315,FR
 2954825316,2954825319,ES
-2954825320,2954825327,FR
-2954825328,2954825335,DE
-2954825336,2954825343,FR
-2954825344,2954825351,DE
-2954825352,2954825375,FR
-2954825376,2954825383,DE
-2954825384,2954825403,FR
+2954825320,2954825403,FR
 2954825404,2954825407,ES
 2954825408,2954825535,FR
 2954825536,2954825539,ES
-2954825540,2954825551,FR
-2954825552,2954825567,ES
-2954825568,2954825759,FR
-2954825760,2954825791,LT
-2954825792,2954825927,FR
-2954825928,2954825931,CZ
-2954825932,2954826031,FR
+2954825540,2954826031,FR
 2954826032,2954826035,ES
-2954826036,2954826039,FR
-2954826040,2954826043,DE
-2954826044,2954826063,FR
-2954826064,2954826071,DE
-2954826072,2954826159,FR
+2954826036,2954826159,FR
 2954826160,2954826163,ES
-2954826164,2954826167,FR
-2954826168,2954826175,DE
-2954826176,2954826279,FR
-2954826280,2954826287,ES
-2954826288,2954826343,FR
-2954826344,2954826351,NL
-2954826352,2954826379,FR
-2954826380,2954826383,ES
-2954826384,2954826403,FR
-2954826404,2954826407,IT
-2954826408,2954826415,FR
-2954826416,2954826423,NL
-2954826424,2954826447,FR
-2954826448,2954826451,GB
-2954826452,2954826471,FR
-2954826472,2954826475,GB
-2954826476,2954826755,FR
+2954826164,2954826755,FR
 2954826756,2954826759,IT
 2954826760,2954826763,ES
 2954826764,2954826775,FR
 2954826776,2954826779,ES
-2954826780,2954826799,FR
-2954826800,2954826807,ES
-2954826808,2954827007,FR
-2954827008,2954827135,ES
-2954827136,2954827167,FR
-2954827168,2954827199,GB
-2954827200,2954827231,FR
-2954827232,2954827263,BE
-2954827264,2954827295,ES
-2954827296,2954827391,FR
-2954827392,2954827423,DE
-2954827424,2954827647,FR
-2954827648,2954827775,GB
-2954827776,2954827779,FR
-2954827780,2954827783,GB
-2954827784,2954827799,FR
+2954826780,2954827799,FR
 2954827800,2954827807,DE
-2954827808,2954827811,IT
-2954827812,2954827823,FR
-2954827824,2954827831,IE
-2954827832,2954827839,PT
-2954827840,2954827855,FR
-2954827856,2954827871,ES
-2954827872,2954827999,FR
-2954828000,2954828031,NL
-2954828032,2954828159,FR
+2954827808,2954828159,FR
 2954828160,2954828191,IT
-2954828192,2954828447,FR
-2954828448,2954828463,GB
-2954828464,2954828471,IT
-2954828472,2954828799,FR
-2954828800,2954828815,GB
-2954828816,2954828823,FR
-2954828824,2954828831,PT
-2954828832,2954828839,DE
-2954828840,2954828959,FR
-2954828960,2954828975,PL
-2954828976,2954829135,FR
+2954828192,2954829135,FR
 2954829136,2954829139,DE
-2954829140,2954829179,FR
-2954829180,2954829183,NL
-2954829184,2954829215,GB
-2954829216,2954829375,FR
-2954829376,2954829391,ES
-2954829392,2954829395,FR
+2954829140,2954829395,FR
 2954829396,2954829399,IT
 2954829400,2954829427,FR
 2954829428,2954829431,NL
-2954829432,2954829435,GB
-2954829436,2954829459,FR
-2954829460,2954829463,PL
-2954829464,2954829727,FR
-2954829728,2954829735,DE
-2954829736,2954829751,FR
+2954829432,2954829751,FR
 2954829752,2954829752,ES
 2954829753,2954829759,FR
 2954829760,2954829823,ES
 2954829824,2954829843,FR
 2954829844,2954829847,DE
-2954829848,2954829855,FR
-2954829856,2954829871,PL
-2954829872,2954829875,FR
+2954829848,2954829875,FR
 2954829876,2954829879,DE
-2954829880,2954829887,FR
-2954829888,2954829903,BE
-2954829904,2954829983,FR
-2954829984,2954830015,GB
-2954830016,2954830111,FR
-2954830112,2954830127,IE
-2954830128,2954830183,FR
+2954829880,2954830183,FR
 2954830184,2954830191,IT
-2954830192,2954830207,FR
-2954830208,2954830271,PL
-2954830272,2954830287,FR
-2954830288,2954830303,NL
-2954830304,2954830375,FR
-2954830376,2954830383,DE
-2954830384,2954830391,FR
-2954830392,2954830395,BE
+2954830192,2954830395,FR
 2954830396,2954830399,ES
-2954830400,2954830447,FR
-2954830448,2954830455,PL
-2954830456,2954830735,FR
+2954830400,2954830735,FR
 2954830736,2954830751,NL
-2954830752,2954830847,FR
-2954830848,2954830855,IT
-2954830856,2954830895,FR
-2954830896,2954830911,GB
-2954830912,2954830927,FR
-2954830928,2954830931,CZ
-2954830932,2954830975,FR
-2954830976,2954830983,IT
-2954830984,2954830991,FR
-2954830992,2954830995,IT
-2954830996,2954831247,FR
+2954830752,2954831247,FR
 2954831248,2954831251,ES
-2954831252,2954831255,FR
-2954831256,2954831263,DE
-2954831264,2954831327,FR
-2954831328,2954831331,LT
-2954831332,2954831503,FR
-2954831504,2954831511,NL
-2954831512,2954831519,FR
-2954831520,2954831535,BE
-2954831536,2954831543,FR
-2954831544,2954831551,ES
-2954831552,2954831611,FR
-2954831612,2954831615,ES
-2954831616,2954831667,FR
-2954831668,2954831671,CZ
-2954831672,2954831807,FR
+2954831252,2954831807,FR
 2954831808,2954831823,ES
-2954831824,2954831919,FR
-2954831920,2954831935,PL
-2954831936,2954832007,FR
-2954832008,2954832015,PL
-2954832016,2954832159,FR
+2954831824,2954832159,FR
 2954832160,2954832167,PT
-2954832168,2954832215,FR
-2954832216,2954832219,IE
-2954832220,2954832223,GB
-2954832224,2954832255,FR
-2954832256,2954832287,GB
-2954832288,2954832319,PT
-2954832320,2954832343,FR
+2954832168,2954832343,FR
 2954832344,2954832347,CH
-2954832348,2954832671,FR
-2954832672,2954832679,ES
-2954832680,2954832799,FR
-2954832800,2954832815,CZ
-2954832816,2954832823,PT
-2954832824,2954832887,FR
-2954832888,2954832891,IT
+2954832348,2954832891,FR
 2954832892,2954832895,ES
-2954832896,2954832927,GB
-2954832928,2954832959,DE
-2954832960,2954833039,FR
-2954833040,2954833047,CZ
-2954833048,2954833055,ES
-2954833056,2954833079,FR
-2954833080,2954833087,IT
-2954833088,2954833255,FR
-2954833256,2954833263,LT
-2954833264,2954833315,FR
-2954833316,2954833319,FI
-2954833320,2954833419,FR
+2954832896,2954833419,FR
 2954833420,2954833423,PL
-2954833424,2954833551,FR
-2954833552,2954833555,ES
+2954833424,2954833555,FR
 2954833556,2954833559,NL
 2954833560,2954833567,FR
 2954833568,2954833571,ES
-2954833572,2954833575,FR
-2954833576,2954833583,NL
-2954833584,2954833615,FR
-2954833616,2954833631,DE
-2954833632,2954833635,IT
-2954833636,2954833655,FR
+2954833572,2954833655,FR
 2954833656,2954833659,IT
-2954833660,2954833679,FR
-2954833680,2954833695,ES
-2954833696,2954833723,FR
-2954833724,2954833727,LT
-2954833728,2954833855,FR
-2954833856,2954833887,ES
-2954833888,2954833919,FR
-2954833920,2954833927,GB
-2954833928,2954834007,FR
-2954834008,2954834011,GB
-2954834012,2954834063,FR
-2954834064,2954834079,ES
-2954834080,2954834095,CH
-2954834096,2954834151,FR
-2954834152,2954834159,DE
-2954834160,2954834223,FR
-2954834224,2954834227,CH
-2954834228,2954834255,FR
-2954834256,2954834271,CH
-2954834272,2954834287,FR
-2954834288,2954834303,DE
-2954834304,2954834335,NL
-2954834336,2954834431,FR
-2954834432,2954834439,PL
-2954834440,2954834447,FR
-2954834448,2954834455,ES
-2954834456,2954834495,FR
-2954834496,2954834503,PT
-2954834504,2954834519,FR
+2954833660,2954834519,FR
 2954834520,2954834523,ES
-2954834524,2954834559,FR
-2954834560,2954834563,GB
-2954834564,2954834623,FR
-2954834624,2954834627,DE
-2954834628,2954834663,FR
-2954834664,2954834671,IE
+2954834524,2954834671,FR
 2954834672,2954834675,ES
-2954834676,2954834847,FR
-2954834848,2954834863,ES
-2954834864,2954834871,FR
-2954834872,2954834879,PT
-2954834880,2954834911,ES
-2954834912,2954835295,FR
+2954834676,2954834983,FR
+2954834984,2954834991,IT
+2954834992,2954835039,FR
+2954835040,2954835043,DE
+2954835044,2954835295,FR
 2954835296,2954835299,ES
-2954835300,2954835307,DE
-2954835308,2954835407,FR
-2954835408,2954835411,NL
-2954835412,2954835443,FR
+2954835300,2954835443,FR
 2954835444,2954835447,ES
 2954835448,2954835451,FR
 2954835452,2954835455,ES
-2954835456,2954835479,FR
-2954835480,2954835487,PL
-2954835488,2954835583,FR
-2954835584,2954835599,PT
-2954835600,2954835607,FR
-2954835608,2954835611,PL
-2954835612,2954835615,FR
-2954835616,2954835619,DE
-2954835620,2954836031,FR
-2954836032,2954836063,DE
-2954836064,2954836239,FR
-2954836240,2954836255,IE
-2954836256,2954836351,FR
-2954836352,2954836355,IE
-2954836356,2954836359,FR
-2954836360,2954836367,ES
-2954836368,2954836399,FR
-2954836400,2954836407,BE
-2954836408,2954836415,IT
-2954836416,2954836771,FR
-2954836772,2954836775,GB
-2954836776,2954836895,FR
-2954836896,2954836903,IE
-2954836904,2954837071,FR
+2954835456,2954837071,FR
 2954837072,2954837075,ES
-2954837076,2954837119,FR
-2954837120,2954837123,IE
-2954837124,2954837127,ES
-2954837128,2954837135,FR
-2954837136,2954837143,DE
-2954837144,2954837407,FR
-2954837408,2954837423,BE
-2954837424,2954837431,FR
-2954837432,2954837439,PL
-2954837440,2954837479,FR
-2954837480,2954837483,ES
-2954837484,2954837495,FR
-2954837496,2954837499,DE
-2954837500,2954837535,FR
-2954837536,2954837543,PT
-2954837544,2954837551,IT
-2954837552,2954837559,DE
-2954837560,2954837567,FR
-2954837568,2954837575,CZ
-2954837576,2954837583,FR
-2954837584,2954837591,IE
-2954837592,2954837615,FR
+2954837076,2954837615,FR
 2954837616,2954837619,IT
-2954837620,2954837663,FR
-2954837664,2954837667,IT
+2954837620,2954837667,FR
 2954837668,2954837671,ES
-2954837672,2954837691,FR
-2954837692,2954837695,ES
-2954837696,2954837827,FR
+2954837672,2954837827,FR
 2954837828,2954837831,DE
 2954837832,2954837867,FR
 2954837868,2954837871,ES
-2954837872,2954837919,FR
-2954837920,2954837935,GB
-2954837936,2954838115,FR
-2954838116,2954838119,DE
-2954838120,2954838127,FR
-2954838128,2954838131,FI
-2954838132,2954838135,FR
-2954838136,2954838143,GB
-2954838144,2954838151,PL
-2954838152,2954838199,FR
-2954838200,2954838203,CH
-2954838204,2954838239,FR
-2954838240,2954838255,IT
-2954838256,2954838263,IE
-2954838264,2954838379,FR
-2954838380,2954838383,IT
-2954838384,2954838415,FR
-2954838416,2954838423,ES
-2954838424,2954838511,FR
-2954838512,2954838519,NL
-2954838520,2954838539,FR
-2954838540,2954838543,PT
-2954838544,2954838559,FR
-2954838560,2954838575,IT
-2954838576,2954838599,FR
+2954837872,2954838103,FR
+2954838104,2954838107,DE
+2954838108,2954838599,FR
 2954838600,2954838607,GB
 2954838608,2954838615,NL
-2954838616,2954838863,FR
-2954838864,2954838871,GB
-2954838872,2954838879,FR
-2954838880,2954838895,ES
-2954838896,2954838935,FR
-2954838936,2954838939,PL
-2954838940,2954838943,CH
-2954838944,2954838959,IT
-2954838960,2954838975,DE
-2954838976,2954838999,FR
-2954839000,2954839007,DE
-2954839008,2954839063,FR
+2954838616,2954838911,FR
+2954838912,2954838915,DE
+2954838916,2954839063,FR
 2954839064,2954839067,IT
-2954839068,2954839211,FR
-2954839212,2954839215,ES
-2954839216,2954839239,FR
+2954839068,2954839239,FR
 2954839240,2954839243,IT
 2954839244,2954839267,FR
 2954839268,2954839271,ES
-2954839272,2954839343,FR
-2954839344,2954839351,FI
-2954839352,2954839403,FR
-2954839404,2954839407,IT
-2954839408,2954839423,ES
-2954839424,2954839471,FR
+2954839272,2954839471,FR
 2954839472,2954839479,BE
-2954839480,2954839487,ES
-2954839488,2954839523,FR
-2954839524,2954839527,BE
-2954839528,2954839551,FR
-2954839552,2954839583,PL
-2954839584,2954839647,FR
-2954839648,2954839679,GB
-2954839680,2954840175,FR
-2954840176,2954840179,GB
-2954840180,2954840183,FR
-2954840184,2954840191,PT
-2954840192,2954840255,FR
+2954839480,2954840255,FR
 2954840256,2954840447,GB
 2954840448,2954840515,FR
 2954840516,2954840519,NL
-2954840520,2954840575,FR
-2954840576,2954840591,DE
-2954840592,2954840619,FR
-2954840620,2954840623,ES
-2954840624,2954840639,IT
-2954840640,2954840903,FR
-2954840904,2954840911,GB
-2954840912,2954840927,FR
+2954840520,2954840731,FR
+2954840732,2954840735,IT
+2954840736,2954840927,FR
 2954840928,2954840931,DE
-2954840932,2954841111,FR
-2954841112,2954841119,BE
-2954841120,2954841183,FR
-2954841184,2954841199,NL
-2954841200,2954841207,PL
-2954841208,2954841275,FR
-2954841276,2954841279,DE
-2954841280,2954841299,FR
-2954841300,2954841303,BE
-2954841304,2954841567,FR
+2954840932,2954841567,FR
 2954841568,2954841583,ES
-2954841584,2954841595,FR
-2954841596,2954841599,ES
-2954841600,2954841639,FR
-2954841640,2954841643,GB
-2954841644,2954841667,FR
-2954841668,2954841671,DE
-2954841672,2954841707,FR
+2954841584,2954841707,FR
 2954841708,2954841711,NL
-2954841712,2954841715,FR
-2954841716,2954841719,IT
-2954841720,2954841727,FR
-2954841728,2954841759,CH
-2954841760,2954841807,FR
+2954841712,2954841807,FR
 2954841808,2954841815,NL
-2954841816,2954841855,FR
-2954841856,2954841871,IT
-2954841872,2954841903,FR
-2954841904,2954841907,BE
-2954841908,2954841983,FR
-2954841984,2954841999,ES
-2954842000,2954842043,FR
-2954842044,2954842047,CH
-2954842048,2954842111,FR
-2954842112,2954842143,PL
-2954842144,2954842207,FR
-2954842208,2954842239,DE
-2954842240,2954842403,FR
-2954842404,2954842407,BE
-2954842408,2954842415,FR
-2954842416,2954842419,CH
-2954842420,2954842431,FR
-2954842432,2954842439,GB
-2954842440,2954842463,FR
-2954842464,2954842467,NL
-2954842468,2954842559,FR
-2954842560,2954842575,CZ
-2954842576,2954842703,FR
-2954842704,2954842719,GB
-2954842720,2954842727,FR
-2954842728,2954842731,DE
-2954842732,2954842863,FR
-2954842864,2954842879,ES
-2954842880,2954842911,CZ
-2954842912,2954843055,FR
-2954843056,2954843071,PL
-2954843072,2954843103,FR
-2954843104,2954843135,IE
-2954843136,2954843183,FR
-2954843184,2954843187,ES
-2954843188,2954843319,FR
-2954843320,2954843323,GB
-2954843324,2954843407,FR
-2954843408,2954843415,PL
-2954843416,2954843419,BE
-2954843420,2954843423,PL
-2954843424,2954843503,FR
+2954841816,2954843503,FR
 2954843504,2954843507,ES
-2954843508,2954843591,FR
-2954843592,2954843595,BE
-2954843596,2954843599,ES
-2954843600,2954843603,BE
-2954843604,2954843723,FR
-2954843724,2954843727,DE
-2954843728,2954843767,FR
-2954843768,2954843771,ES
-2954843772,2954843871,FR
-2954843872,2954843887,DE
-2954843888,2954843895,FR
-2954843896,2954843899,DE
-2954843900,2954844031,FR
-2954844032,2954844039,NL
-2954844040,2954844047,IE
-2954844048,2954844147,FR
+2954843508,2954843759,FR
+2954843760,2954843771,ES
+2954843772,2954844147,FR
 2954844148,2954844151,DE
-2954844152,2954844155,ES
-2954844156,2954844183,FR
-2954844184,2954844187,DE
-2954844188,2954844191,FR
-2954844192,2954844223,IE
-2954844224,2954844239,FR
-2954844240,2954844255,IT
-2954844256,2954844447,FR
-2954844448,2954844455,PT
-2954844456,2954844551,FR
-2954844552,2954844559,PL
-2954844560,2954844607,FR
-2954844608,2954844639,ES
-2954844640,2954844731,FR
-2954844732,2954844735,PL
-2954844736,2954844991,FR
-2954844992,2954844999,GB
+2954844152,2954844999,FR
 2954845000,2954845003,ES
-2954845004,2954845023,FR
-2954845024,2954845039,DE
-2954845040,2954845083,FR
-2954845084,2954845087,IE
-2954845088,2954845091,FR
-2954845092,2954845095,CZ
-2954845096,2954845111,FR
-2954845112,2954845119,DE
-2954845120,2954845135,GB
-2954845136,2954845159,FR
-2954845160,2954845167,CZ
-2954845168,2954845391,FR
-2954845392,2954845407,PL
-2954845408,2954845695,FR
-2954845696,2954845759,BE
-2954845760,2954845791,DE
-2954845792,2954845999,FR
-2954846000,2954846015,PT
-2954846016,2954846047,FR
-2954846048,2954846055,NL
-2954846056,2954846063,FR
-2954846064,2954846079,ES
-2954846080,2954846095,FR
+2954845004,2954846095,FR
 2954846096,2954846103,NL
 2954846104,2954846107,FR
 2954846108,2954846111,ES
-2954846112,2954846123,FR
-2954846124,2954846127,IT
-2954846128,2954846139,FR
+2954846112,2954846139,FR
 2954846140,2954846143,ES
-2954846144,2954846175,FR
-2954846176,2954846191,NL
-2954846192,2954854471,FR
-2954854472,2954854475,CH
-2954854476,2954854495,FR
-2954854496,2954854511,IT
-2954854512,2954854671,FR
-2954854672,2954854687,ES
-2954854688,2954854815,FR
-2954854816,2954854847,PL
-2954854848,2954854871,FR
+2954846144,2954854871,FR
 2954854872,2954854875,IT
-2954854876,2954854975,FR
-2954854976,2954854991,PL
-2954854992,2954855007,IT
-2954855008,2954855023,FR
-2954855024,2954855039,DE
-2954855040,2954855075,FR
+2954854876,2954855075,FR
 2954855076,2954855079,ES
-2954855080,2954855087,FR
-2954855088,2954855091,PL
-2954855092,2954855507,FR
+2954855080,2954855507,FR
 2954855508,2954855511,DE
 2954855512,2954855515,FR
 2954855516,2954855519,ES
 2954855520,2954855527,FR
 2954855528,2954855531,ES
-2954855532,2954855615,FR
-2954855616,2954855619,DE
-2954855620,2954855639,FR
-2954855640,2954855643,DE
-2954855644,2954855647,ES
-2954855648,2954855651,CZ
-2954855652,2954855727,FR
-2954855728,2954855743,DE
-2954855744,2954856063,FR
-2954856064,2954856067,LT
-2954856068,2954856071,FR
-2954856072,2954856079,GB
-2954856080,2954856111,FR
-2954856112,2954856115,ES
-2954856116,2954856175,FR
-2954856176,2954856179,DE
+2954855532,2954856179,FR
 2954856180,2954856183,ES
-2954856184,2954856543,FR
-2954856544,2954856547,CH
-2954856548,2954856551,CZ
-2954856552,2954856563,FR
-2954856564,2954856567,DE
-2954856568,2954856571,CH
-2954856572,2954856611,FR
-2954856612,2954856615,IT
-2954856616,2954856619,FR
-2954856620,2954856623,ES
-2954856624,2954856975,FR
-2954856976,2954856979,GB
-2954856980,2954856983,LT
-2954856984,2954856999,FR
-2954857000,2954857003,DE
-2954857004,2954857087,FR
-2954857088,2954857091,IT
-2954857092,2954857095,FR
-2954857096,2954857099,LT
-2954857100,2954857115,FR
+2954856184,2954857115,FR
 2954857116,2954857119,NL
-2954857120,2954857183,FR
-2954857184,2954857215,PL
-2954857216,2954857703,FR
-2954857704,2954857707,ES
-2954857708,2954857999,FR
-2954858000,2954858015,IE
-2954858016,2954858059,FR
-2954858060,2954858063,BE
-2954858064,2954858367,FR
-2954858368,2954858375,NL
-2954858376,2954858379,ES
-2954858380,2954858383,IE
-2954858384,2954858419,FR
-2954858420,2954858423,GB
-2954858424,2954858427,FR
-2954858428,2954858431,BE
-2954858432,2954858483,FR
-2954858484,2954858487,GB
-2954858488,2954858819,FR
+2954857120,2954858819,FR
 2954858820,2954858823,IT
-2954858824,2954858827,ES
-2954858828,2954858831,FR
-2954858832,2954858847,PL
-2954858848,2954859043,FR
+2954858824,2954858911,FR
+2954858912,2954858943,ES
+2954858944,2954859043,FR
 2954859044,2954859047,ES
-2954859048,2954859119,FR
-2954859120,2954859123,CZ
-2954859124,2954859239,FR
-2954859240,2954859243,PL
-2954859244,2954859311,FR
-2954859312,2954859315,ES
-2954859316,2954859323,FR
+2954859048,2954859323,FR
 2954859324,2954859327,ES
-2954859328,2954859583,FR
-2954859584,2954859615,DE
-2954859616,2954859679,FR
-2954859680,2954859695,PT
-2954859696,2954859711,FR
-2954859712,2954859727,PL
-2954859728,2954859743,FR
-2954859744,2954859775,ES
-2954859776,2954859831,FR
-2954859832,2954859839,ES
-2954859840,2954859871,FR
+2954859328,2954859871,FR
 2954859872,2954859903,ES
-2954859904,2954859955,FR
-2954859956,2954859959,GB
-2954859960,2954860223,FR
-2954860224,2954860227,PL
-2954860228,2954860231,FR
-2954860232,2954860239,IT
-2954860240,2954860255,FR
-2954860256,2954860259,PL
-2954860260,2954860263,FR
-2954860264,2954860271,GB
-2954860272,2954860303,FR
-2954860304,2954860319,FI
-2954860320,2954860327,FR
-2954860328,2954860335,NL
-2954860336,2954860367,FR
-2954860368,2954860383,PL
-2954860384,2954860415,FR
-2954860416,2954860423,NL
-2954860424,2954860427,FR
-2954860428,2954860431,BE
-2954860432,2954860447,FR
-2954860448,2954860455,GB
-2954860456,2954860535,FR
-2954860536,2954860539,DE
-2954860540,2954860671,FR
-2954860672,2954860687,DE
-2954860688,2954860695,GB
-2954860696,2954860703,CZ
-2954860704,2954860735,FR
-2954860736,2954860751,PL
-2954860752,2954860767,FR
-2954860768,2954860783,ES
-2954860784,2954860791,FR
-2954860792,2954860799,IT
-2954860800,2954860991,FR
-2954860992,2954861007,DE
-2954861008,2954861119,FR
-2954861120,2954861135,GB
-2954861136,2954861167,FR
-2954861168,2954861183,BE
-2954861184,2954861191,PL
-2954861192,2954861423,FR
-2954861424,2954861431,CZ
-2954861432,2954861619,FR
-2954861620,2954861623,IT
-2954861624,2954861635,FR
-2954861636,2954861639,ES
-2954861640,2954861671,FR
-2954861672,2954861675,ES
-2954861676,2954861759,FR
-2954861760,2954861763,ES
-2954861764,2954861839,FR
-2954861840,2954861847,IT
-2954861848,2954861875,FR
+2954859904,2954861623,FR
+2954861624,2954861631,IT
+2954861632,2954861875,FR
 2954861876,2954861879,CH
-2954861880,2954861919,FR
-2954861920,2954861923,CZ
-2954861924,2954861947,FR
-2954861948,2954861951,FI
-2954861952,2954861983,FR
-2954861984,2954861987,IE
-2954861988,2954861995,FR
-2954861996,2954861999,ES
-2954862000,2954862047,FR
-2954862048,2954862079,ES
-2954862080,2954862207,FR
-2954862208,2954862211,ES
-2954862212,2954862247,FR
-2954862248,2954862255,ES
-2954862256,2954862367,FR
-2954862368,2954862375,DE
-2954862376,2954862383,FR
-2954862384,2954862391,DE
-2954862392,2954862415,FR
+2954861880,2954862415,FR
 2954862416,2954862419,ES
-2954862420,2954862423,FR
-2954862424,2954862431,PL
-2954862432,2954862471,FR
-2954862472,2954862479,FI
-2954862480,2954863615,FR
+2954862420,2954863615,FR
 2954863616,2954864639,DE
 2954864640,2954865663,IT
 2954865664,2954866687,ES
-2954866688,2954870799,FR
+2954866688,2954867041,FR
+2954867042,2954867043,PT
+2954867044,2954870799,FR
 2954870800,2954870803,ES
-2954870804,2954870843,FR
+2954870804,2954870839,FR
+2954870840,2954870843,IT
 2954870844,2954870847,ES
-2954870848,2954870871,FR
-2954870872,2954870875,ES
-2954870876,2954870903,FR
+2954870848,2954870903,FR
 2954870904,2954870907,ES
-2954870908,2954871391,FR
-2954871392,2954871423,DE
-2954871424,2954871615,FR
-2954871616,2954871623,PT
-2954871624,2954871627,FR
-2954871628,2954871631,IT
-2954871632,2954871635,FR
-2954871636,2954871639,IT
-2954871640,2954871743,FR
-2954871744,2954871759,CH
-2954871760,2954871839,FR
-2954871840,2954871871,NL
-2954871872,2954871887,FR
-2954871888,2954871895,BE
-2954871896,2954872323,FR
-2954872324,2954872327,IT
-2954872328,2954872383,FR
-2954872384,2954872415,IE
-2954872416,2954872447,FR
-2954872448,2954872479,CH
-2954872480,2954872559,FR
-2954872560,2954872567,NL
-2954872568,2954872587,FR
-2954872588,2954872591,LT
-2954872592,2954872679,FR
-2954872680,2954872687,ES
-2954872688,2954872863,FR
-2954872864,2954872895,ES
-2954872896,2954872959,FR
-2954872960,2954872975,IT
-2954872976,2954872979,FR
-2954872980,2954872983,GB
-2954872984,2954872987,FR
-2954872988,2954872991,FI
-2954872992,2954873023,PL
-2954873024,2954873087,BE
-2954873088,2954873391,FR
-2954873392,2954873407,NL
-2954873408,2954873451,FR
-2954873452,2954873455,GB
-2954873456,2954873551,FR
-2954873552,2954873567,PL
-2954873568,2954873583,FR
-2954873584,2954873591,DE
-2954873592,2954873647,FR
-2954873648,2954873663,IE
-2954873664,2954873783,FR
-2954873784,2954873787,PT
-2954873788,2954873839,FR
-2954873840,2954873847,ES
-2954873848,2954873851,CZ
-2954873852,2954873903,FR
-2954873904,2954873911,IT
-2954873912,2954874123,FR
-2954874124,2954874127,LT
-2954874128,2954874135,FR
-2954874136,2954874143,FI
-2954874144,2954874151,NL
-2954874152,2954874319,FR
-2954874320,2954874335,IT
-2954874336,2954874355,FR
-2954874356,2954874359,IT
-2954874360,2954874379,FR
-2954874380,2954874383,CZ
-2954874384,2954874391,FR
-2954874392,2954874399,DE
-2954874400,2954874419,FR
-2954874420,2954874423,NL
-2954874424,2954874799,FR
-2954874800,2954874815,GB
-2954874816,2954874827,FR
-2954874828,2954874831,ES
-2954874832,2954874867,FR
-2954874868,2954874871,IT
-2954874872,2954874927,FR
-2954874928,2954874943,IE
-2954874944,2954875023,FR
-2954875024,2954875039,PL
-2954875040,2954875047,NL
-2954875048,2954875055,FR
-2954875056,2954875071,CZ
-2954875072,2954875103,FR
-2954875104,2954875135,NL
-2954875136,2954875167,GB
-2954875168,2954875183,FR
-2954875184,2954875191,GB
-2954875192,2954875203,FR
-2954875204,2954875207,CH
-2954875208,2954875231,FR
-2954875232,2954875247,ES
-2954875248,2954875279,FR
-2954875280,2954875287,PL
-2954875288,2954875295,GB
-2954875296,2954875311,FR
-2954875312,2954875327,IT
-2954875328,2954875379,FR
-2954875380,2954875383,DE
-2954875384,2954875391,FR
-2954875392,2954875455,GB
-2954875456,2954875471,FR
-2954875472,2954875479,FI
-2954875480,2954875695,FR
-2954875696,2954875711,PL
-2954875712,2954875779,FR
-2954875780,2954875783,ES
-2954875784,2954875871,FR
-2954875872,2954875879,BE
+2954870908,2954875879,FR
 2954875880,2954875883,ES
-2954875884,2954875911,FR
-2954875912,2954875919,PL
-2954875920,2954876055,FR
-2954876056,2954876063,IE
-2954876064,2954876111,FR
-2954876112,2954876119,ES
-2954876120,2954876399,FR
-2954876400,2954876407,IT
-2954876408,2954876447,FR
-2954876448,2954876455,CH
-2954876456,2954876459,DE
-2954876460,2954876591,FR
-2954876592,2954876607,CH
-2954876608,2954876639,PT
-2954876640,2954876871,FR
+2954875884,2954876871,FR
 2954876872,2954876875,ES
 2954876876,2954876887,FR
 2954876888,2954876891,ES
-2954876892,2954876903,FR
-2954876904,2954876911,IT
-2954876912,2954876927,FR
-2954876928,2954876943,PL
-2954876944,2954877103,FR
+2954876892,2954877103,FR
 2954877104,2954877107,PL
-2954877108,2954877111,FR
-2954877112,2954877119,NL
-2954877120,2954877151,FR
-2954877152,2954877159,PL
-2954877160,2954877163,FR
+2954877108,2954877163,FR
 2954877164,2954877167,ES
-2954877168,2954877279,FR
-2954877280,2954877311,NL
-2954877312,2954877535,FR
-2954877536,2954877539,IT
-2954877540,2954877599,FR
-2954877600,2954877615,IT
-2954877616,2954877819,FR
+2954877168,2954877819,FR
 2954877820,2954877823,ES
-2954877824,2954877983,FR
-2954877984,2954877991,DE
-2954877992,2954878031,FR
-2954878032,2954878035,IT
-2954878036,2954878095,FR
-2954878096,2954878111,ES
-2954878112,2954878143,FR
-2954878144,2954878207,ES
-2954878208,2954878463,IE
-2954878464,2954878495,FR
-2954878496,2954878499,ES
-2954878500,2954878511,FR
-2954878512,2954878527,ES
-2954878528,2954878591,FR
-2954878592,2954878607,DE
-2954878608,2954878707,FR
-2954878708,2954878711,ES
-2954878712,2954878815,FR
-2954878816,2954878847,LT
-2954878848,2954878863,FR
-2954878864,2954878871,GB
-2954878872,2954878887,FR
-2954878888,2954878891,PL
-2954878892,2954878907,FR
+2954877824,2954878907,FR
 2954878908,2954878911,ES
 2954878912,2954887167,FR
 2954887168,2954891263,UA
@@ -51929,11 +51125,11 @@
 2955837440,2955845631,IR
 2955845632,2955853823,GB
 2955853824,2955870207,CH
-2955870208,2955935743,UA
+2955870208,2955935743,SA
 2955935744,2956230655,RU
 2956230656,2956238847,SI
 2956238848,2956242943,ES
-2956242944,2956244991,SE
+2956242944,2956244991,JO
 2956244992,2956245247,FR
 2956245248,2956245503,RO
 2956245504,2956245759,GB
@@ -52037,9 +51233,7 @@
 2957068288,2957070335,LU
 2957070336,2957074431,IT
 2957074432,2957082623,RU
-2957082624,2957090815,DE
-2957090816,2957094911,AT
-2957094912,2957099007,DE
+2957082624,2957099007,DE
 2957099008,2957100031,CH
 2957100032,2957104639,DE
 2957104640,2957105663,US
@@ -52050,8 +51244,7 @@
 2957193216,2957195263,RU
 2957195264,2957197311,PS
 2957197312,2957201407,IR
-2957201408,2957201423,GB
-2957201424,2957202679,US
+2957201408,2957202679,US
 2957202680,2957202680,PT
 2957202681,2957203455,US
 2957203456,2957205503,FR
@@ -52071,9 +51264,7 @@
 2957240320,2957242367,BG
 2957242368,2957244415,RU
 2957244416,2957246463,HU
-2957246464,2957311999,SE
-2957312000,2957377535,RU
-2957377536,2957508607,SE
+2957246464,2957508607,SE
 2957508608,2957574143,FI
 2957574144,2957639679,GE
 2957639680,2957641727,GB
@@ -52151,11 +51342,9 @@
 2959278080,2959282175,RU
 2959282176,2959290367,RO
 2959290368,2959292415,PL
-2959292416,2959302655,RU
-2959302656,2959308877,UA
-2959308878,2959308878,RU
-2959308879,2959310847,UA
-2959310848,2959343615,RU
+2959292416,2959309055,RU
+2959309056,2959309311,UA
+2959309312,2959343615,RU
 2959343616,2959351807,UA
 2959351808,2959353855,DE
 2959353856,2959355903,RU
@@ -52227,7 +51416,7 @@
 2959753216,2959761407,RU
 2959761408,2959763455,LV
 2959763456,2959765503,PL
-2959765504,2959767551,RU
+2959765504,2959767551,GB
 2959767552,2959769599,RS
 2959769600,2959777791,RU
 2959777792,2959783935,LV
@@ -52256,9 +51445,7 @@
 2959884288,2959892479,KZ
 2959892480,2959900671,UA
 2959900672,2959902719,PL
-2959902720,2959915007,RU
-2959915008,2959917055,UA
-2959917056,2959925247,RU
+2959902720,2959925247,RU
 2959925248,2959927295,RO
 2959927296,2959929343,UA
 2959929344,2959935487,RU
@@ -52314,9 +51501,7 @@
 2960152576,2960158719,RU
 2960158720,2960160767,PL
 2960160768,2960162815,UA
-2960162816,2960168959,RU
-2960168960,2960171007,CZ
-2960171008,2960175103,RU
+2960162816,2960175103,RU
 2960175104,2960179199,SK
 2960179200,2960211967,RU
 2960220160,2960224255,RO
@@ -52502,7 +51687,9 @@
 2961089536,2961090559,KG
 2961090560,2961102847,RO
 2961102848,2961103871,DE
-2961103872,2961108991,RO
+2961103872,2961104895,RO
+2961104896,2961106943,GB
+2961106944,2961108991,RO
 2961108992,2961111039,GB
 2961111040,2961112063,PL
 2961112064,2961113087,RO
@@ -52515,12 +51702,14 @@
 2966159360,2966290431,AE
 2966290432,2966421503,IT
 2966421504,2966945791,RU
-2966945792,2967273471,TR
+2966945792,2967268351,TR
+2967268352,2967269375,IN
+2967269376,2967273471,TR
 2967273472,2967277567,RU
 2967277568,2967281663,IR
 2967281664,2967283711,PT
 2967283712,2967285759,DE
-2967285760,2967287807,UA
+2967285760,2967287807,IT
 2967287808,2967289855,GB
 2967289856,2967291903,IR
 2967291904,2967293951,RS
@@ -52674,8 +51863,7 @@
 2987642880,2987651071,DE
 2987651072,2987655167,RU
 2987655168,2987659263,DE
-2987659264,2987661311,SI
-2987661312,2987663359,GB
+2987659264,2987661311,BA
 2987663360,2987665407,IT
 2987665408,2987667455,RU
 2987667456,2987669503,FR
@@ -52802,1844 +51990,296 @@
 2988179456,2988411647,SE
 2988411648,2988411775,DE
 2988411776,2988441599,SE
-2988441600,2988441603,ES
-2988441604,2988441607,FR
-2988441608,2988441615,DE
-2988441616,2988441815,FR
-2988441816,2988441819,LT
-2988441820,2988441887,FR
-2988441888,2988441895,NL
-2988441896,2988441899,FR
-2988441900,2988441903,IT
-2988441904,2988441919,FR
-2988441920,2988441923,ES
-2988441924,2988441927,FR
-2988441928,2988441931,DE
-2988441932,2988441951,FR
-2988441952,2988441967,IE
-2988441968,2988441975,FR
-2988441976,2988441979,GB
-2988441980,2988441983,FR
-2988441984,2988441991,DE
-2988441992,2988442075,FR
+2988441600,2988442075,FR
 2988442076,2988442079,ES
-2988442080,2988442087,PT
-2988442088,2988442111,FR
-2988442112,2988442143,CZ
-2988442144,2988442175,CH
-2988442176,2988442207,BE
-2988442208,2988442239,GB
-2988442240,2988442447,FR
-2988442448,2988442463,PL
-2988442464,2988442495,FR
-2988442496,2988442503,BE
-2988442504,2988442687,FR
-2988442688,2988442703,IT
-2988442704,2988442751,FR
-2988442752,2988442783,PT
-2988442784,2988442815,FR
-2988442816,2988442831,PL
-2988442832,2988442847,FR
+2988442080,2988442847,FR
 2988442848,2988442863,IT
-2988442864,2988442871,FR
-2988442872,2988442879,DE
-2988442880,2988442911,FR
-2988442912,2988442919,GB
-2988442920,2988442923,FR
-2988442924,2988442927,PT
-2988442928,2988442943,FR
-2988442944,2988442975,GB
-2988442976,2988443071,FR
-2988443072,2988443087,BE
-2988443088,2988443447,FR
-2988443448,2988443455,DE
-2988443456,2988443647,FR
-2988443648,2988443651,NL
-2988443652,2988443927,FR
-2988443928,2988443935,IT
-2988443936,2988444203,FR
-2988444204,2988444207,DE
-2988444208,2988444208,PL
+2988442864,2988444208,FR
 2988444209,2988444209,FI
-2988444210,2988444211,PL
-2988444212,2988444287,FR
-2988444288,2988444415,GB
-2988444416,2988444543,PT
-2988444544,2988444575,FR
-2988444576,2988444607,FI
-2988444608,2988444639,ES
-2988444640,2988444671,FR
+2988444210,2988444671,FR
 2988444672,2988444679,ES
-2988444680,2988444703,FR
-2988444704,2988444719,GB
-2988444720,2988444967,FR
-2988444968,2988444975,IT
-2988444976,2988445279,FR
-2988445280,2988445287,IT
-2988445288,2988445295,GB
-2988445296,2988445375,FR
-2988445376,2988445391,GB
-2988445392,2988446275,FR
-2988446276,2988446279,ES
-2988446280,2988446431,FR
-2988446432,2988446463,IT
-2988446464,2988447327,FR
-2988447328,2988447359,IT
-2988447360,2988447423,FR
-2988447424,2988447487,PT
-2988447488,2988447507,FR
-2988447508,2988447511,NL
-2988447512,2988447519,FR
-2988447520,2988447535,IT
-2988447536,2988447551,FR
-2988447552,2988447583,DE
-2988447584,2988447599,NL
-2988447600,2988447615,FR
-2988447616,2988447743,PT
-2988447744,2988447747,DE
-2988447748,2988447959,FR
-2988447960,2988447967,IT
-2988447968,2988448031,FR
-2988448032,2988448063,GB
-2988448064,2988448127,FR
-2988448128,2988448255,IT
-2988448256,2988448271,FR
-2988448272,2988448287,NL
-2988448288,2988448567,FR
-2988448568,2988448575,PL
-2988448576,2988448639,FR
-2988448640,2988448671,NL
-2988448672,2988448687,CZ
-2988448688,2988448695,FR
-2988448696,2988448703,DE
-2988448704,2988448767,PT
-2988448768,2988448799,FR
+2988444680,2988448799,FR
 2988448800,2988448815,ES
-2988448816,2988448907,FR
-2988448908,2988448911,IT
-2988448912,2988449055,FR
-2988449056,2988449071,ES
-2988449072,2988449183,FR
-2988449184,2988449191,PL
-2988449192,2988449199,FI
-2988449200,2988449215,ES
-2988449216,2988449567,FR
-2988449568,2988449575,GB
-2988449576,2988451839,FR
+2988448816,2988449207,FR
+2988449208,2988449215,ES
+2988449216,2988451839,FR
 2988451840,2988453887,BE
 2988453888,2988454399,GB
 2988454400,2988454655,FR
 2988454656,2988457983,GB
-2988457984,2988458047,FR
-2988458048,2988458063,DE
-2988458064,2988458299,FR
-2988458300,2988458303,ES
-2988458304,2988458319,FR
+2988457984,2988458319,FR
 2988458320,2988458327,NL
-2988458328,2988458399,FR
-2988458400,2988458431,NL
-2988458432,2988458763,FR
-2988458764,2988458767,DE
-2988458768,2988459023,FR
-2988459024,2988459039,ES
-2988459040,2988459047,IT
-2988459048,2988459055,FR
-2988459056,2988459071,ES
-2988459072,2988459107,FR
-2988459108,2988459111,PL
-2988459112,2988459119,FR
+2988458328,2988459119,FR
 2988459120,2988459127,IT
 2988459128,2988459135,PL
-2988459136,2988459183,FR
-2988459184,2988459199,CZ
-2988459200,2988459243,FR
-2988459244,2988459247,ES
-2988459248,2988459251,DE
-2988459252,2988459439,FR
-2988459440,2988459455,GB
-2988459456,2988459535,FR
+2988459136,2988459535,FR
 2988459536,2988459539,ES
-2988459540,2988459543,BE
-2988459544,2988459603,FR
-2988459604,2988459607,ES
-2988459608,2988459631,FR
-2988459632,2988459639,DE
-2988459640,2988459643,IT
-2988459644,2988459679,FR
+2988459540,2988459679,FR
 2988459680,2988459683,ES
 2988459684,2988459687,FR
 2988459688,2988459691,PL
-2988459692,2988459695,ES
-2988459696,2988459719,FR
-2988459720,2988459723,IT
-2988459724,2988459759,FR
-2988459760,2988459767,DE
-2988459768,2988459863,FR
+2988459692,2988459863,FR
 2988459864,2988459867,ES
-2988459868,2988459903,FR
-2988459904,2988459967,PL
-2988459968,2988460031,FR
-2988460032,2988460063,DE
-2988460064,2988460115,FR
-2988460116,2988460119,DE
-2988460120,2988460123,IT
-2988460124,2988460191,FR
-2988460192,2988460207,BE
-2988460208,2988460223,IT
-2988460224,2988460311,FR
-2988460312,2988460319,IT
-2988460320,2988460371,FR
-2988460372,2988460375,DE
-2988460376,2988460383,FR
-2988460384,2988460399,ES
-2988460400,2988460547,FR
-2988460548,2988460551,NL
-2988460552,2988460559,FR
-2988460560,2988460575,CZ
+2988459868,2988460575,FR
 2988460576,2988460591,PT
-2988460592,2988460631,FR
-2988460632,2988460635,DE
-2988460636,2988460647,FR
-2988460648,2988460651,GB
+2988460592,2988460651,FR
 2988460652,2988460655,ES
-2988460656,2988460703,FR
-2988460704,2988460711,PL
-2988460712,2988460735,FR
-2988460736,2988460751,GB
-2988460752,2988460755,FR
-2988460756,2988460759,BE
-2988460760,2988460767,FR
-2988460768,2988460799,GB
-2988460800,2988460895,FR
-2988460896,2988460927,PT
-2988460928,2988460959,FR
-2988460960,2988460975,NL
-2988460976,2988461003,FR
-2988461004,2988461007,ES
-2988461008,2988461031,FR
-2988461032,2988461035,GB
-2988461036,2988461183,FR
-2988461184,2988461215,IE
-2988461216,2988461255,FR
-2988461256,2988461259,ES
-2988461260,2988461263,DE
-2988461264,2988461279,FR
-2988461280,2988461295,IT
-2988461296,2988461299,PL
-2988461300,2988461307,FR
-2988461308,2988461311,NL
-2988461312,2988461375,PL
-2988461376,2988461391,FR
-2988461392,2988461399,DE
-2988461400,2988461407,PL
-2988461408,2988461415,NL
-2988461416,2988461523,FR
-2988461524,2988461527,LT
-2988461528,2988461595,FR
-2988461596,2988461599,CH
-2988461600,2988461631,FR
-2988461632,2988461695,PL
-2988461696,2988461703,FR
+2988460656,2988461703,FR
 2988461704,2988461707,NL
-2988461708,2988461815,FR
-2988461816,2988461819,GB
-2988461820,2988461871,FR
-2988461872,2988461879,PT
-2988461880,2988461907,FR
-2988461908,2988461911,ES
-2988461912,2988462127,FR
-2988462128,2988462131,CH
-2988462132,2988462171,FR
-2988462172,2988462175,IT
-2988462176,2988462195,FR
-2988462196,2988462199,IT
-2988462200,2988462311,FR
-2988462312,2988462319,DE
-2988462320,2988462323,FR
-2988462324,2988462327,IE
-2988462328,2988462603,FR
+2988461708,2988462603,FR
 2988462604,2988462607,ES
-2988462608,2988462623,FR
-2988462624,2988462639,CH
-2988462640,2988462747,FR
+2988462608,2988462747,FR
 2988462748,2988462751,ES
-2988462752,2988463131,FR
-2988463132,2988463135,ES
-2988463136,2988463143,IT
-2988463144,2988463167,FR
-2988463168,2988463199,PL
-2988463200,2988463203,ES
-2988463204,2988463207,FR
-2988463208,2988463211,NL
-2988463212,2988463247,FR
-2988463248,2988463251,PL
-2988463252,2988463263,FR
-2988463264,2988463279,GB
-2988463280,2988463319,FR
-2988463320,2988463323,FI
-2988463324,2988463615,FR
-2988463616,2988463623,GB
-2988463624,2988463627,FR
-2988463628,2988463631,ES
-2988463632,2988463791,FR
-2988463792,2988463799,ES
-2988463800,2988463915,FR
+2988462752,2988463915,FR
 2988463916,2988463919,ES
 2988463920,2988463999,FR
 2988464000,2988464007,IE
 2988464008,2988464015,LT
-2988464016,2988464059,FR
-2988464060,2988464063,ES
-2988464064,2988464359,FR
+2988464016,2988464359,FR
 2988464360,2988464360,NL
-2988464361,2988464543,FR
-2988464544,2988464551,NL
-2988464552,2988464591,FR
-2988464592,2988464595,BE
-2988464596,2988464611,FR
+2988464361,2988464611,FR
 2988464612,2988464615,IT
-2988464616,2988464619,FR
-2988464620,2988464623,LT
+2988464616,2988464623,FR
 2988464624,2988464627,ES
-2988464628,2988464927,FR
-2988464928,2988464943,DE
-2988464944,2988464947,BE
-2988464948,2988464951,FR
-2988464952,2988464955,IE
-2988464956,2988464959,FR
-2988464960,2988464975,ES
-2988464976,2988464991,FR
-2988464992,2988465023,DE
-2988465024,2988465151,FR
-2988465152,2988465215,GB
+2988464628,2988465215,FR
 2988465216,2988465219,ES
-2988465220,2988465231,FR
-2988465232,2988465239,IT
-2988465240,2988465279,FR
+2988465220,2988465279,FR
 2988465280,2988465295,DE
-2988465296,2988465307,FR
-2988465308,2988465311,DE
-2988465312,2988465359,FR
-2988465360,2988465363,GB
-2988465364,2988465391,FR
-2988465392,2988465399,CH
-2988465400,2988465559,FR
+2988465296,2988465559,FR
 2988465560,2988465563,ES
-2988465564,2988465567,FR
-2988465568,2988465571,ES
-2988465572,2988465587,FR
-2988465588,2988465591,IT
-2988465592,2988465615,FR
-2988465616,2988465619,IT
-2988465620,2988465623,DE
-2988465624,2988465919,FR
-2988465920,2988465983,ES
-2988465984,2988476415,FR
+2988465564,2988476415,FR
 2988476416,2988478463,IT
-2988478464,2988478487,FR
-2988478488,2988478495,PL
-2988478496,2988478499,ES
-2988478500,2988478579,FR
+2988478464,2988478579,FR
 2988478580,2988478583,DE
 2988478584,2988478587,FR
 2988478588,2988478591,DE
-2988478592,2988478683,FR
-2988478684,2988478687,BE
-2988478688,2988478863,FR
-2988478864,2988478871,IE
-2988478872,2988478879,FR
-2988478880,2988478911,GB
-2988478912,2988478947,FR
-2988478948,2988478951,CZ
-2988478952,2988479003,FR
+2988478592,2988479003,FR
 2988479004,2988479007,ES
-2988479008,2988479055,FR
-2988479056,2988479071,ES
-2988479072,2988479075,BE
-2988479076,2988479103,FR
-2988479104,2988479107,IE
-2988479108,2988479119,FR
-2988479120,2988479135,NL
-2988479136,2988479143,FR
-2988479144,2988479147,DE
-2988479148,2988479159,FR
-2988479160,2988479167,ES
-2988479168,2988479199,FR
-2988479200,2988479231,PL
-2988479232,2988479323,FR
-2988479324,2988479327,PL
-2988479328,2988479343,FR
-2988479344,2988479359,NL
-2988479360,2988479519,FR
-2988479520,2988479535,DE
-2988479536,2988479567,FR
-2988479568,2988479575,DE
-2988479576,2988479711,FR
-2988479712,2988479743,CH
-2988479744,2988479783,FR
-2988479784,2988479787,ES
-2988479788,2988479791,FR
+2988479008,2988479791,FR
 2988479792,2988479807,GB
-2988479808,2988480007,FR
-2988480008,2988480011,CH
-2988480012,2988480031,FR
-2988480032,2988480047,DE
-2988480048,2988480095,FR
-2988480096,2988480111,IT
-2988480112,2988480143,FR
-2988480144,2988480147,ES
-2988480148,2988480155,FR
-2988480156,2988480159,BE
-2988480160,2988480223,FR
-2988480224,2988480227,NL
-2988480228,2988480231,IE
-2988480232,2988480235,FR
-2988480236,2988480239,IT
-2988480240,2988480431,FR
-2988480432,2988480435,BE
-2988480436,2988480503,FR
-2988480504,2988480511,DE
-2988480512,2988480783,FR
-2988480784,2988480799,NL
-2988480800,2988480895,FR
-2988480896,2988480903,DE
-2988480904,2988480915,ES
-2988480916,2988480923,FR
-2988480924,2988480927,ES
-2988480928,2988481039,FR
-2988481040,2988481047,GB
-2988481048,2988481063,FR
-2988481064,2988481067,GB
-2988481068,2988481223,FR
-2988481224,2988481231,BE
-2988481232,2988481599,FR
-2988481600,2988481663,NL
-2988481664,2988481679,FR
-2988481680,2988481695,IT
-2988481696,2988481775,FR
-2988481776,2988481779,IE
-2988481780,2988482031,FR
-2988482032,2988482035,ES
-2988482036,2988482111,FR
+2988479808,2988482111,FR
 2988482112,2988482143,DE
-2988482144,2988482163,FR
-2988482164,2988482167,IT
-2988482168,2988482175,FR
-2988482176,2988482191,ES
-2988482192,2988482291,FR
-2988482292,2988482295,IE
-2988482296,2988482315,FR
-2988482316,2988482335,IT
-2988482336,2988482399,FR
-2988482400,2988482407,GB
-2988482408,2988482411,PL
-2988482412,2988482447,FR
-2988482448,2988482463,DE
-2988482464,2988482495,FR
-2988482496,2988482511,PL
-2988482512,2988482535,FR
-2988482536,2988482543,ES
-2988482544,2988482575,FR
+2988482144,2988482319,FR
+2988482320,2988482335,IT
+2988482336,2988482575,FR
 2988482576,2988482579,CZ
-2988482580,2988482639,FR
-2988482640,2988482647,PL
-2988482648,2988482655,FR
-2988482656,2988482687,GB
-2988482688,2988482775,FR
-2988482776,2988482779,DE
-2988482780,2988482823,FR
-2988482824,2988482827,CZ
-2988482828,2988482879,FR
-2988482880,2988482883,DE
-2988482884,2988482887,PL
-2988482888,2988482891,BE
-2988482892,2988482895,FI
-2988482896,2988482927,ES
-2988482928,2988483027,FR
+2988482580,2988483027,FR
 2988483028,2988483031,ES
-2988483032,2988483035,FR
-2988483036,2988483039,IT
-2988483040,2988483095,FR
-2988483096,2988483103,BE
-2988483104,2988483115,FR
-2988483116,2988483119,IT
-2988483120,2988483199,FR
-2988483200,2988483231,PT
-2988483232,2988483387,FR
-2988483388,2988483391,GB
-2988483392,2988483427,FR
-2988483428,2988483431,GB
-2988483432,2988483639,FR
-2988483640,2988483647,GB
-2988483648,2988483663,IT
-2988483664,2988483679,FR
-2988483680,2988483695,PT
-2988483696,2988483739,FR
-2988483740,2988483743,BE
-2988483744,2988483771,FR
-2988483772,2988483775,PL
-2988483776,2988483871,FR
-2988483872,2988483879,GB
-2988483880,2988483959,FR
-2988483960,2988483963,ES
-2988483964,2988483987,FR
-2988483988,2988483991,ES
-2988483992,2988484031,FR
-2988484032,2988484047,GB
-2988484048,2988484095,FR
-2988484096,2988484111,ES
-2988484112,2988484127,PL
-2988484128,2988484163,FR
-2988484164,2988484167,GB
-2988484168,2988484171,PL
-2988484172,2988484187,FR
-2988484188,2988484191,ES
-2988484192,2988484407,FR
-2988484408,2988484415,PL
-2988484416,2988484423,IT
-2988484424,2988484427,FR
-2988484428,2988484431,DE
-2988484432,2988484439,FR
-2988484440,2988484443,FI
-2988484444,2988484831,FR
+2988483032,2988484831,FR
 2988484832,2988484847,GB
-2988484848,2988484955,FR
-2988484956,2988484959,DE
-2988484960,2988485167,FR
-2988485168,2988485183,GB
-2988485184,2988485599,FR
-2988485600,2988485607,ES
-2988485608,2988485675,FR
-2988485676,2988485679,NL
-2988485680,2988485683,FR
+2988484848,2988485683,FR
 2988485684,2988485687,PL
-2988485688,2988485767,FR
-2988485768,2988485771,BE
-2988485772,2988485831,FR
-2988485832,2988485839,NL
-2988485840,2988486015,FR
-2988486016,2988486031,GB
-2988486032,2988486075,FR
+2988485688,2988486075,FR
 2988486076,2988486079,DE
 2988486080,2988486083,FR
 2988486084,2988486087,PT
-2988486088,2988486127,FR
-2988486128,2988486143,GB
-2988486144,2988486147,FR
-2988486148,2988486151,BE
-2988486152,2988486199,FR
-2988486200,2988486207,GB
-2988486208,2988486215,IT
-2988486216,2988486311,FR
+2988486088,2988486311,FR
 2988486312,2988486319,NL
-2988486320,2988486375,FR
-2988486376,2988486379,DE
-2988486380,2988486519,FR
-2988486520,2988486527,PL
-2988486528,2988486575,FR
-2988486576,2988486579,GB
-2988486580,2988486647,FR
-2988486648,2988486651,ES
-2988486652,2988486655,IT
-2988486656,2988486707,FR
-2988486708,2988486711,IT
-2988486712,2988486719,IE
-2988486720,2988486791,FR
-2988486792,2988486795,ES
-2988486796,2988486799,FR
-2988486800,2988486807,PL
-2988486808,2988486811,FR
-2988486812,2988486815,DE
-2988486816,2988486879,FR
-2988486880,2988486887,BE
-2988486888,2988486891,FR
-2988486892,2988486895,IT
-2988486896,2988486907,FR
-2988486908,2988486911,NL
-2988486912,2988487071,FR
+2988486320,2988487071,FR
 2988487072,2988487075,ES
 2988487076,2988487095,FR
 2988487096,2988487099,ES
-2988487100,2988487135,FR
-2988487136,2988487167,ES
-2988487168,2988487235,FR
+2988487100,2988487235,FR
 2988487236,2988487239,NL
-2988487240,2988487883,FR
+2988487240,2988487303,FR
+2988487304,2988487311,NL
+2988487312,2988487883,FR
 2988487884,2988487887,NL
-2988487888,2988487967,FR
-2988487968,2988487975,DE
-2988487976,2988488031,FR
-2988488032,2988488047,NL
-2988488048,2988488151,FR
-2988488152,2988488159,IT
-2988488160,2988488183,FR
-2988488184,2988488187,DE
-2988488188,2988488479,FR
-2988488480,2988488487,CH
-2988488488,2988488563,FR
-2988488564,2988488567,GB
-2988488568,2988488647,FR
-2988488648,2988488655,IT
-2988488656,2988488671,FR
-2988488672,2988488679,BE
-2988488680,2988488963,FR
-2988488964,2988488967,DE
-2988488968,2988488971,GB
-2988488972,2988488975,IT
-2988488976,2988489071,FR
-2988489072,2988489087,GB
-2988489088,2988489095,FR
-2988489096,2988489099,DE
-2988489100,2988489119,FR
-2988489120,2988489127,DE
-2988489128,2988489135,FR
-2988489136,2988489151,PT
-2988489152,2988489175,FR
-2988489176,2988489179,DE
-2988489180,2988489255,FR
-2988489256,2988489259,GB
-2988489260,2988489295,FR
-2988489296,2988489311,CH
-2988489312,2988489335,FR
-2988489336,2988489343,BE
-2988489344,2988489379,FR
-2988489380,2988489383,ES
-2988489384,2988489391,PL
-2988489392,2988489479,FR
+2988487888,2988489479,FR
 2988489480,2988489483,DE
-2988489484,2988489487,NL
-2988489488,2988489527,FR
-2988489528,2988489535,PT
-2988489536,2988489671,FR
-2988489672,2988489675,IT
+2988489484,2988489675,FR
 2988489676,2988489679,ES
-2988489680,2988489711,FR
-2988489712,2988489719,IE
-2988489720,2988489727,PL
-2988489728,2988489743,FR
-2988489744,2988489747,CH
-2988489748,2988489791,FR
-2988489792,2988489823,PL
-2988489824,2988489855,FR
-2988489856,2988489887,GB
-2988489888,2988489903,FR
-2988489904,2988489919,PT
-2988489920,2988490047,FR
-2988490048,2988490051,PL
-2988490052,2988490055,FR
-2988490056,2988490059,BE
-2988490060,2988490063,FR
-2988490064,2988490079,GB
-2988490080,2988490095,FR
-2988490096,2988490103,CH
-2988490104,2988490179,FR
+2988489680,2988490179,FR
 2988490180,2988490183,ES
-2988490184,2988490195,FR
-2988490196,2988490199,GB
-2988490200,2988490247,FR
-2988490248,2988490251,IE
-2988490252,2988490359,FR
-2988490360,2988490367,PT
-2988490368,2988490383,FR
-2988490384,2988490399,IE
-2988490400,2988490407,DE
-2988490408,2988490631,FR
-2988490632,2988490639,IT
-2988490640,2988490655,PL
-2988490656,2988490671,ES
-2988490672,2988490683,FR
+2988490184,2988490683,FR
 2988490684,2988490686,IT
 2988490687,2988490687,BE
 2988490688,2988490719,ES
 2988490720,2988492799,FR
 2988492800,2988494847,PL
-2988494848,2988498991,FR
-2988498992,2988499007,DE
-2988499008,2988499167,FR
-2988499168,2988499199,NL
-2988499200,2988499231,FR
-2988499232,2988499263,PT
-2988499264,2988499455,FR
-2988499456,2988499463,CZ
-2988499464,2988499471,ES
-2988499472,2988499487,FR
-2988499488,2988499503,DE
-2988499504,2988499559,FR
-2988499560,2988499567,PT
-2988499568,2988499623,FR
-2988499624,2988499631,GB
-2988499632,2988499639,FR
-2988499640,2988499647,IT
-2988499648,2988499663,FR
+2988494848,2988499663,FR
 2988499664,2988499671,NL
 2988499672,2988499729,FR
 2988499730,2988499730,GB
 2988499731,2988499736,FR
 2988499737,2988499737,NL
-2988499738,2988499767,FR
-2988499768,2988499775,GB
-2988499776,2988499823,FR
-2988499824,2988499831,GB
-2988499832,2988499851,FR
-2988499852,2988499855,ES
-2988499856,2988499935,FR
-2988499936,2988499967,IE
-2988499968,2988500255,FR
-2988500256,2988500271,ES
-2988500272,2988500343,FR
-2988500344,2988500347,IT
-2988500348,2988500351,CH
-2988500352,2988500415,FR
+2988499738,2988500415,FR
 2988500416,2988500447,CZ
-2988500448,2988500511,FR
-2988500512,2988500519,CH
-2988500520,2988500607,FR
-2988500608,2988500623,PL
-2988500624,2988500639,FR
-2988500640,2988500671,IT
-2988500672,2988500679,FR
-2988500680,2988500687,ES
-2988500688,2988500703,GB
-2988500704,2988500735,FR
-2988500736,2988500751,PL
-2988500752,2988500855,FR
+2988500448,2988500855,FR
 2988500856,2988500859,ES
-2988500860,2988500959,FR
-2988500960,2988500975,NL
-2988500976,2988501055,FR
-2988501056,2988501087,GB
-2988501088,2988501127,FR
+2988500860,2988501127,FR
 2988501128,2988501131,IT
-2988501132,2988501215,FR
-2988501216,2988501223,FI
-2988501224,2988501367,FR
-2988501368,2988501375,IE
-2988501376,2988502051,FR
+2988501132,2988501415,FR
+2988501416,2988501423,IT
+2988501424,2988502051,FR
 2988502052,2988502055,PL
-2988502056,2988502107,FR
-2988502108,2988502111,GB
-2988502112,2988502267,FR
-2988502268,2988502271,BE
-2988502272,2988502287,FR
-2988502288,2988502303,PL
-2988502304,2988502391,FR
-2988502392,2988502399,IT
-2988502400,2988502407,FR
-2988502408,2988502411,FI
-2988502412,2988502479,FR
+2988502056,2988502479,FR
 2988502480,2988502483,ES
-2988502484,2988502487,PL
-2988502488,2988502491,FR
-2988502492,2988502495,DE
-2988502496,2988502631,FR
-2988502632,2988502639,FI
-2988502640,2988502655,FR
+2988502484,2988502655,FR
 2988502656,2988502719,DE
-2988502720,2988502735,FR
-2988502736,2988502751,ES
-2988502752,2988502881,FR
+2988502720,2988502881,FR
 2988502882,2988502882,IT
-2988502883,2988502891,FR
-2988502892,2988502895,ES
-2988502896,2988502911,FI
-2988502912,2988503031,FR
-2988503032,2988503035,FI
-2988503036,2988503327,FR
-2988503328,2988503343,IT
-2988503344,2988503395,FR
-2988503396,2988503399,NL
-2988503400,2988503407,CH
-2988503408,2988503903,FR
-2988503904,2988503907,PL
-2988503908,2988503911,DE
-2988503912,2988503919,FR
-2988503920,2988503927,IT
-2988503928,2988503935,FR
-2988503936,2988503939,GB
-2988503940,2988503999,FR
-2988504000,2988504003,BE
-2988504004,2988504095,FR
-2988504096,2988504127,PL
-2988504128,2988504143,CH
-2988504144,2988504231,FR
-2988504232,2988504239,DE
-2988504240,2988504315,FR
-2988504316,2988504319,PT
-2988504320,2988504371,FR
+2988502883,2988504371,FR
 2988504372,2988504375,PL
-2988504376,2988504435,FR
-2988504436,2988504439,LT
-2988504440,2988504543,FR
-2988504544,2988504559,DE
-2988504560,2988504567,FR
-2988504568,2988504575,IT
-2988504576,2988504591,FR
-2988504592,2988504599,IT
-2988504600,2988504647,FR
-2988504648,2988504655,IT
-2988504656,2988504827,FR
-2988504828,2988504831,DE
-2988504832,2988504895,FR
-2988504896,2988504959,DE
-2988504960,2988504967,FR
-2988504968,2988504975,ES
-2988504976,2988504979,PL
-2988504980,2988505151,FR
+2988504376,2988505151,FR
 2988505152,2988505167,GB
-2988505168,2988505183,FR
-2988505184,2988505191,NL
-2988505192,2988505199,DE
-2988505200,2988505207,FR
-2988505208,2988505215,ES
-2988505216,2988505335,FR
-2988505336,2988505339,IE
-2988505340,2988505343,DE
-2988505344,2988505375,FR
-2988505376,2988505391,GB
+2988505168,2988505391,FR
 2988505392,2988505395,ES
-2988505396,2988505399,FI
-2988505400,2988505403,PL
-2988505404,2988505455,FR
-2988505456,2988505463,GB
-2988505464,2988505479,FR
-2988505480,2988505487,IT
-2988505488,2988505495,FR
-2988505496,2988505499,NL
-2988505500,2988505503,ES
-2988505504,2988505567,FR
-2988505568,2988505583,IE
-2988505584,2988505615,FR
-2988505616,2988505623,PL
-2988505624,2988505703,FR
-2988505704,2988505707,FI
-2988505708,2988505735,FR
-2988505736,2988505743,FI
-2988505744,2988505751,ES
-2988505752,2988505951,FR
-2988505952,2988505967,NL
-2988505968,2988506235,FR
+2988505396,2988506235,FR
 2988506236,2988506239,NL
-2988506240,2988506379,FR
-2988506380,2988506383,GB
-2988506384,2988506439,FR
-2988506440,2988506447,IE
-2988506448,2988506459,FR
-2988506460,2988506463,ES
-2988506464,2988506495,FR
-2988506496,2988506499,CH
-2988506500,2988506527,FR
-2988506528,2988506543,IE
-2988506544,2988506567,FR
-2988506568,2988506571,NL
-2988506572,2988506651,FR
-2988506652,2988506655,IT
-2988506656,2988506671,FR
-2988506672,2988506687,DE
-2988506688,2988506703,FR
-2988506704,2988506719,ES
-2988506720,2988506767,FR
-2988506768,2988506771,NL
-2988506772,2988506827,FR
-2988506828,2988506831,ES
-2988506832,2988506867,FR
-2988506868,2988506875,CH
-2988506876,2988506879,DE
-2988506880,2988506943,FR
+2988506240,2988506943,FR
 2988506944,2988506975,DE
-2988506976,2988507039,FR
-2988507040,2988507071,ES
-2988507072,2988507135,FR
-2988507136,2988507143,PL
-2988507144,2988507151,FR
-2988507152,2988507155,ES
-2988507156,2988507163,FR
+2988506976,2988507163,FR
 2988507164,2988507167,ES
-2988507168,2988507203,FR
-2988507204,2988507207,DE
-2988507208,2988507215,FR
-2988507216,2988507223,FI
-2988507224,2988507231,DE
-2988507232,2988507291,FR
-2988507292,2988507295,IT
-2988507296,2988507459,FR
-2988507460,2988507463,BE
-2988507464,2988507471,DE
-2988507472,2988507503,FR
-2988507504,2988507519,IT
-2988507520,2988507527,FR
-2988507528,2988507531,GB
+2988507168,2988507531,FR
 2988507532,2988507535,NL
-2988507536,2988507567,FR
-2988507568,2988507583,ES
-2988507584,2988507595,FR
-2988507596,2988507599,LT
-2988507600,2988507615,FR
-2988507616,2988507623,DE
-2988507624,2988507627,FR
-2988507628,2988507631,PL
-2988507632,2988507743,FR
-2988507744,2988507759,NL
-2988507760,2988507775,FR
-2988507776,2988507791,NL
-2988507792,2988507807,IT
-2988507808,2988507871,FR
-2988507872,2988507879,DE
-2988507880,2988507955,FR
-2988507956,2988507959,DE
-2988507960,2988507975,FR
+2988507536,2988507807,FR
+2988507808,2988507823,NL
+2988507824,2988507975,FR
 2988507976,2988507979,IT
-2988507980,2988508035,FR
-2988508036,2988508039,DE
-2988508040,2988508111,FR
-2988508112,2988508127,IE
-2988508128,2988508143,FR
-2988508144,2988508147,IE
-2988508148,2988508175,FR
-2988508176,2988508191,IE
-2988508192,2988508211,FR
-2988508212,2988508215,CZ
-2988508216,2988508239,FR
-2988508240,2988508255,GB
-2988508256,2988508303,FR
-2988508304,2988508307,CH
-2988508308,2988508479,FR
-2988508480,2988508543,BE
-2988508544,2988508607,FR
+2988507980,2988508607,FR
 2988508608,2988508639,ES
-2988508640,2988508671,DE
-2988508672,2988508723,FR
-2988508724,2988508727,GB
-2988508728,2988508947,FR
-2988508948,2988508951,ES
-2988508952,2988508987,FR
-2988508988,2988508991,ES
-2988508992,2988509007,BE
-2988509008,2988509011,FR
-2988509012,2988509015,BE
-2988509016,2988509023,FR
-2988509024,2988509055,CH
-2988509056,2988509287,FR
-2988509288,2988509291,GB
-2988509292,2988509403,FR
-2988509404,2988509407,FI
-2988509408,2988509467,FR
-2988509468,2988509471,BE
-2988509472,2988509511,FR
+2988508640,2988509511,FR
 2988509512,2988509515,PL
-2988509516,2988509551,FR
-2988509552,2988509559,DE
-2988509560,2988509599,FR
-2988509600,2988509615,DE
-2988509616,2988509619,FR
-2988509620,2988509623,DE
-2988509624,2988509627,FR
-2988509628,2988509631,GB
-2988509632,2988509735,FR
-2988509736,2988509739,CH
-2988509740,2988509747,FR
+2988509516,2988509747,FR
 2988509748,2988509751,LT
-2988509752,2988509755,IT
-2988509756,2988509767,FR
-2988509768,2988509775,PL
-2988509776,2988509779,DE
-2988509780,2988509791,FR
-2988509792,2988509823,ES
-2988509824,2988509839,PL
-2988509840,2988509863,FR
-2988509864,2988509871,NL
-2988509872,2988509875,FR
-2988509876,2988509879,NL
-2988509880,2988509931,FR
-2988509932,2988509935,ES
-2988509936,2988509939,IT
-2988509940,2988509951,FR
-2988509952,2988509955,DE
-2988509956,2988509983,FR
-2988509984,2988509991,DE
-2988509992,2988509999,FR
-2988510000,2988510015,IT
-2988510016,2988510023,IE
-2988510024,2988510039,FR
-2988510040,2988510043,ES
-2988510044,2988510207,FR
-2988510208,2988510215,GB
-2988510216,2988510223,DE
-2988510224,2988510255,FR
-2988510256,2988510259,FI
-2988510260,2988510323,FR
-2988510324,2988510327,FI
-2988510328,2988510335,ES
-2988510336,2988510423,FR
-2988510424,2988510427,DE
-2988510428,2988510431,IT
-2988510432,2988510499,FR
-2988510500,2988510503,GB
-2988510504,2988510507,FR
-2988510508,2988510511,GB
-2988510512,2988510515,FR
-2988510516,2988510519,ES
-2988510520,2988510975,FR
-2988510976,2988510983,PL
-2988510984,2988511559,FR
-2988511560,2988511567,IT
-2988511568,2988511615,FR
-2988511616,2988511647,IE
-2988511648,2988511695,FR
-2988511696,2988511703,PL
-2988511704,2988511719,FR
-2988511720,2988511723,PL
-2988511724,2988511743,FR
-2988511744,2988511747,IT
-2988511748,2988511835,FR
-2988511836,2988511839,IT
-2988511840,2988511855,BE
-2988511856,2988511871,FR
-2988511872,2988511879,IT
-2988511880,2988511887,FR
-2988511888,2988511903,CH
-2988511904,2988511927,FR
-2988511928,2988511931,ES
-2988511932,2988511959,FR
-2988511960,2988511967,DE
-2988511968,2988511999,FR
-2988512000,2988512031,PL
-2988512032,2988512055,FR
-2988512056,2988512059,GB
-2988512060,2988512143,FR
-2988512144,2988512159,ES
-2988512160,2988512195,FR
-2988512196,2988512199,PL
-2988512200,2988512231,FR
-2988512232,2988512239,NL
-2988512240,2988512435,FR
-2988512436,2988512439,DE
-2988512440,2988512455,FR
-2988512456,2988512459,GB
-2988512460,2988512467,FR
-2988512468,2988512471,GB
-2988512472,2988512511,FR
-2988512512,2988512515,DE
-2988512516,2988512519,PL
-2988512520,2988512703,FR
-2988512704,2988512735,ES
-2988512736,2988512767,PL
-2988512768,2988512879,FR
-2988512880,2988512895,GB
-2988512896,2988512903,FR
+2988509752,2988510175,FR
+2988510176,2988510191,DE
+2988510192,2988512903,FR
 2988512904,2988512907,GB
-2988512908,2988512911,DE
-2988512912,2988512963,FR
-2988512964,2988512967,PL
-2988512968,2988513003,FR
+2988512908,2988513003,FR
 2988513004,2988513007,ES
-2988513008,2988513015,FR
-2988513016,2988513019,PT
-2988513020,2988513023,GB
-2988513024,2988513135,FR
-2988513136,2988513151,IT
-2988513152,2988513207,FR
-2988513208,2988513219,GB
-2988513220,2988513231,FR
-2988513232,2988513235,GB
-2988513236,2988513239,FR
-2988513240,2988513247,IT
-2988513248,2988513327,FR
-2988513328,2988513331,PL
-2988513332,2988513351,FR
-2988513352,2988513359,DE
-2988513360,2988513363,ES
-2988513364,2988513503,FR
-2988513504,2988513511,GB
-2988513512,2988513711,FR
-2988513712,2988513715,GB
-2988513716,2988513743,FR
-2988513744,2988513747,DE
+2988513008,2988513747,FR
 2988513748,2988513751,IT
-2988513752,2988513919,FR
-2988513920,2988513951,PL
-2988513952,2988513967,FR
-2988513968,2988513983,NL
-2988513984,2988513999,BE
-2988514000,2988514015,FR
-2988514016,2988514023,GB
-2988514024,2988514131,FR
-2988514132,2988514135,DE
-2988514136,2988514239,FR
-2988514240,2988514243,DE
-2988514244,2988514335,FR
-2988514336,2988514339,GB
-2988514340,2988514359,FR
-2988514360,2988514367,ES
-2988514368,2988514399,FR
+2988513752,2988514207,FR
+2988514208,2988514215,PT
+2988514216,2988514399,FR
 2988514400,2988514431,NL
-2988514432,2988514463,FR
-2988514464,2988514495,GB
-2988514496,2988514527,NL
-2988514528,2988514543,GB
-2988514544,2988514559,PT
-2988514560,2988514591,FR
-2988514592,2988514623,PL
-2988514624,2988514687,FR
-2988514688,2988514719,FI
-2988514720,2988514735,FR
-2988514736,2988514739,DE
-2988514740,2988514747,FR
-2988514748,2988514751,NL
-2988514752,2988514819,FR
-2988514820,2988514823,NL
-2988514824,2988514847,FR
-2988514848,2988514879,DE
-2988514880,2988514991,FR
-2988514992,2988514995,IT
-2988514996,2988515007,FR
-2988515008,2988515023,BE
-2988515024,2988515031,FR
-2988515032,2988515035,ES
-2988515036,2988515327,FR
+2988514432,2988515327,FR
 2988515328,2988517375,DE
 2988517376,2988519423,FR
 2988519424,2988521471,PL
-2988521472,2988523523,FR
-2988523524,2988523527,GB
-2988523528,2988523603,FR
-2988523604,2988523607,LT
-2988523608,2988523631,FR
-2988523632,2988523639,IT
-2988523640,2988523651,FR
-2988523652,2988523655,IT
-2988523656,2988523663,ES
-2988523664,2988523667,FR
-2988523668,2988523671,NL
-2988523672,2988523711,FR
-2988523712,2988523727,ES
-2988523728,2988523735,FI
-2988523736,2988524047,FR
-2988524048,2988524055,NL
-2988524056,2988524063,FR
-2988524064,2988524071,PL
-2988524072,2988524075,FR
+2988521472,2988523743,FR
+2988523744,2988523759,DE
+2988523760,2988524075,FR
 2988524076,2988524079,ES
-2988524080,2988524143,FR
-2988524144,2988524147,GB
-2988524148,2988524175,FR
-2988524176,2988524183,IT
-2988524184,2988524271,FR
+2988524080,2988524271,FR
 2988524272,2988524287,DE
-2988524288,2988524299,FR
-2988524300,2988524303,DE
-2988524304,2988524367,FR
-2988524368,2988524383,NL
-2988524384,2988524479,FR
-2988524480,2988524483,NL
-2988524484,2988524511,FR
-2988524512,2988524543,IT
-2988524544,2988524559,ES
-2988524560,2988524575,BE
-2988524576,2988524591,PL
-2988524592,2988524639,FR
-2988524640,2988524671,PL
-2988524672,2988524767,FR
-2988524768,2988524799,CH
-2988524800,2988524815,FR
-2988524816,2988524831,GB
-2988524832,2988524863,FR
-2988524864,2988524895,PL
-2988524896,2988524911,FR
-2988524912,2988524919,DE
-2988524920,2988525579,FR
+2988524288,2988525579,FR
 2988525580,2988525583,IT
-2988525584,2988525631,FR
-2988525632,2988525647,ES
-2988525648,2988525819,FR
-2988525820,2988525823,IT
-2988525824,2988525847,FR
-2988525848,2988525851,CZ
-2988525852,2988525887,FR
+2988525584,2988525887,FR
 2988525888,2988525951,GB
-2988525952,2988526079,FR
-2988526080,2988526087,DE
-2988526088,2988526091,IT
-2988526092,2988526143,FR
-2988526144,2988526175,CH
-2988526176,2988526367,FR
-2988526368,2988526383,IT
-2988526384,2988526423,ES
-2988526424,2988526427,GB
-2988526428,2988526431,FR
-2988526432,2988526435,IT
-2988526436,2988526575,FR
-2988526576,2988526579,GB
-2988526580,2988526927,FR
-2988526928,2988526935,DE
-2988526936,2988526939,IT
-2988526940,2988526947,FR
-2988526948,2988526951,BE
-2988526952,2988526999,FR
-2988527000,2988527003,IT
-2988527004,2988527039,FR
-2988527040,2988527055,NL
-2988527056,2988527087,FR
-2988527088,2988527095,IT
-2988527096,2988527167,FR
-2988527168,2988527175,ES
-2988527176,2988527191,FR
-2988527192,2988527195,NL
-2988527196,2988527411,FR
-2988527412,2988527415,ES
-2988527416,2988527527,FR
+2988525952,2988526415,FR
+2988526416,2988526423,ES
+2988526424,2988527527,FR
 2988527528,2988527531,NL
-2988527532,2988527535,FR
-2988527536,2988527543,PL
-2988527544,2988527583,FR
-2988527584,2988527591,IT
-2988527592,2988527615,FR
-2988527616,2988527623,DE
-2988527624,2988527671,FR
-2988527672,2988527675,IT
-2988527676,2988527747,FR
-2988527748,2988527751,IT
-2988527752,2988527755,FR
-2988527756,2988527759,IT
-2988527760,2988527823,FR
-2988527824,2988527831,PL
+2988527532,2988527723,FR
+2988527724,2988527727,ES
+2988527728,2988527831,FR
 2988527832,2988527839,ES
 2988527840,2988527887,FR
 2988527888,2988527891,ES
-2988527892,2988528015,FR
-2988528016,2988528031,GB
-2988528032,2988528111,FR
-2988528112,2988528115,PL
-2988528116,2988528187,FR
-2988528188,2988528191,IT
-2988528192,2988528219,FR
-2988528220,2988528223,PT
-2988528224,2988528279,FR
-2988528280,2988528287,DE
-2988528288,2988528351,FR
-2988528352,2988528383,PL
-2988528384,2988528639,FR
-2988528640,2988528647,ES
-2988528648,2988528655,FR
-2988528656,2988528659,BE
-2988528660,2988528699,FR
+2988527892,2988528699,FR
 2988528700,2988528703,CZ
-2988528704,2988528751,FR
-2988528752,2988528759,NL
-2988528760,2988528835,FR
-2988528836,2988528839,IT
-2988528840,2988528931,FR
-2988528932,2988528935,NL
-2988528936,2988528943,FR
-2988528944,2988528959,ES
-2988528960,2988528983,FR
-2988528984,2988528991,GB
-2988528992,2988529031,FR
-2988529032,2988529039,GB
-2988529040,2988529087,FR
-2988529088,2988529095,GB
-2988529096,2988529159,FR
-2988529160,2988529163,ES
-2988529164,2988529215,FR
-2988529216,2988529247,IE
-2988529248,2988529251,FR
-2988529252,2988529255,PT
-2988529256,2988529263,IT
-2988529264,2988529315,FR
-2988529316,2988529319,PL
-2988529320,2988529323,FR
-2988529324,2988529327,BE
-2988529328,2988529343,FR
-2988529344,2988529351,ES
+2988528704,2988529351,FR
 2988529352,2988529359,GB
 2988529360,2988529375,FR
 2988529376,2988529383,GB
 2988529384,2988529387,ES
-2988529388,2988529599,FR
-2988529600,2988529607,IT
-2988529608,2988529787,FR
-2988529788,2988529791,ES
-2988529792,2988529915,FR
-2988529916,2988529919,DE
-2988529920,2988529935,NL
-2988529936,2988529947,FR
-2988529948,2988529951,BE
-2988529952,2988529955,FR
-2988529956,2988529959,ES
-2988529960,2988530031,FR
-2988530032,2988530039,GB
-2988530040,2988530255,FR
-2988530256,2988530271,IT
-2988530272,2988530311,FR
-2988530312,2988530319,CH
-2988530320,2988530407,FR
-2988530408,2988530415,ES
-2988530416,2988530695,FR
-2988530696,2988530703,IE
-2988530704,2988530735,FR
-2988530736,2988530739,IT
-2988530740,2988530847,FR
-2988530848,2988530863,ES
-2988530864,2988530871,FR
-2988530872,2988530879,ES
-2988530880,2988530927,FR
-2988530928,2988530943,BE
-2988530944,2988531027,FR
-2988531028,2988531031,CZ
-2988531032,2988531039,FR
-2988531040,2988531043,DE
-2988531044,2988531075,FR
-2988531076,2988531079,GB
-2988531080,2988531247,FR
-2988531248,2988531255,GB
-2988531256,2988531259,FR
-2988531260,2988531263,ES
-2988531264,2988531291,FR
-2988531292,2988531295,DE
-2988531296,2988531311,GB
-2988531312,2988531315,CZ
-2988531316,2988531319,FR
-2988531320,2988531323,GB
-2988531324,2988531327,FR
-2988531328,2988531351,GB
-2988531352,2988531391,FR
-2988531392,2988531399,NL
-2988531400,2988531423,FR
-2988531424,2988531427,NL
-2988531428,2988531431,FR
-2988531432,2988531439,ES
-2988531440,2988535807,FR
+2988529388,2988531275,FR
+2988531276,2988531279,PT
+2988531280,2988535807,FR
 2988535808,2988537855,ES
 2988537856,2988539971,FR
 2988539972,2988539975,ES
-2988539976,2988540007,FR
-2988540008,2988540015,ES
-2988540016,2988540019,FR
-2988540020,2988540023,DE
-2988540024,2988540231,FR
-2988540232,2988540235,ES
-2988540236,2988540239,DE
-2988540240,2988540303,FR
-2988540304,2988540319,IT
-2988540320,2988540359,FR
-2988540360,2988540363,DE
-2988540364,2988540495,FR
-2988540496,2988540503,IE
+2988539976,2988540199,FR
+2988540200,2988540207,BE
+2988540208,2988540503,FR
 2988540504,2988540507,NL
 2988540508,2988540563,FR
 2988540564,2988540567,CZ
-2988540568,2988540631,FR
-2988540632,2988540635,CZ
-2988540636,2988540639,FR
-2988540640,2988540647,IT
-2988540648,2988540667,FR
-2988540668,2988540671,DE
-2988540672,2988540783,FR
-2988540784,2988540787,PL
-2988540788,2988541119,FR
-2988541120,2988541127,BE
-2988541128,2988541315,FR
-2988541316,2988541319,FI
-2988541320,2988541343,FR
-2988541344,2988541347,NL
-2988541348,2988541367,FR
-2988541368,2988541371,GB
-2988541372,2988541439,FR
-2988541440,2988541443,ES
-2988541444,2988541455,FR
-2988541456,2988541463,DE
-2988541464,2988541547,FR
-2988541548,2988541551,GB
-2988541552,2988541659,FR
-2988541660,2988541663,ES
-2988541664,2988541691,FR
-2988541692,2988541695,DE
-2988541696,2988541735,FR
-2988541736,2988541743,DE
-2988541744,2988541815,FR
-2988541816,2988541819,IE
-2988541820,2988541855,FR
-2988541856,2988541863,PL
-2988541864,2988541867,BE
-2988541868,2988541895,FR
-2988541896,2988541903,NL
-2988541904,2988541927,FR
-2988541928,2988541935,LT
-2988541936,2988542027,FR
-2988542028,2988542031,ES
-2988542032,2988542047,PT
-2988542048,2988542143,FR
-2988542144,2988542175,IT
-2988542176,2988542431,FR
-2988542432,2988542439,BE
-2988542440,2988542443,GB
-2988542444,2988542447,IE
-2988542448,2988542539,FR
-2988542540,2988542543,DE
-2988542544,2988542607,FR
-2988542608,2988542611,PL
-2988542612,2988542615,FR
-2988542616,2988542623,IT
-2988542624,2988542627,FR
+2988540568,2988542627,FR
 2988542628,2988542631,NL
-2988542632,2988542911,FR
-2988542912,2988542919,IE
-2988542920,2988542927,FR
-2988542928,2988542931,IT
-2988542932,2988542935,PL
-2988542936,2988542939,FR
-2988542940,2988542943,ES
-2988542944,2988543023,FR
-2988543024,2988543039,BE
-2988543040,2988543051,FR
-2988543052,2988543055,NL
-2988543056,2988543063,FR
-2988543064,2988543067,ES
-2988543068,2988543103,FR
-2988543104,2988543135,CH
-2988543136,2988543167,BE
-2988543168,2988543191,FR
-2988543192,2988543195,NL
-2988543196,2988543379,FR
-2988543380,2988543383,ES
-2988543384,2988543407,FR
-2988543408,2988543411,CZ
-2988543412,2988543439,FR
-2988543440,2988543447,GB
-2988543448,2988543551,FR
-2988543552,2988543559,ES
-2988543560,2988543563,PT
-2988543564,2988543615,FR
-2988543616,2988543647,CZ
-2988543648,2988543679,FR
-2988543680,2988543711,NL
-2988543712,2988543935,FR
-2988543936,2988543939,GB
-2988543940,2988544003,FR
-2988544004,2988544007,PL
-2988544008,2988544015,FR
-2988544016,2988544023,DE
-2988544024,2988544039,FR
-2988544040,2988544043,IT
-2988544044,2988544047,BE
-2988544048,2988544183,FR
-2988544184,2988544187,DE
-2988544188,2988544223,FR
-2988544224,2988544227,ES
-2988544228,2988544231,FR
-2988544232,2988544239,GB
-2988544240,2988544271,FR
-2988544272,2988544275,CH
-2988544276,2988544303,FR
-2988544304,2988544307,DE
-2988544308,2988544327,FR
-2988544328,2988544331,PT
-2988544332,2988544495,FR
-2988544496,2988544511,GB
-2988544512,2988544655,FR
-2988544656,2988544659,ES
-2988544660,2988544671,FR
+2988542632,2988544671,FR
 2988544672,2988544687,GB
-2988544688,2988544691,NL
-2988544692,2988544727,FR
-2988544728,2988544735,DE
-2988544736,2988544935,FR
-2988544936,2988544943,NL
-2988544944,2988544987,FR
-2988544988,2988544991,IE
-2988544992,2988544999,ES
-2988545000,2988545003,DE
-2988545004,2988545007,IT
-2988545008,2988545015,FR
-2988545016,2988545019,DE
-2988545020,2988545031,FR
-2988545032,2988545039,FI
-2988545040,2988545051,FR
-2988545052,2988545055,GB
-2988545056,2988545215,FR
-2988545216,2988545223,ES
-2988545224,2988545227,NL
-2988545228,2988545383,FR
-2988545384,2988545387,DE
-2988545388,2988545455,FR
-2988545456,2988545471,IT
-2988545472,2988545487,GB
-2988545488,2988545551,FR
-2988545552,2988545555,GB
-2988545556,2988545559,NL
-2988545560,2988545583,FR
-2988545584,2988545599,IT
-2988545600,2988545871,FR
-2988545872,2988545887,ES
-2988545888,2988545931,FR
-2988545932,2988545935,PL
-2988545936,2988546015,FR
-2988546016,2988546031,NL
-2988546032,2988546035,GB
-2988546036,2988546291,FR
-2988546292,2988546295,ES
-2988546296,2988546555,FR
-2988546556,2988546559,ES
-2988546560,2988546583,FR
-2988546584,2988546591,DE
-2988546592,2988546619,FR
-2988546620,2988546623,ES
-2988546624,2988546695,FR
-2988546696,2988546699,ES
-2988546700,2988546703,FR
+2988544688,2988546687,FR
+2988546688,2988546691,CH
+2988546692,2988546703,FR
 2988546704,2988546719,DE
 2988546720,2988546727,FR
 2988546728,2988546731,ES
-2988546732,2988546735,DE
-2988546736,2988546863,FR
-2988546864,2988546867,CH
-2988546868,2988546871,FR
-2988546872,2988546879,DE
-2988546880,2988546995,FR
-2988546996,2988546999,IT
-2988547000,2988547063,FR
-2988547064,2988547067,GB
+2988546732,2988547019,FR
+2988547020,2988547023,NL
+2988547024,2988547055,FR
+2988547056,2988547059,NL
+2988547060,2988547067,FR
 2988547068,2988547071,ES
 2988547072,2988547095,FR
 2988547096,2988547099,ES
-2988547100,2988547167,FR
-2988547168,2988547175,GB
-2988547176,2988547263,FR
-2988547264,2988547267,NL
-2988547268,2988547479,FR
-2988547480,2988547487,GB
-2988547488,2988547507,FR
-2988547508,2988547511,NL
-2988547512,2988547543,FR
-2988547544,2988547547,NL
-2988547548,2988547567,FR
-2988547568,2988547583,DE
-2988547584,2988547655,FR
+2988547100,2988547655,FR
 2988547656,2988547663,PL
-2988547664,2988547807,FR
-2988547808,2988547823,GB
-2988547824,2988547839,FR
-2988547840,2988547855,DE
-2988547856,2988547871,FR
+2988547664,2988547871,FR
 2988547872,2988547903,GB
-2988547904,2988547979,FR
-2988547980,2988547983,ES
-2988547984,2988548015,FR
+2988547904,2988548015,FR
 2988548016,2988548019,ES
 2988548020,2988548095,FR
 2988548096,2988550143,ES
-2988550144,2988550175,FR
-2988550176,2988550179,DE
-2988550180,2988550207,FR
-2988550208,2988550239,DE
-2988550240,2988550247,FR
-2988550248,2988550251,PL
-2988550252,2988550259,FR
-2988550260,2988550263,PL
-2988550264,2988550359,FR
+2988550144,2988550359,FR
 2988550360,2988550363,ES
-2988550364,2988550367,FR
-2988550368,2988550399,FI
-2988550400,2988550431,FR
-2988550432,2988550438,ES
+2988550364,2988550438,FR
 2988550439,2988550439,GB
-2988550440,2988550447,ES
-2988550448,2988550451,FR
-2988550452,2988550455,IE
-2988550456,2988550463,FR
+2988550440,2988550463,FR
 2988550464,2988550527,DE
-2988550528,2988550627,FR
-2988550628,2988550631,CZ
-2988550632,2988550679,FR
-2988550680,2988550687,GB
-2988550688,2988550911,FR
-2988550912,2988550927,NL
-2988550928,2988551135,FR
-2988551136,2988551167,ES
-2988551168,2988551443,FR
+2988550528,2988551443,FR
 2988551444,2988551447,ES
-2988551448,2988551511,FR
-2988551512,2988551519,ES
-2988551520,2988551535,FI
+2988551448,2988551535,FR
 2988551536,2988551551,DE
-2988551552,2988551871,FR
-2988551872,2988551887,PL
-2988551888,2988552543,FR
-2988552544,2988552551,PL
-2988552552,2988552567,FR
-2988552568,2988552575,GB
-2988552576,2988552603,FR
-2988552604,2988552607,GB
-2988552608,2988552647,FR
-2988552648,2988552655,NL
-2988552656,2988552659,FR
-2988552660,2988552663,PT
-2988552664,2988552671,NL
-2988552672,2988552711,FR
-2988552712,2988552719,IE
-2988552720,2988552735,GB
-2988552736,2988552831,FR
-2988552832,2988552847,ES
-2988552848,2988552883,FR
+2988551552,2988552883,FR
 2988552884,2988552887,IT
-2988552888,2988552891,DE
-2988552892,2988552915,FR
-2988552916,2988552919,NL
-2988552920,2988552927,FR
-2988552928,2988552943,ES
-2988552944,2988553087,FR
-2988553088,2988553119,GB
-2988553120,2988553399,FR
+2988552888,2988553399,FR
 2988553400,2988553407,NL
-2988553408,2988553415,FR
-2988553416,2988553423,DE
-2988553424,2988553455,FR
-2988553456,2988553471,GB
-2988553472,2988553531,FR
+2988553408,2988553531,FR
 2988553532,2988553535,ES
-2988553536,2988553551,GB
-2988553552,2988553567,FR
-2988553568,2988553575,PL
-2988553576,2988553659,FR
-2988553660,2988553663,NL
-2988553664,2988554015,FR
-2988554016,2988554031,BE
-2988554032,2988554035,FR
+2988553536,2988554035,FR
 2988554036,2988554039,ES
-2988554040,2988554063,FR
-2988554064,2988554067,DE
-2988554068,2988554071,FR
-2988554072,2988554075,ES
-2988554076,2988554127,FR
-2988554128,2988554131,IT
-2988554132,2988554175,FR
-2988554176,2988554183,CZ
-2988554184,2988554499,FR
-2988554500,2988554503,GB
-2988554504,2988554547,FR
-2988554548,2988554551,IT
-2988554552,2988554787,FR
-2988554788,2988554791,CH
-2988554792,2988554795,FI
-2988554796,2988554919,FR
-2988554920,2988554927,BE
-2988554928,2988555055,FR
-2988555056,2988555063,FI
-2988555064,2988555115,FR
-2988555116,2988555119,ES
-2988555120,2988555123,BE
-2988555124,2988555127,IT
-2988555128,2988555167,FR
-2988555168,2988555183,ES
-2988555184,2988555187,IT
-2988555188,2988555211,FR
-2988555212,2988555215,GB
-2988555216,2988555231,FR
-2988555232,2988555263,PL
-2988555264,2988555527,FR
+2988554040,2988555527,FR
 2988555528,2988555531,DE
-2988555532,2988555563,FR
-2988555564,2988555567,PL
-2988555568,2988555719,FR
-2988555720,2988555723,IE
-2988555724,2988555727,CZ
-2988555728,2988556179,FR
-2988556180,2988556183,ES
-2988556184,2988556191,FR
-2988556192,2988556195,ES
-2988556196,2988556199,CH
-2988556200,2988556207,FR
+2988555532,2988555551,FR
+2988555552,2988555559,PT
+2988555560,2988556207,FR
 2988556208,2988556211,DE
-2988556212,2988556215,FR
-2988556216,2988556219,DE
-2988556220,2988556223,PL
-2988556224,2988556359,FR
+2988556212,2988556359,FR
 2988556360,2988556363,ES
-2988556364,2988556463,FR
-2988556464,2988556479,CH
-2988556480,2988556483,GB
-2988556484,2988556539,FR
-2988556540,2988556543,BE
-2988556544,2988556891,FR
-2988556892,2988556895,IT
-2988556896,2988556967,FR
-2988556968,2988556975,DE
-2988556976,2988557051,FR
-2988557052,2988557055,PT
-2988557056,2988557063,FR
-2988557064,2988557071,GB
-2988557072,2988557079,FR
-2988557080,2988557087,IT
-2988557088,2988557095,FI
-2988557096,2988557247,FR
-2988557248,2988557251,DE
-2988557252,2988557263,FR
-2988557264,2988557279,BE
-2988557280,2988557287,FR
-2988557288,2988557291,PL
-2988557292,2988557295,FR
-2988557296,2988557299,IE
-2988557300,2988557303,ES
-2988557304,2988557311,DE
-2988557312,2988557439,FR
-2988557440,2988557471,GB
-2988557472,2988557491,FR
-2988557492,2988557495,GB
-2988557496,2988557499,DE
-2988557500,2988557507,FR
+2988556364,2988557103,FR
+2988557104,2988557111,PT
+2988557112,2988557507,FR
 2988557508,2988557511,ES
-2988557512,2988557531,FR
-2988557532,2988557535,ES
-2988557536,2988557539,FR
+2988557512,2988557539,FR
 2988557540,2988557543,ES
-2988557544,2988557559,FR
-2988557560,2988557563,DE
-2988557564,2988557643,FR
-2988557644,2988557651,DE
-2988557652,2988557767,FR
-2988557768,2988557771,DE
-2988557772,2988558063,FR
-2988558064,2988558067,BE
-2988558068,2988558071,DE
-2988558072,2988558111,FR
-2988558112,2988558119,IT
-2988558120,2988558143,FR
-2988558144,2988558159,GB
-2988558160,2988558175,FR
-2988558176,2988558191,NL
-2988558192,2988558203,FR
+2988557544,2988558203,FR
 2988558204,2988558207,DE
-2988558208,2988558591,FR
-2988558592,2988558623,DE
+2988558208,2988558623,FR
 2988558624,2988558655,NL
-2988558656,2988558719,PL
-2988558720,2988558727,NL
-2988558728,2988558731,BE
-2988558732,2988558803,FR
+2988558656,2988558803,FR
 2988558804,2988558807,ES
 2988558808,2988558815,NL
-2988558816,2988558831,GB
-2988558832,2988558863,FR
-2988558864,2988558879,NL
-2988558880,2988558891,FR
-2988558892,2988558895,DE
-2988558896,2988558907,FR
-2988558908,2988558911,DE
-2988558912,2988558927,FR
-2988558928,2988558935,CZ
-2988558936,2988558939,IT
-2988558940,2988559011,FR
-2988559012,2988559015,BE
-2988559016,2988559023,DE
-2988559024,2988559247,FR
-2988559248,2988559255,GB
-2988559256,2988559631,FR
-2988559632,2988559647,GB
-2988559648,2988559663,IT
-2988559664,2988559695,FR
-2988559696,2988559703,GB
-2988559704,2988559735,FR
-2988559736,2988559743,GB
-2988559744,2988560287,FR
-2988560288,2988560319,ES
-2988560320,2988560351,FR
-2988560352,2988560383,ES
-2988560384,2988560387,CZ
-2988560388,2988560431,FR
-2988560432,2988560439,CH
-2988560440,2988560463,FR
-2988560464,2988560479,NL
-2988560480,2988560511,FR
-2988560512,2988560527,IT
-2988560528,2988560531,FR
-2988560532,2988560535,ES
-2988560536,2988560543,IT
-2988560544,2988560595,FR
-2988560596,2988560599,ES
-2988560600,2988560607,FR
-2988560608,2988560623,PL
-2988560624,2988560635,FR
-2988560636,2988560639,DE
-2988560640,2988560703,PT
-2988560704,2988560711,NL
-2988560712,2988560719,FR
-2988560720,2988560735,DE
-2988560736,2988560895,FR
-2988560896,2988560919,PL
-2988560920,2988561039,FR
-2988561040,2988561043,GB
-2988561044,2988561055,FR
-2988561056,2988561059,ES
-2988561060,2988561063,FR
-2988561064,2988561071,PL
-2988561072,2988561075,BE
-2988561076,2988561095,FR
-2988561096,2988561099,NL
-2988561100,2988561103,ES
-2988561104,2988561179,FR
-2988561180,2988561183,NL
-2988561184,2988561203,FR
-2988561204,2988561207,PT
-2988561208,2988561215,PL
-2988561216,2988561231,ES
-2988561232,2988561283,FR
-2988561284,2988561287,PT
-2988561288,2988561291,IE
-2988561292,2988561295,DE
-2988561296,2988561343,FR
-2988561344,2988561375,PL
-2988561376,2988561391,NL
-2988561392,2988561583,FR
+2988558816,2988560639,FR
+2988560640,2988560703,ES
+2988560704,2988561583,FR
 2988561584,2988561591,GB
-2988561592,2988561599,FR
-2988561600,2988561631,PL
-2988561632,2988561663,FR
-2988561664,2988561671,PL
-2988561672,2988561747,FR
-2988561748,2988561751,FI
-2988561752,2988561759,FR
-2988561760,2988561763,LT
+2988561592,2988561763,FR
 2988561764,2988561767,IT
-2988561768,2988561847,FR
-2988561848,2988561855,IT
-2988561856,2988561871,GB
-2988561872,2988561875,IE
-2988561876,2988561887,FR
-2988561888,2988561903,GB
-2988561904,2988562143,FR
-2988562144,2988562151,IE
-2988562152,2988562159,DE
-2988562160,2988562495,FR
-2988562496,2988562527,GB
-2988562528,2988562559,FR
-2988562560,2988562575,PL
-2988562576,2988562599,FR
-2988562600,2988562607,DE
-2988562608,2988562615,PT
-2988562616,2988562843,FR
-2988562844,2988562847,DE
+2988561768,2988562847,FR
 2988562848,2988562863,GB
-2988562864,2988563015,FR
-2988563016,2988563023,IE
-2988563024,2988563075,FR
-2988563076,2988563079,ES
-2988563080,2988563135,FR
-2988563136,2988563151,PT
-2988563152,2988563167,FR
-2988563168,2988563183,GB
-2988563184,2988563199,FR
-2988563200,2988563263,PT
-2988563264,2988564011,FR
-2988564012,2988564015,IE
-2988564016,2988564019,ES
-2988564020,2988564143,FR
+2988562864,2988563559,FR
+2988563560,2988563567,NL
+2988563568,2988564023,FR
+2988564024,2988564027,IE
+2988564028,2988564143,FR
 2988564144,2988564159,ES
-2988564160,2988564187,FR
-2988564188,2988564191,PL
-2988564192,2988564199,FR
-2988564200,2988564207,IT
-2988564208,2988564471,FR
-2988564472,2988564479,CZ
-2988564480,2988572671,FR
+2988564160,2988564367,FR
+2988564368,2988564383,GB
+2988564384,2988572671,FR
 2988572672,2988703743,RU
 2988703744,2988834815,PL
 2988834816,2988965887,CH
@@ -54656,15 +52296,14 @@
 2989883392,2989948927,UA
 2989948928,2990014463,FI
 2990014464,2990079999,PL
-2990080000,2990096383,GB
-2990096384,2990104575,RU
-2990104576,2990112767,GB
-2990112768,2990145535,RU
+2990080000,2990145535,RU
 2990145536,2990211071,SI
 2990211072,2990276607,GR
 2990276608,2990342143,ES
 2990342144,2990407679,KW
-2990407680,2990473215,GB
+2990407680,2990472492,GB
+2990472493,2990472493,NL
+2990472494,2990473215,GB
 2990473216,2990475674,DE
 2990475675,2990475675,HR
 2990475676,2990500113,DE
@@ -54845,7 +52484,10 @@
 2997515684,2997515684,GB
 2997515685,2997518335,FR
 2997518336,2997520383,DE
-2997520384,2997526527,NL
+2997520384,2997520895,NL
+2997520896,2997521151,MT
+2997521152,2997521407,US
+2997521408,2997526527,NL
 2997526528,2997583871,RU
 2997583872,2997616639,SY
 2997616640,2997649407,SI
@@ -55162,7 +52804,7 @@
 3002697728,3002699775,DE
 3002699776,3002701823,SE
 3002701824,3002703871,NL
-3002703872,3002705919,DE
+3002703872,3002705919,FR
 3002705920,3002707967,MK
 3002707968,3002710015,KW
 3002710016,3002712063,IT
@@ -55179,9 +52821,7 @@
 3002736640,3002738687,LT
 3002738688,3002740735,PL
 3002740736,3002742783,GB
-3002742784,3002743039,LI
-3002743040,3002743047,GR
-3002743048,3002744831,LI
+3002742784,3002744831,LI
 3002744832,3002746879,IT
 3002746880,3002748927,GB
 3002748928,3002750975,DE
@@ -55393,23 +53033,23 @@
 3005891328,3005893119,PA
 3005893120,3005893631,CO
 3005893632,3005893887,PA
-3005893888,3005894143,CO
-3005894144,3005894399,PA
-3005894400,3005894911,CO
-3005894912,3005896703,PA
+3005893888,3005894911,CO
+3005894912,3005895167,PA
+3005895168,3005895423,CO
+3005895424,3005896703,PA
 3005896704,3005896959,CO
 3005896960,3005897215,PA
 3005897216,3005897727,CO
 3005897728,3005897983,PA
 3005897984,3005898239,CO
 3005898240,3005899007,PA
-3005899008,3005900287,CO
-3005900288,3005901055,PA
+3005899008,3005900543,CO
+3005900544,3005901055,PA
 3005901056,3005901311,CO
-3005901312,3005902591,PA
-3005902592,3005902847,CO
-3005902848,3005903103,PA
-3005903104,3005903871,CO
+3005901312,3005901567,PA
+3005901568,3005901823,CO
+3005901824,3005902591,PA
+3005902592,3005903871,CO
 3005903872,3005904895,PA
 3005904896,3005905407,CO
 3005905408,3005905663,PA
@@ -55423,8 +53063,8 @@
 3005913088,3005913343,PA
 3005913344,3005913599,CO
 3005913600,3005913855,PA
-3005913856,3005914623,CO
-3005914624,3005915135,PA
+3005913856,3005914879,CO
+3005914880,3005915135,PA
 3005915136,3005918207,AR
 3005918208,3005919231,CO
 3005919232,3005923327,AR
@@ -55460,11 +53100,9 @@
 3006284544,3006284799,PA
 3006284800,3006285055,CR
 3006285056,3006285311,PA
-3006285312,3006285567,CR
-3006285568,3006285823,PA
-3006285824,3006286079,CR
-3006286080,3006287103,PA
-3006287104,3006287359,CR
+3006285312,3006286079,CR
+3006286080,3006286847,PA
+3006286848,3006287359,CR
 3006287360,3006287871,PA
 3006287872,3006288127,CR
 3006288128,3006288639,PA
@@ -55479,15 +53117,17 @@
 3006296576,3006296831,CR
 3006296832,3006308351,PA
 3006308352,3006308863,CR
-3006308864,3006310143,PA
+3006308864,3006309631,PA
+3006309632,3006309887,CR
+3006309888,3006310143,PA
 3006310144,3006310655,CR
 3006310656,3006311167,PA
 3006311168,3006311423,CR
 3006311424,3006311679,PA
 3006311680,3006312447,CR
 3006312448,3006312703,PA
-3006312704,3006313215,CR
-3006313216,3006313727,PA
+3006312704,3006313471,CR
+3006313472,3006313727,PA
 3006313728,3006314495,CR
 3006314496,3006315263,PA
 3006315264,3006315775,CR
@@ -55501,12 +53141,10 @@
 3006322432,3006323199,CR
 3006323200,3006323455,PA
 3006323456,3006323711,CR
-3006323712,3006328831,PA
-3006328832,3006329087,NI
-3006329088,3006329343,PA
-3006329344,3006330111,NI
-3006330112,3006330367,PA
-3006330368,3006330623,NI
+3006323712,3006324223,PA
+3006324224,3006324479,CR
+3006324480,3006328831,PA
+3006328832,3006330623,NI
 3006330624,3006330879,PA
 3006330880,3006331903,CR
 3006331904,3006332927,AR
@@ -55562,7 +53200,9 @@
 3007092736,3007094783,AR
 3007094784,3007096831,CR
 3007096832,3007098879,AR
-3007098880,3007100887,HN
+3007098880,3007100647,HN
+3007100648,3007100655,MX
+3007100656,3007100887,HN
 3007100888,3007100895,PH
 3007100896,3007100927,HN
 3007100928,3007102975,AR
@@ -55581,114 +53221,206 @@
 3007123456,3007143935,AR
 3007143936,3007148031,CL
 3007148032,3007152127,CO
-3007152128,3007152383,CL
+3007152128,3007152143,CL
+3007152144,3007152159,DE
+3007152160,3007152383,CL
 3007152384,3007152639,US
-3007152640,3007152895,CL
+3007152640,3007152655,CL
+3007152656,3007152671,DE
+3007152672,3007152895,CL
 3007152896,3007153151,US
-3007153152,3007153279,CL
+3007153152,3007153167,CL
+3007153168,3007153183,DE
+3007153184,3007153279,CL
 3007153280,3007153663,US
-3007153664,3007153919,CL
+3007153664,3007153679,CL
+3007153680,3007153695,DE
+3007153696,3007153919,CL
 3007153920,3007154175,US
-3007154176,3007154303,CL
+3007154176,3007154191,CL
+3007154192,3007154207,DE
+3007154208,3007154303,CL
 3007154304,3007154687,US
-3007154688,3007154943,CL
+3007154688,3007154703,CL
+3007154704,3007154719,DE
+3007154720,3007154943,CL
 3007154944,3007155199,US
-3007155200,3007155327,CL
+3007155200,3007155215,CL
+3007155216,3007155231,DE
+3007155232,3007155327,CL
 3007155328,3007155455,US
 3007155456,3007155711,GB
-3007155712,3007155967,CL
+3007155712,3007155727,CL
+3007155728,3007155743,DE
+3007155744,3007155967,CL
 3007155968,3007156223,DE
-3007156224,3007156351,CL
+3007156224,3007156239,CL
+3007156240,3007156255,DE
+3007156256,3007156351,CL
 3007156352,3007156479,US
 3007156480,3007156495,ES
-3007156496,3007156543,CL
+3007156496,3007156511,DE
+3007156512,3007156543,CL
 3007156544,3007156607,GB
-3007156608,3007156991,CL
+3007156608,3007156751,CL
+3007156752,3007156767,DE
+3007156768,3007156991,CL
 3007156992,3007157007,HR
 3007157008,3007157055,CL
 3007157056,3007157119,GB
-3007157120,3007157375,CL
+3007157120,3007157247,DE
+3007157248,3007157263,CL
+3007157264,3007157279,DE
+3007157280,3007157375,CL
 3007157376,3007157503,US
 3007157504,3007157519,IE
 3007157520,3007157567,CL
 3007157568,3007157631,GB
 3007157632,3007157759,US
-3007157760,3007158015,CL
+3007157760,3007157775,CL
+3007157776,3007157791,DE
+3007157792,3007158015,CL
 3007158016,3007158031,BE
 3007158032,3007158079,CL
 3007158080,3007158143,GB
-3007158144,3007158399,CL
+3007158144,3007158271,DE
+3007158272,3007158287,CL
+3007158288,3007158303,DE
+3007158304,3007158399,CL
 3007158400,3007158527,US
 3007158528,3007158543,GB
 3007158544,3007158591,CL
 3007158592,3007158655,GB
-3007158656,3007159039,CL
+3007158656,3007158783,DE
+3007158784,3007158799,CL
+3007158800,3007158815,DE
+3007158816,3007159039,CL
 3007159040,3007159055,GB
 3007159056,3007159103,CL
 3007159104,3007159167,GB
 3007159168,3007159295,US
-3007159296,3007159423,CL
+3007159296,3007159311,CL
+3007159312,3007159327,DE
+3007159328,3007159423,CL
 3007159424,3007159551,US
 3007159552,3007159567,RU
 3007159568,3007159615,CL
 3007159616,3007159679,GB
-3007159680,3007160063,CL
+3007159680,3007159807,DE
+3007159808,3007159823,CL
+3007159824,3007159839,DE
+3007159840,3007160063,CL
 3007160064,3007160079,HR
 3007160080,3007160127,CL
 3007160128,3007160191,GB
-3007160192,3007160447,CL
+3007160192,3007160319,DE
+3007160320,3007160335,CL
+3007160336,3007160351,DE
+3007160352,3007160447,CL
 3007160448,3007160575,US
 3007160576,3007160591,IE
 3007160592,3007160607,US
 3007160608,3007160703,CL
 3007160704,3007160831,US
-3007160832,3007161087,CL
+3007160832,3007160847,CL
+3007160848,3007160863,DE
+3007160864,3007161087,CL
 3007161088,3007161103,GB
-3007161104,3007161471,CL
+3007161104,3007161215,CL
+3007161216,3007161343,DE
+3007161344,3007161359,CL
+3007161360,3007161375,DE
+3007161376,3007161471,CL
 3007161472,3007161599,US
 3007161600,3007161615,GB
-3007161616,3007162111,CL
+3007161616,3007161727,CL
+3007161728,3007161855,DE
+3007161856,3007161871,CL
+3007161872,3007161887,DE
+3007161888,3007162111,CL
 3007162112,3007162127,ES
 3007162128,3007162239,CL
 3007162240,3007162367,US
-3007162368,3007162495,CL
+3007162368,3007162383,CL
+3007162384,3007162399,DE
+3007162400,3007162495,CL
 3007162496,3007162623,US
 3007162624,3007162639,NL
-3007162640,3007163135,CL
+3007162640,3007162751,CL
+3007162752,3007162879,DE
+3007162880,3007162895,CL
+3007162896,3007162911,DE
+3007162912,3007163135,CL
 3007163136,3007163151,GB
-3007163152,3007163519,CL
+3007163152,3007163199,CL
+3007163200,3007163263,DE
+3007163264,3007163407,CL
+3007163408,3007163423,DE
+3007163424,3007163519,CL
 3007163520,3007163647,US
 3007163648,3007163663,ES
-3007163664,3007163775,CL
+3007163664,3007163711,CL
+3007163712,3007163775,DE
 3007163776,3007163903,US
-3007163904,3007164159,CL
+3007163904,3007163919,CL
+3007163920,3007163935,DE
+3007163936,3007164159,CL
 3007164160,3007164175,SK
-3007164176,3007164543,CL
+3007164176,3007164223,CL
+3007164224,3007164287,DE
+3007164288,3007164431,CL
+3007164432,3007164447,DE
+3007164448,3007164543,CL
 3007164544,3007164671,US
 3007164672,3007164687,SE
-3007164688,3007165183,CL
+3007164688,3007164735,CL
+3007164736,3007164799,DE
+3007164800,3007164943,CL
+3007164944,3007164959,DE
+3007164960,3007165183,CL
 3007165184,3007165199,GB
-3007165200,3007165311,CL
+3007165200,3007165247,CL
+3007165248,3007165311,DE
 3007165312,3007165439,US
-3007165440,3007165567,CL
+3007165440,3007165455,CL
+3007165456,3007165471,DE
+3007165472,3007165567,CL
 3007165568,3007165695,US
 3007165696,3007165711,DK
-3007165712,3007166207,CL
+3007165712,3007165759,CL
+3007165760,3007165823,DE
+3007165824,3007165967,CL
+3007165968,3007165983,DE
+3007165984,3007166207,CL
 3007166208,3007166223,TR
-3007166224,3007166591,CL
+3007166224,3007166271,CL
+3007166272,3007166335,DE
+3007166336,3007166479,CL
+3007166480,3007166495,DE
+3007166496,3007166591,CL
 3007166592,3007166719,US
 3007166720,3007166735,GB
-3007166736,3007166847,CL
+3007166736,3007166751,DE
+3007166752,3007166847,CL
 3007166848,3007166975,US
-3007166976,3007167231,CL
+3007166976,3007166991,CL
+3007166992,3007167007,DE
+3007167008,3007167231,CL
 3007167232,3007167247,ES
-3007167248,3007167615,CL
+3007167248,3007167263,DE
+3007167264,3007167503,CL
+3007167504,3007167519,DE
+3007167520,3007167615,CL
 3007167616,3007167743,US
 3007167744,3007167759,AU
-3007167760,3007168127,CL
+3007167760,3007167775,DE
+3007167776,3007168015,CL
+3007168016,3007168031,DE
+3007168032,3007168127,CL
 3007168128,3007168255,US
 3007168256,3007168271,GR
-3007168272,3007168383,CL
+3007168272,3007168287,DE
+3007168288,3007168383,CL
 3007168384,3007168511,US
 3007168512,3007168767,QA
 3007168768,3007169023,CL
@@ -55732,8 +53464,8 @@
 3007281920,3007283455,CR
 3007283456,3007283711,PA
 3007283712,3007283967,CR
-3007283968,3007284223,PA
-3007284224,3007285759,CR
+3007283968,3007284479,PA
+3007284480,3007285759,CR
 3007285760,3007286271,PA
 3007286272,3007286783,CR
 3007286784,3007287295,PA
@@ -55776,10 +53508,10 @@
 3025141760,3025403903,KR
 3025403904,3025600511,CN
 3025600512,3025603071,IN
-3025603072,3025603087,HK
-3025603088,3025603103,IN
-3025603104,3025603135,HK
-3025603136,3025603839,IN
+3025603072,3025603091,HK
+3025603092,3025603103,IN
+3025603104,3025603199,HK
+3025603200,3025603839,IN
 3025603840,3025604095,HK
 3025604096,3025604381,IN
 3025604382,3025606655,SG
@@ -55795,8 +53527,8 @@
 3025612800,3025612895,IN
 3025612896,3025612927,SG
 3025612928,3025616895,IN
-3025616896,3025617407,SG
-3025617408,3025618943,IN
+3025616896,3025617423,SG
+3025617424,3025618943,IN
 3025618944,3025619487,SG
 3025619488,3025620991,IN
 3025620992,3025621247,PH
@@ -55817,8 +53549,8 @@
 3025625536,3025625599,CA
 3025625600,3025625855,SG
 3025625856,3025629439,IN
-3025629440,3025629503,HK
-3025629504,3025629695,IN
+3025629440,3025629567,HK
+3025629568,3025629695,IN
 3025629696,3025629951,HK
 3025629952,3025630207,IN
 3025630208,3025630719,AU
@@ -55827,7 +53559,9 @@
 3025631240,3025631247,AU
 3025631248,3025632255,IN
 3025632256,3025632271,SG
-3025632272,3025632511,IN
+3025632272,3025632287,IN
+3025632288,3025632351,SG
+3025632352,3025632511,IN
 3025632512,3025632767,SG
 3025632768,3025633535,IN
 3025633536,3025633791,HK
@@ -55863,7 +53597,10 @@
 3025647360,3025647615,AU
 3025647616,3025647775,IN
 3025647776,3025647791,SG
-3025647792,3025647935,IN
+3025647792,3025647839,IN
+3025647840,3025647871,SG
+3025647872,3025647903,HK
+3025647904,3025647935,IN
 3025647936,3025647967,SG
 3025647968,3025648079,IN
 3025648080,3025648087,SG
@@ -56009,7 +53746,9 @@
 3032271872,3032272895,AU
 3032272896,3032276991,JP
 3032276992,3032285183,IN
-3032285184,3032301567,JP
+3032285184,3032289279,JP
+3032289280,3032293375,AU
+3032293376,3032301567,JP
 3032301568,3032317951,KR
 3032317952,3032319999,JP
 3032320000,3032323071,AU
@@ -56133,7 +53872,8 @@
 3039166464,3039231999,PA
 3039232000,3039297535,EC
 3039297536,3039363071,PY
-3039363072,3039412223,BZ
+3039363072,3039411199,BZ
+3039411200,3039412223,US
 3039412224,3039412735,CL
 3039412736,3039413247,BR
 3039413248,3039413503,CL
@@ -56141,17 +53881,15 @@
 3039414016,3039414271,CL
 3039414272,3039414527,BR
 3039414528,3039415295,CL
-3039415296,3039415807,BR
-3039415808,3039416713,CL
+3039415296,3039416319,BR
+3039416320,3039416713,CL
 3039416714,3039416715,US
 3039416716,3039416735,CL
 3039416736,3039416739,US
 3039416740,3039416831,CL
 3039416832,3039417599,BR
 3039417600,3039417855,CL
-3039417856,3039418111,BR
-3039418112,3039418367,CL
-3039418368,3039418879,BR
+3039417856,3039418879,BR
 3039418880,3039419135,CL
 3039419136,3039420415,BR
 3039420416,3039428607,AR
@@ -56198,7 +53936,7 @@
 3048121344,3048122367,PA
 3048122368,3048123391,CR
 3048123392,3048126463,AR
-3048126464,3048128511,VE
+3048126464,3048128511,ES
 3048128512,3048132607,AR
 3048132608,3048135935,CR
 3048135936,3048136447,PA
@@ -56264,7 +54002,7 @@
 3050702352,3050703359,CL
 3050703360,3050703375,AT
 3050703376,3050703871,CL
-3050703872,3050703887,RU
+3050703872,3050703887,PE
 3050703888,3050704383,CL
 3050704384,3050704399,KR
 3050704400,3050704895,CL
@@ -56285,11 +54023,14 @@
 3050708480,3050708495,FR
 3050708496,3050708991,CL
 3050708992,3050709007,AT
-3050709008,3050709503,CL
+3050709008,3050709247,CL
+3050709248,3050709375,DE
+3050709376,3050709503,CL
 3050709504,3050709519,TH
 3050709520,3050710015,CL
 3050710016,3050710031,ES
-3050710032,3050710527,CL
+3050710032,3050710271,CL
+3050710272,3050710527,US
 3050710528,3050710543,FR
 3050710544,3050711039,CL
 3050711040,3050711055,AU
@@ -56303,7 +54044,12 @@
 3050713088,3050713103,LV
 3050713104,3050714367,CL
 3050714368,3050714623,GB
-3050714624,3050766335,CL
+3050714624,3050715647,CL
+3050715648,3050718719,US
+3050718720,3050733567,CL
+3050733568,3050749951,US
+3050749952,3050764287,CL
+3050764288,3050766335,US
 3050766336,3050766351,NO
 3050766352,3050766847,CL
 3050766848,3050766863,KR
@@ -56666,7 +54412,11 @@
 3088605184,3088609279,NL
 3088609280,3088629759,US
 3088629760,3088633855,NL
-3088633856,3088998399,US
+3088633856,3088753919,US
+3088753920,3088754175,NL
+3088754176,3088924671,US
+3088924672,3088925695,NL
+3088925696,3088998399,US
 3088998400,3089002495,NL
 3089002496,3089027071,US
 3089027072,3089031167,NL
@@ -56768,13 +54518,13 @@
 3098263552,3098271743,CA
 3098271744,3098278847,US
 3098278848,3098278911,CA
-3098278912,3098350383,US
+3098278912,3098282279,US
+3098282280,3098282287,BR
+3098282288,3098350383,US
 3098350384,3098350391,BR
 3098350392,3098411007,US
 3098411008,3098415103,PK
-3098415104,3098439679,US
-3098439680,3098441727,CA
-3098441728,3098476543,US
+3098415104,3098476543,US
 3098476544,3098492927,CA
 3098492928,3098494719,US
 3098494720,3098495743,CA
@@ -56800,6 +54550,7 @@
 3103855104,3103855359,DE
 3103855360,3103855615,RU
 3103855616,3103855871,ES
+3103855872,3103856127,AT
 3103856128,3103856383,PL
 3103856384,3103856639,RU
 3103856640,3103856895,HU
@@ -56810,6 +54561,12 @@
 3103857920,3103858175,PL
 3103858176,3103858431,BG
 3103858432,3103858687,AT
+3103858688,3103858943,NL
+3103858944,3103859199,GB
+3103859200,3103859455,SK
+3103859456,3103859711,DE
+3103859712,3103859967,RO
+3103859968,3103860223,PL
 3103916032,3103917055,CH
 3103917056,3103918079,IT
 3103918080,3103919103,DE
@@ -56972,7 +54729,7 @@
 3104075776,3104076799,NL
 3104076800,3104077823,GB
 3104077824,3104078847,AT
-3104078848,3104079871,LU
+3104078848,3104079871,FR
 3104079872,3104080895,GB
 3104080896,3104081919,GR
 3104081920,3104082943,DK
@@ -56999,7 +54756,6 @@
 3104103424,3104104447,IR
 3104104448,3104105471,TR
 3104105472,3104106495,FI
-3104106496,3104107519,CH
 3104107520,3104108543,UA
 3104108544,3104109567,GB
 3104109568,3104110591,ES
@@ -57065,6 +54821,7 @@
 3104173056,3104174079,ES
 3104174080,3104175103,IE
 3104175104,3104176127,IT
+3104176128,3104177151,RU
 3104177152,3104178175,UA
 3104178176,3104179199,PL
 3104179200,3104180223,ES
@@ -57086,7 +54843,7 @@
 3104195584,3104196607,DE
 3104196608,3104197631,IT
 3104197632,3104198655,GR
-3104198656,3104199679,GB
+3104198656,3104199679,RU
 3104199680,3104200703,NL
 3104200704,3104201727,IT
 3104201728,3104202751,FR
@@ -57103,6 +54860,7 @@
 3104212992,3104214015,HU
 3104214016,3104215039,FR
 3104215040,3104216063,DE
+3104216064,3104217087,LB
 3104217088,3104218111,GB
 3104218112,3104219135,HU
 3104219136,3104220159,NL
@@ -57213,9 +54971,7 @@
 3104331776,3104333823,GB
 3104333824,3104334847,ES
 3104334848,3104335871,SE
-3104335872,3104336359,LT
-3104336360,3104336367,BE
-3104336368,3104336407,LT
+3104335872,3104336407,LT
 3104336408,3104336415,CH
 3104336416,3104336895,LT
 3104336896,3104337919,GB
@@ -57356,7 +55112,6 @@
 3104478208,3104479231,DE
 3104479232,3104480255,RU
 3104480256,3104483327,NL
-3104483328,3104484351,SA
 3104484352,3104485375,RU
 3104485376,3104486399,FR
 3104486400,3104488447,RU
@@ -57406,7 +55161,6 @@
 3104533504,3104534527,PL
 3104534528,3104535551,SE
 3104535552,3104536575,ES
-3104536576,3104537599,RO
 3104537600,3104538623,US
 3104538624,3104539647,PL
 3104539648,3104540671,RU
@@ -57509,7 +55263,7 @@
 3104642048,3104643071,KZ
 3104643072,3104644095,RU
 3104644096,3104645119,DE
-3104645120,3104646143,GB
+3104645120,3104646143,RU
 3104646144,3104647167,FR
 3104647168,3104648191,GB
 3104648192,3104649215,RU
@@ -57603,7 +55357,9 @@
 3104747520,3104749567,FR
 3104749568,3104750591,NL
 3104750592,3104751615,CZ
-3104751616,3104752639,UA
+3104751616,3104751871,UA
+3104751872,3104752127,CA
+3104752128,3104752639,UA
 3104752640,3104753663,SA
 3104753664,3104754687,GR
 3104754688,3104755711,MK
@@ -57661,7 +55417,7 @@
 3104809984,3104811007,NL
 3104811008,3104812031,IT
 3104812032,3104813055,RU
-3104814080,3104816127,DE
+3104813056,3104816127,DE
 3104816128,3104817151,RU
 3104817152,3104818175,DE
 3104818176,3104819199,TR
@@ -57829,7 +55585,7 @@
 3104988160,3104989183,DE
 3104989184,3104990207,FR
 3104990208,3104991231,DE
-3104991232,3104992255,SK
+3104991232,3104992255,BE
 3104992256,3104995327,RU
 3104995328,3104996351,GB
 3104996352,3104997375,RU
@@ -57878,6 +55634,7 @@
 3105042432,3105043455,FR
 3105043456,3105044479,DE
 3105044480,3105045503,NL
+3105045504,3105046527,DE
 3105046528,3105047551,NO
 3105047552,3105048575,ES
 3105048576,3105049599,SK
@@ -57904,6 +55661,7 @@
 3105072128,3105073151,IT
 3105073152,3105074175,RU
 3105074176,3105075199,DE
+3105075200,3105076223,RU
 3105076224,3105077247,BE
 3105077248,3105078271,IT
 3105078272,3105079295,ES
@@ -57918,10 +55676,10 @@
 3105087488,3105088511,FR
 3105088512,3105089535,JO
 3105089536,3105090559,DE
-3105090560,3105091583,GB
+3105090560,3105091583,NL
 3105091584,3105092607,FR
 3105092608,3105093631,UA
-3105093632,3105094655,SE
+3105093632,3105095679,SE
 3105095680,3105097727,GB
 3105097728,3105098751,FR
 3105098752,3105099775,SE
@@ -58132,8 +55890,7 @@
 3105320960,3105321983,SK
 3105321984,3105323007,GB
 3105323008,3105324031,ES
-3105324032,3105324287,SA
-3105324288,3105325055,BH
+3105324032,3105325055,SA
 3105325056,3105326079,IR
 3105326080,3105328127,FR
 3105328128,3105329151,NL
@@ -58189,7 +55946,7 @@
 3105383680,3105383935,SK
 3105383936,3105384447,AT
 3105384448,3105385471,IT
-3105386496,3105387519,RU
+3105385472,3105387519,RU
 3105387520,3105388543,IT
 3105388544,3105389567,GB
 3105389568,3105390591,TR
@@ -58240,7 +55997,9 @@
 3105441792,3105442815,IT
 3105442816,3105443839,FI
 3105443840,3105444863,NL
-3105444864,3105445887,A1
+3105444864,3105445119,A1
+3105445120,3105445631,US
+3105445632,3105445887,A1
 3105445888,3105446911,RU
 3105446912,3105447935,CH
 3105447936,3105448959,DE
@@ -58264,7 +56023,9 @@
 3105466368,3105467391,BE
 3105467392,3105468415,GB
 3105468416,3105469439,RU
-3105469440,3105470463,EU
+3105469440,3105469951,SE
+3105469952,3105470207,AT
+3105470208,3105470463,AE
 3105470464,3105471487,CZ
 3105471488,3105472511,GB
 3105472512,3105473535,CH
@@ -58309,6 +56070,7 @@
 3105515520,3105516543,FR
 3105516544,3105517567,NL
 3105517568,3105518591,RU
+3105518592,3105519615,RS
 3105519616,3105520639,RU
 3105520640,3105521663,FR
 3105521664,3105522687,NO
@@ -58342,6 +56104,7 @@
 3105549312,3105549823,AT
 3105549824,3105550079,NL
 3105550080,3105550335,FR
+3105550336,3105551359,GB
 3105551360,3105552383,US
 3105552384,3105553407,FR
 3105553408,3105554431,DE
@@ -58487,9 +56250,9 @@
 3105692672,3105693695,DE
 3105693696,3105696767,FR
 3105696768,3105697791,GB
-3105697792,3105698815,FR
+3105697792,3105698815,GP
 3105698816,3105700863,RU
-3105700864,3105701887,NL
+3105700864,3105701887,BE
 3105701888,3105702911,FR
 3105702912,3105703935,ES
 3105703936,3105704959,IT
@@ -58507,7 +56270,7 @@
 3105716224,3105717247,TR
 3105717248,3105719295,RU
 3105719296,3105721343,GB
-3105721344,3105722367,SI
+3105721344,3105722367,BA
 3105722368,3105723391,IT
 3105723392,3105724415,FR
 3105724416,3105725439,CH
@@ -58595,7 +56358,7 @@
 3105807360,3105808383,RU
 3105808384,3105809407,NO
 3105809408,3105810431,RU
-3105810432,3105811455,IL
+3105810432,3105811455,FR
 3105811456,3105812479,NL
 3105812480,3105814527,ES
 3105814528,3105815551,JO
@@ -58694,6 +56457,7 @@
 3105916928,3105917951,ES
 3105917952,3105918975,NL
 3105918976,3105919999,PL
+3105920000,3105921023,IQ
 3105921024,3105922047,IE
 3105922048,3105923071,PL
 3105923072,3105924095,CZ
@@ -58707,17 +56471,22 @@
 3105930240,3105931263,PT
 3105931264,3105932287,EU
 3105932288,3105933311,SE
-3105933312,3105933343,GB
-3105933344,3105933359,IT
+3105933312,3105933351,GB
+3105933352,3105933359,IT
 3105933360,3105933463,GB
 3105933464,3105933471,IT
-3105933472,3105933871,GB
+3105933472,3105933743,GB
+3105933744,3105933751,IT
+3105933752,3105933831,GB
+3105933832,3105933839,IT
+3105933840,3105933871,GB
 3105933872,3105933879,IT
 3105933880,3105934215,GB
 3105934216,3105934223,IT
 3105934224,3105934231,GB
 3105934232,3105934239,IT
-3105934240,3105934335,GB
+3105934240,3105934327,GB
+3105934328,3105934335,IT
 3105934336,3105935359,SE
 3105935360,3105936383,FR
 3105936384,3105937407,CH
@@ -58733,6 +56502,7 @@
 3105944576,3105945599,DE
 3105945600,3105946623,RU
 3105946624,3105947647,IE
+3105947648,3105948671,RU
 3105948672,3105949695,GB
 3105949696,3105950719,AT
 3105950720,3105951743,FR
@@ -58753,7 +56523,9 @@
 3105966080,3105967103,FI
 3105967104,3105968127,GB
 3105968128,3105969151,HU
-3105969152,3105970175,GB
+3105969152,3105969663,GB
+3105969664,3105969695,DE
+3105969696,3105970175,GB
 3105970176,3105971199,FR
 3105971200,3105972223,GB
 3105972224,3105973247,FI
@@ -58775,7 +56547,8 @@
 3105987584,3105988607,CZ
 3105988608,3105989631,RU
 3105989632,3105990655,NL
-3105990656,3105991679,US
+3105990656,3105990911,PS
+3105990912,3105991679,US
 3105991680,3105992703,SA
 3105992704,3105993727,BH
 3105993728,3105994751,DE
@@ -58808,7 +56581,7 @@
 3106022400,3106023423,IT
 3106023424,3106023679,NL
 3106023680,3106024319,US
-3106024320,3106024447,RU
+3106024320,3106024447,DE
 3106024448,3106025471,GB
 3106025472,3106026495,PL
 3106026496,3106027519,NL
@@ -58990,7 +56763,8 @@
 3106202624,3106203647,RU
 3106203648,3106204671,GR
 3106204672,3106205695,MT
-3106205696,3106206719,NO
+3106205696,3106205951,SE
+3106205952,3106206719,NO
 3106206720,3106207743,GE
 3106207744,3106208767,GB
 3106208768,3106209791,RO
@@ -59027,6 +56801,7 @@
 3106239488,3106240511,IT
 3106240512,3106241535,IE
 3106241536,3106242559,NL
+3106242560,3106243583,RU
 3106243584,3106244607,FI
 3106244608,3106245631,DE
 3106245632,3106245887,DK
@@ -59214,6 +56989,7 @@
 3106442240,3106443263,GB
 3106443264,3106445311,ES
 3106445312,3106446335,RU
+3106446336,3106447359,AZ
 3106447360,3106448383,DE
 3106448384,3106449407,BG
 3106449408,3106450431,AT
@@ -59235,7 +57011,6 @@
 3106465792,3106466815,EU
 3106466816,3106467839,EE
 3106467840,3106468863,IR
-3106468864,3106469887,GB
 3106469888,3106470911,DE
 3106470912,3106471935,NL
 3106471936,3106472959,IR
@@ -59255,7 +57030,23 @@
 3106483426,3106483426,FR
 3106483427,3106483429,GB
 3106483430,3106483430,IE
-3106483431,3106484223,GB
+3106483431,3106483761,GB
+3106483762,3106483762,DE
+3106483763,3106483763,CZ
+3106483764,3106483765,GB
+3106483766,3106483766,IT
+3106483767,3106483767,DE
+3106483768,3106483768,CZ
+3106483769,3106483769,BE
+3106483770,3106483770,PL
+3106483771,3106483771,FR
+3106483772,3106483772,IE
+3106483773,3106483773,IT
+3106483774,3106483774,PL
+3106483775,3106483775,IE
+3106483776,3106483826,GB
+3106483827,3106483827,FR
+3106483828,3106484223,GB
 3106484224,3106485247,NL
 3106485248,3106486271,CZ
 3106486272,3106488319,DE
@@ -59527,8 +57318,7 @@
 3106780160,3106781183,FR
 3106781184,3106782207,DK
 3106782208,3106783231,IR
-3106783232,3106783743,NL
-3106783744,3106784255,AE
+3106783232,3106784255,NL
 3106784256,3106785279,HU
 3106785280,3106786303,CZ
 3106786304,3106787327,DE
@@ -59560,9 +57350,13 @@
 3106817024,3106818047,IT
 3106818048,3106819071,IE
 3106819072,3106820095,BE
-3106820096,3106821631,CH
-3106821632,3106821887,HK
-3106821888,3106822143,RU
+3106820096,3106821247,CH
+3106821248,3106821375,PL
+3106821376,3106821631,US
+3106821632,3106821759,HK
+3106821760,3106821887,CN
+3106821888,3106822015,RU
+3106822016,3106822143,JP
 3106822144,3106824191,CH
 3106824192,3106825215,RU
 3106825216,3106826239,IT
@@ -59594,7 +57388,9 @@
 3106850816,3106851839,GB
 3106851840,3106852863,PL
 3106852864,3106853887,GB
-3106853888,3106854911,CH
+3106853888,3106854015,EU
+3106854016,3106854143,NL
+3106854144,3106854911,CH
 3106854912,3106855935,IR
 3106855936,3106856959,UA
 3106856960,3106857983,NO
@@ -59898,7 +57694,6 @@
 3107183616,3107184639,IQ
 3107184640,3107185663,SE
 3107185664,3107186687,CZ
-3107186688,3107187711,GB
 3107187712,3107188735,MT
 3107188736,3107189759,CZ
 3107189760,3107190783,NL
@@ -60016,7 +57811,8 @@
 3107315712,3107316735,GB
 3107316736,3107317759,KG
 3107317760,3107318783,RU
-3107318784,3107319807,NL
+3107318784,3107318799,IE
+3107318800,3107319807,NL
 3107319808,3107320831,OM
 3107320832,3107321855,SA
 3107321856,3107322879,NL
@@ -60068,7 +57864,7 @@
 3107371008,3107372031,PL
 3107372032,3107373055,DE
 3107373056,3107374079,ES
-3107374080,3107374080,A1
+3107374080,3107374080,SE
 3107374081,3107374100,MT
 3107374101,3107374120,CR
 3107374121,3107374140,IT
@@ -60079,19 +57875,19 @@
 3107374221,3107374240,CA
 3107374241,3107374260,BO
 3107374261,3107374280,US
-3107374281,3107374320,A1
+3107374281,3107374320,SE
 3107374321,3107374332,MX
-3107374333,3107374333,A1
+3107374333,3107374333,SE
 3107374334,3107374335,MX
-3107374336,3107374336,A1
+3107374336,3107374336,SE
 3107374337,3107374340,US
-3107374341,3107375103,A1
+3107374341,3107375103,SE
 3107375104,3107376127,GB
 3107376128,3107377151,NL
 3107377152,3107378175,AT
 3107378176,3107379199,IT
 3107379200,3107380223,NL
-3107380224,3107381247,RU
+3107380224,3107381247,EU
 3107381248,3107382271,IE
 3107382272,3107383295,FR
 3107383296,3107384319,DE
@@ -60411,7 +58207,10 @@
 3107704832,3107705855,CZ
 3107705856,3107706879,NO
 3107706880,3107707903,RU
-3107707904,3107708927,GB
+3107707904,3107708159,DE
+3107708160,3107708415,GB
+3107708416,3107708671,NL
+3107708672,3107708927,US
 3107708928,3107709951,PL
 3107709952,3107710975,DK
 3107710976,3107711999,RU
@@ -60500,7 +58299,7 @@
 3107802112,3107803135,RU
 3107803136,3107804159,ES
 3107804160,3107805183,CZ
-3107805184,3107806207,ES
+3107805184,3107806207,GB
 3107806208,3107807231,RU
 3107807232,3107808255,GB
 3107808256,3107809279,DE
@@ -60561,7 +58360,7 @@
 3107867648,3107868671,GB
 3107868672,3107869695,CH
 3107869696,3107870719,GB
-3107870720,3107871743,CH
+3107870720,3107871743,DE
 3107871744,3107872767,PL
 3107872768,3107873791,LV
 3107873792,3107874815,RU
@@ -60617,7 +58416,8 @@
 3107929088,3107930111,RU
 3107930112,3107931135,CH
 3107931136,3107932159,NL
-3107932160,3107934207,MT
+3107932160,3107932415,SE
+3107932416,3107934207,MT
 3107934208,3107935231,GB
 3107935232,3107936255,PL
 3107936256,3107937279,IT
@@ -60695,7 +58495,8 @@
 3108012032,3108013055,FR
 3108013056,3108014079,HR
 3108014080,3108015103,NL
-3108015104,3108016127,IE
+3108015104,3108015359,GB
+3108015360,3108016127,IE
 3108016128,3108017151,DE
 3108017152,3108018175,FR
 3108018176,3108019199,AT
@@ -60720,17 +58521,13 @@
 3108038656,3108039679,ES
 3108039680,3108040703,MD
 3108040704,3108041727,ES
-3108041728,3108042751,DE
-3108042752,3108044799,GB
+3108041728,3108044799,GB
 3108044800,3108045823,LU
 3108045824,3108046847,DE
 3108046848,3108047871,HU
-3108047872,3108048895,RU
-3108048896,3108049919,UA
-3108049920,3108050943,RU
+3108047872,3108050943,RU
 3108050944,3108051967,GB
 3108051968,3108052991,FR
-3108052992,3108054015,IR
 3108054016,3108055039,LV
 3108055040,3108056063,GB
 3108056064,3108057087,IT
@@ -60754,7 +58551,7 @@
 3108076544,3108077567,NL
 3108077568,3108078591,GB
 3108078592,3108079615,SE
-3108079616,3108080639,MD
+3108079616,3108080639,RU
 3108080640,3108081663,SE
 3108081664,3108082687,GB
 3108082688,3108083711,RU
@@ -60769,7 +58566,9 @@
 3108091904,3108092927,ES
 3108092928,3108093951,SE
 3108093952,3108095999,DE
-3108096000,3108097023,RU
+3108096000,3108096511,LT
+3108096512,3108096767,RU
+3108096768,3108097023,ES
 3108097024,3108098047,TR
 3108098048,3108099071,DE
 3108099072,3108100095,NL
@@ -60785,7 +58584,7 @@
 3108109312,3108110335,IQ
 3108110336,3108111359,DK
 3108111360,3108112383,GB
-3108112384,3108113407,UA
+3108112384,3108113407,US
 3108113408,3108114431,RU
 3108114432,3108115455,AE
 3108115456,3108116479,GB
@@ -60838,11 +58637,12 @@
 3108167680,3108169727,IR
 3108169728,3108170751,FR
 3108170752,3108171775,DE
-3108171776,3108172799,GB
+3108171776,3108172799,EU
 3108172800,3108173823,DE
 3108173824,3108174847,NL
 3108174848,3108175871,KG
-3108175872,3108176895,UA
+3108175872,3108176127,NL
+3108176128,3108176895,UA
 3108176896,3108177919,NL
 3108177920,3108178943,PL
 3108178944,3108179967,IR
@@ -60859,7 +58659,7 @@
 3108191232,3108193279,NL
 3108193280,3108194303,PL
 3108194304,3108195327,FR
-3108195328,3108196351,GB
+3108195328,3108196351,ES
 3108196352,3108197375,FI
 3108197376,3108198399,IS
 3108198400,3108199423,FR
@@ -60875,12 +58675,12 @@
 3108209664,3108210687,CZ
 3108210688,3108211711,BR
 3108211712,3108212735,GB
-3108212736,3108213759,FR
-3108213760,3108214783,GB
-3108214784,3108215807,FR
+3108212736,3108215807,FR
 3108215808,3108216831,DE
 3108216832,3108217855,RU
-3108217856,3108218879,GB
+3108217856,3108218111,GB
+3108218112,3108218623,US
+3108218624,3108218879,GB
 3108218880,3108219903,RU
 3108219904,3108220927,AT
 3108220928,3108221951,AL
@@ -60963,10 +58763,10 @@
 3108302848,3108303871,NL
 3108303872,3108304895,RU
 3108304896,3108305919,GB
-3108305920,3108306943,IE
+3108305920,3108306943,DE
 3108306944,3108307967,PL
 3108307968,3108308991,IQ
-3108308992,3108310015,FR
+3108308992,3108310015,ES
 3108310016,3108312063,GB
 3108312064,3108313087,PL
 3108313088,3108314111,LV
@@ -60976,7 +58776,7 @@
 3108317184,3108318207,CH
 3108318208,3108319231,SE
 3108319232,3108320255,SK
-3108320256,3108321279,FR
+3108320256,3108321279,LT
 3108321280,3108322303,RO
 3108322304,3108323327,NL
 3108323328,3108324351,GB
@@ -61011,7 +58811,7 @@
 3108354048,3108355071,TM
 3108355072,3108356095,IT
 3108356096,3108358143,PL
-3108358144,3108359167,RO
+3108358144,3108359167,DE
 3108359168,3108360191,NL
 3108360192,3108361215,RU
 3108361216,3108362239,IE
@@ -61022,7 +58822,7 @@
 3108366336,3108367359,NL
 3108367360,3108368383,AT
 3108368384,3108369407,RO
-3108369408,3108370431,BE
+3108369408,3108370431,AT
 3108370432,3108371455,FR
 3108371456,3108372479,ES
 3108372480,3108373503,SK
@@ -61037,9 +58837,10 @@
 3108381696,3108382719,PL
 3108382720,3108383743,CH
 3108383744,3108384767,BE
+3108384768,3108385791,CH
 3108385792,3108386815,GE
 3108386816,3108387839,GB
-3108387840,3108388863,IQ
+3108387840,3108388863,IR
 3108388864,3108389887,NL
 3108389888,3108390911,CH
 3108390912,3108391935,BE
@@ -61084,7 +58885,7 @@
 3108434944,3108435967,CH
 3108435968,3108436991,IL
 3108436992,3108438015,GB
-3108438016,3108439039,UA
+3108438016,3108439039,US
 3108439040,3108440063,DE
 3108440064,3108441087,IT
 3108441088,3108443135,CH
@@ -61151,7 +58952,7 @@
 3108508672,3108509695,CH
 3108509696,3108510719,IR
 3108510720,3108511743,SI
-3108511744,3108512767,RU
+3108511744,3108512767,PL
 3108512768,3108513791,DK
 3108513792,3108514815,IT
 3108514816,3108515839,ES
@@ -61172,6 +58973,839 @@
 3108530176,3108531199,SI
 3108531200,3108532223,GB
 3108532224,3108533247,ES
+3108533248,3108534271,FI
+3108534272,3108536319,NL
+3108536320,3108537343,GB
+3108537344,3108538367,NL
+3108538368,3108539391,AT
+3108539392,3108540415,DK
+3108540416,3108541439,RU
+3108541440,3108542463,GR
+3108542464,3108543487,PT
+3108543488,3108544511,US
+3108544512,3108546559,NL
+3108546560,3108547583,BE
+3108547584,3108548607,GB
+3108548608,3108549631,RO
+3108549632,3108550655,NL
+3108550656,3108551679,PL
+3108551680,3108552703,RU
+3108552704,3108553727,CH
+3108553728,3108554751,PL
+3108554752,3108555775,DE
+3108555776,3108556799,LV
+3108556800,3108557823,DK
+3108557824,3108558847,ES
+3108558848,3108559871,LB
+3108559872,3108560895,NO
+3108560896,3108562943,RU
+3108562944,3108563967,DE
+3108563968,3108564991,CH
+3108564992,3108566015,RO
+3108566016,3108567039,DE
+3108567040,3108568063,FR
+3108568064,3108569087,TR
+3108569088,3108570111,IR
+3108570112,3108571135,SI
+3108571136,3108572159,GB
+3108572160,3108573183,NO
+3108573184,3108574207,RU
+3108574208,3108575231,DE
+3108575232,3108576255,NO
+3108576256,3108578303,NL
+3108578304,3108579327,GB
+3108579328,3108580351,GR
+3108580352,3108581375,GB
+3108581376,3108582399,DE
+3108582400,3108583423,FR
+3108583424,3108584447,BG
+3108584448,3108585471,PL
+3108585472,3108586495,GB
+3108586496,3108587519,EE
+3108587520,3108588543,DK
+3108588544,3108589567,IR
+3108589568,3108590591,DE
+3108590592,3108591615,GB
+3108591616,3108592639,PL
+3108592640,3108593663,NL
+3108593664,3108594687,ES
+3108594688,3108597759,CZ
+3108597760,3108598783,IR
+3108598784,3108600831,CH
+3108600832,3108601855,NL
+3108601856,3108602879,TR
+3108602880,3108603903,EE
+3108603904,3108604927,IT
+3108604928,3108605951,GB
+3108605952,3108606975,NL
+3108606976,3108609023,GB
+3108609024,3108610047,LI
+3108610048,3108611071,CZ
+3108611072,3108612095,IT
+3108612096,3108615167,ES
+3108615168,3108616191,RU
+3108616192,3108617215,GB
+3108617216,3108618239,ES
+3108618240,3108619263,RU
+3108619264,3108620287,DK
+3108620288,3108621311,TR
+3108621312,3108622335,FR
+3108622336,3108623359,PL
+3108623360,3108625407,RU
+3108625408,3108626431,NL
+3108626432,3108627455,CZ
+3108627456,3108628479,PL
+3108628480,3108629503,FR
+3108629504,3108630527,BG
+3108630528,3108631551,CH
+3108631552,3108633599,IT
+3108633600,3108634623,FR
+3108634624,3108635647,AT
+3108635648,3108636671,UZ
+3108636672,3108637695,FR
+3108637696,3108638719,DE
+3108638720,3108639743,ES
+3108639744,3108640767,TR
+3108640768,3108641791,GB
+3108641792,3108642815,CH
+3108642816,3108643839,FR
+3108643840,3108644863,IT
+3108644864,3108645887,FR
+3108645888,3108646911,US
+3108646912,3108647935,DK
+3108647936,3108648959,FR
+3108648960,3108649983,IM
+3108649984,3108651007,CZ
+3108651008,3108652031,DE
+3108652032,3108653055,CH
+3108653056,3108654079,GI
+3108654080,3108655103,NL
+3108655104,3108656127,ES
+3108656128,3108657151,PL
+3108657152,3108658175,RS
+3108658176,3108659199,GE
+3108659200,3108660223,FR
+3108660224,3108661247,UZ
+3108661248,3108662271,RU
+3108662272,3108676607,CH
+3108676608,3108677631,IR
+3108677632,3108678655,GB
+3108678656,3108679679,RU
+3108679680,3108680703,GB
+3108680704,3108681727,DE
+3108681728,3108682751,RU
+3108682752,3108683775,IT
+3108683776,3108684799,ES
+3108684800,3108685823,SK
+3108685824,3108686847,FR
+3108686848,3108687871,CZ
+3108687872,3108688895,FO
+3108688896,3108689919,CH
+3108689920,3108690943,DE
+3108690944,3108691967,RU
+3108691968,3108692991,DE
+3108692992,3108694015,RU
+3108694016,3108696063,GB
+3108696064,3108697087,ES
+3108697088,3108698111,DE
+3108698112,3108699135,IT
+3108699136,3108700159,CZ
+3108700160,3108701183,PL
+3108701184,3108702207,RU
+3108702208,3108703231,AT
+3108703232,3108704255,ES
+3108704256,3108705279,SA
+3108705280,3108706303,ES
+3108706304,3108707327,DE
+3108707328,3108708351,GB
+3108708352,3108709375,CH
+3108709376,3108710399,PL
+3108710400,3108711423,SE
+3108711424,3108712447,RU
+3108712448,3108713471,BG
+3108713472,3108714495,RO
+3108714496,3108715519,RS
+3108715520,3108716543,GB
+3108716544,3108717567,RU
+3108717568,3108718591,FR
+3108718592,3108719615,DE
+3108719616,3108720639,IT
+3108720640,3108721663,MD
+3108721664,3108723711,RU
+3108723712,3108724735,GB
+3108724736,3108725759,IQ
+3108725760,3108726783,DE
+3108726784,3108727807,GB
+3108727808,3108728831,IT
+3108728832,3108729855,NL
+3108729856,3108730879,CZ
+3108730880,3108731903,GB
+3108731904,3108732927,FR
+3108732928,3108733951,FI
+3108733952,3108734975,RU
+3108734976,3108735999,CZ
+3108736000,3108737023,FR
+3108737024,3108738047,IE
+3108738048,3108739071,DE
+3108739072,3108740095,CH
+3108740096,3108741119,NL
+3108741120,3108742143,PL
+3108742144,3108743167,DE
+3108743168,3108744191,NL
+3108744192,3108745215,GB
+3108745216,3108746239,ES
+3108746240,3108747263,RU
+3108747264,3108748287,DE
+3108748288,3108749311,RU
+3108749312,3108750335,HU
+3108750336,3108751359,IR
+3108751360,3108752383,RU
+3108752384,3108753407,IR
+3108753408,3108754431,NL
+3108754432,3108755455,GB
+3108755456,3108756479,AT
+3108756480,3108757503,NL
+3108757504,3108758527,FR
+3108758528,3108759551,DE
+3108759552,3108760575,CZ
+3108760576,3108761599,LV
+3108761600,3108762623,GB
+3108762624,3108763647,NL
+3108763648,3108764671,RU
+3108764672,3108765695,NL
+3108765696,3108766719,FR
+3108766720,3108767743,PT
+3108767744,3108768767,CZ
+3108768768,3108769791,UA
+3108769792,3108770815,NL
+3108770816,3108772863,FR
+3108772864,3108773887,RO
+3108773888,3108774911,IQ
+3108774912,3108775935,GB
+3108775936,3108776959,DE
+3108776960,3108779007,GB
+3108779008,3108780031,RO
+3108780032,3108781055,IT
+3108781056,3108782079,RO
+3108782080,3108783103,SE
+3108783104,3108784127,UA
+3108784128,3108785151,NL
+3108785152,3108786175,ES
+3108786176,3108787199,RU
+3108787200,3108788223,NO
+3108788224,3108789247,NL
+3108789248,3108790271,GB
+3108790272,3108791295,DE
+3108791296,3108792319,IT
+3108792320,3108793343,PL
+3108793344,3108794367,RU
+3108794368,3108795391,FR
+3108795392,3108796415,DE
+3108796416,3108797439,FR
+3108797440,3108798463,NL
+3108798464,3108799487,AE
+3108799488,3108800511,NL
+3108800512,3108801535,RO
+3108801536,3108802559,TR
+3108802560,3108803583,RU
+3108803584,3108804607,GB
+3108804608,3108805631,TR
+3108805632,3108808703,DE
+3108808704,3108809727,NL
+3108809728,3108810751,DE
+3108810752,3108811775,LB
+3108811776,3108812799,CH
+3108812800,3108813823,GB
+3108813824,3108814847,DE
+3108814848,3108815871,FR
+3108815872,3108817919,TR
+3108817920,3108818943,AE
+3108818944,3108819967,GB
+3108819968,3108822015,ES
+3108822016,3108823039,RU
+3108823040,3108825087,IE
+3108825088,3108826111,RU
+3108826112,3108827135,NL
+3108827136,3108828159,RU
+3108828160,3108829183,MT
+3108829184,3108830207,IR
+3108830208,3108831231,RU
+3108831232,3108832255,TR
+3108832256,3108833279,GB
+3108833280,3108834303,RU
+3108834304,3108835327,BE
+3108835328,3108836351,RU
+3108836352,3108837375,GB
+3108837376,3108838399,NL
+3108838400,3108839423,GE
+3108839424,3108840447,IT
+3108840448,3108841471,GR
+3108841472,3108842495,TR
+3108842496,3108843519,LI
+3108843520,3108844543,IT
+3108844544,3108845567,LI
+3108845568,3108846591,GB
+3108846592,3108847615,BE
+3108847616,3108848639,GB
+3108848640,3108849663,CH
+3108849664,3108850687,GB
+3108850688,3108851711,PL
+3108851712,3108852735,GB
+3108852736,3108853759,IT
+3108853760,3108854783,TR
+3108854784,3108855807,CH
+3108855808,3108856831,LT
+3108856832,3108857855,UA
+3108857856,3108858879,DE
+3108858880,3108859903,AT
+3108859904,3108860927,FR
+3108860928,3108861951,NO
+3108861952,3108862975,NL
+3108862976,3108863999,BG
+3108864000,3108865023,NL
+3108865024,3108866047,ES
+3108866048,3108867071,RU
+3108867072,3108868095,GB
+3108868096,3108869119,SK
+3108869120,3108870143,RU
+3108870144,3108871167,GB
+3108871168,3108872191,ES
+3108872192,3108873215,IT
+3108873216,3108874239,SG
+3108874240,3108875263,ES
+3108875264,3108876287,GB
+3108876288,3108877311,ES
+3108877312,3108878335,FR
+3108878336,3108879359,ES
+3108879360,3108880383,NL
+3108880384,3108881407,AM
+3108881408,3108882431,BE
+3108882432,3108883455,GB
+3108883456,3108884479,RU
+3108884480,3108885503,NL
+3108885504,3108886527,BE
+3108886528,3108888575,RU
+3108888576,3108889599,VA
+3108889600,3108893695,RU
+3108893696,3108894719,FI
+3108894720,3108895743,RO
+3108895744,3108896767,AT
+3108896768,3108897791,ES
+3108897792,3108899839,GB
+3108899840,3108900863,CZ
+3108900864,3108901887,IT
+3108901888,3108902911,IR
+3108902912,3108903935,ES
+3108903936,3108905983,RU
+3108905984,3108907007,BG
+3108907008,3108908031,DE
+3108908032,3108909055,EE
+3108909056,3108910079,IT
+3108910080,3108911103,GB
+3108911104,3108912127,CZ
+3108912128,3108913151,DE
+3108913152,3108914175,IT
+3108914176,3108915199,NO
+3108915200,3108916223,PL
+3108916224,3108917247,RU
+3108917248,3108918271,FR
+3108918272,3108919295,TR
+3108919296,3108920319,GB
+3108920320,3108921343,RU
+3108921344,3108922367,NL
+3108922368,3108923391,CZ
+3108923392,3108924415,IR
+3108924416,3108927487,RU
+3108927488,3108929535,CH
+3108929536,3108930559,CY
+3108930560,3108931583,PL
+3108931584,3108932607,UZ
+3108932608,3108933631,FR
+3108933632,3108934655,AM
+3108934656,3108935679,PL
+3108935680,3108936703,SK
+3108936704,3108937727,FR
+3108937728,3108938751,NL
+3108938752,3108940799,GB
+3108940800,3108941823,SE
+3108941824,3108942847,DE
+3108942848,3108943871,BE
+3108943872,3108944895,DE
+3108944896,3108945919,CH
+3108945920,3108946943,GB
+3108946944,3108947967,NL
+3108947968,3108948991,RU
+3108948992,3108950015,GB
+3108950016,3108951039,NO
+3108951040,3108952063,ES
+3108952064,3108953087,GB
+3108953088,3108954111,GR
+3108954112,3108955135,AL
+3108955136,3108956159,NO
+3108956160,3108956671,UA
+3108956672,3108957183,CZ
+3108957184,3108958207,RU
+3108958208,3108959231,SI
+3108959232,3108960255,AE
+3108960256,3108961279,NL
+3108961280,3108962303,DE
+3108962304,3108963327,AM
+3108963328,3108964351,ES
+3108964352,3108965375,NL
+3108965376,3108966399,TR
+3108966400,3108967423,BY
+3108967424,3108968447,ES
+3108968448,3108969471,DE
+3108969472,3108970495,ES
+3108970496,3108971519,PL
+3108971520,3108972543,ES
+3108972544,3108973567,MD
+3108973568,3108974591,DE
+3108974592,3108975615,RU
+3108975616,3108976639,IT
+3108976640,3108977663,GB
+3108977664,3108978687,IR
+3108978688,3108979711,DE
+3108979712,3108980735,RU
+3108980736,3108981759,DE
+3108981760,3108982783,RU
+3108982784,3108983807,NL
+3108983808,3108984831,NO
+3108984832,3108985855,CH
+3108985856,3108986879,HU
+3108986880,3108987903,IR
+3108987904,3108988927,RU
+3108988928,3108989951,CH
+3108989952,3108991999,GB
+3108992000,3108993023,RU
+3108993024,3108994047,BG
+3108994048,3108995071,DE
+3108995072,3108996095,ES
+3108996096,3108998143,RU
+3108998144,3108999167,GB
+3108999168,3109000191,ES
+3109000192,3109001215,FR
+3109001216,3109002239,NL
+3109002240,3109003263,IR
+3109003264,3109004287,NL
+3109004288,3109005311,SE
+3109005312,3109006335,DE
+3109006336,3109007359,ES
+3109007360,3109008383,GB
+3109008384,3109009407,CH
+3109009408,3109010431,GB
+3109010432,3109011455,GR
+3109011456,3109012479,FR
+3109012480,3109013503,DE
+3109013504,3109015551,CH
+3109015552,3109016575,DE
+3109016576,3109017599,KZ
+3109017600,3109018623,DE
+3109018624,3109019647,FR
+3109019648,3109020671,PT
+3109020672,3109021695,SI
+3109021696,3109022719,CH
+3109022720,3109023743,RU
+3109023744,3109024767,PL
+3109024768,3109025791,LT
+3109025792,3109026815,SA
+3109026816,3109027839,CH
+3109027840,3109028863,BG
+3109028864,3109029887,ES
+3109029888,3109030911,NL
+3109030912,3109031935,GB
+3109031936,3109032959,FR
+3109032960,3109033983,TR
+3109033984,3109035007,JO
+3109035008,3109036031,RU
+3109036032,3109037055,PL
+3109037056,3109038079,NL
+3109038080,3109039103,IQ
+3109039104,3109040127,YE
+3109040128,3109041151,HU
+3109041152,3109042175,NL
+3109042176,3109043199,PL
+3109043200,3109044223,NO
+3109044224,3109045247,CH
+3109045248,3109046271,RS
+3109046272,3109047295,TR
+3109047296,3109048319,PT
+3109048320,3109050367,GB
+3109050368,3109051391,CH
+3109051392,3109052415,DE
+3109052416,3109053439,ME
+3109053440,3109054463,RU
+3109054464,3109055487,JO
+3109055488,3109056511,IL
+3109056512,3109058559,GB
+3109058560,3109059583,DE
+3109059584,3109060607,LU
+3109060608,3109061631,LT
+3109061632,3109062655,GB
+3109062656,3109063679,TR
+3109063680,3109064703,YE
+3109064704,3109065727,DE
+3109065728,3109066751,RU
+3109066752,3109067775,UA
+3109067776,3109068799,NO
+3109068800,3109069823,PL
+3109069824,3109070847,MK
+3109070848,3109071871,DE
+3109071872,3109072895,AZ
+3109072896,3109073919,GB
+3109073920,3109074943,NO
+3109074944,3109075967,DE
+3109075968,3109076991,AT
+3109076992,3109078015,HR
+3109078016,3109079039,IR
+3109079040,3109080063,US
+3109080064,3109081087,RU
+3109081088,3109082111,SE
+3109082112,3109083135,PL
+3109083136,3109084159,SE
+3109084160,3109085183,GB
+3109085184,3109086207,AL
+3109086208,3109087231,RU
+3109087232,3109088255,NL
+3109088256,3109089279,LV
+3109089280,3109090303,AT
+3109090304,3109091327,NL
+3109091328,3109092351,RU
+3109092352,3109093375,SE
+3109093376,3109095423,IT
+3109095424,3109096447,NL
+3109096448,3109097471,NO
+3109097472,3109098495,GB
+3109098496,3109099519,HU
+3109099520,3109100543,RU
+3109100544,3109101567,SI
+3109101568,3109102591,CY
+3109102592,3109103615,DK
+3109103616,3109104639,IR
+3109104640,3109105663,FR
+3109105664,3109106687,LV
+3109106688,3109107711,FR
+3109107712,3109108735,PL
+3109108736,3109109759,RS
+3109109760,3109110783,RU
+3109110784,3109111807,FI
+3109111808,3109112831,IE
+3109112832,3109113855,ES
+3109113856,3109115903,AZ
+3109115904,3109116927,AU
+3109116928,3109117951,GE
+3109117952,3109118975,IR
+3109118976,3109119999,DE
+3109120000,3109121023,PL
+3109121024,3109122047,SE
+3109122048,3109123071,NL
+3109123072,3109124095,DK
+3109124096,3109126143,ES
+3109126144,3109127167,LV
+3109127168,3109128191,ES
+3109128192,3109129215,RU
+3109129216,3109130239,LB
+3109130240,3109131263,RU
+3109131264,3109132287,DE
+3109132288,3109133311,TR
+3109133312,3109134335,FR
+3109134336,3109135359,GB
+3109135360,3109136383,RO
+3109136384,3109137407,GB
+3109137408,3109138431,RU
+3109138432,3109139455,GB
+3109139456,3109140479,ES
+3109140480,3109141503,RU
+3109141504,3109143551,GB
+3109143552,3109144575,GR
+3109144576,3109145599,FR
+3109145600,3109148671,AT
+3109148672,3109149695,AZ
+3109149696,3109150719,RU
+3109150720,3109151743,BE
+3109151744,3109152767,HR
+3109152768,3109153791,GB
+3109153792,3109154815,TR
+3109154816,3109155839,AT
+3109155840,3109156863,GB
+3109156864,3109157887,RU
+3109157888,3109158911,GB
+3109158912,3109159935,IT
+3109159936,3109160959,DE
+3109160960,3109161983,GB
+3109161984,3109163007,RU
+3109163008,3109164031,AT
+3109164032,3109165055,DE
+3109165056,3109166079,RU
+3109166080,3109167103,IR
+3109167104,3109168127,LB
+3109168128,3109169151,BG
+3109169152,3109170175,DE
+3109170176,3109171199,IE
+3109171200,3109172223,GI
+3109172224,3109173247,IL
+3109173248,3109174271,ES
+3109174272,3109175295,GB
+3109175296,3109176319,IR
+3109176320,3109177343,IL
+3109177344,3109178367,IE
+3109178368,3109179391,GB
+3109179392,3109180415,ES
+3109180416,3109181439,DE
+3109181440,3109182463,NL
+3109182464,3109183487,LT
+3109183488,3109184511,LB
+3109184512,3109185535,CH
+3109185536,3109187583,RS
+3109187584,3109188607,IT
+3109188608,3109189631,SA
+3109189632,3109190655,AT
+3109190656,3109191679,NL
+3109191680,3109192703,CH
+3109192704,3109193727,IT
+3109193728,3109194751,IR
+3109194752,3109195775,NL
+3109195776,3109196799,FI
+3109196800,3109197823,FR
+3109197824,3109198847,NL
+3109198848,3109199871,GB
+3109199872,3109200895,DE
+3109200896,3109201919,IR
+3109201920,3109202943,IT
+3109202944,3109203967,RO
+3109203968,3109204991,RU
+3109204992,3109206015,IR
+3109206016,3109209087,NL
+3109209088,3109210111,GB
+3109210112,3109211135,NL
+3109211136,3109212159,CH
+3109212160,3109213183,NL
+3109213184,3109214207,CZ
+3109214208,3109215231,BG
+3109215232,3109216255,TR
+3109216256,3109217279,IT
+3109217280,3109218303,DK
+3109218304,3109219327,HU
+3109219328,3109220351,CZ
+3109220352,3109221375,IE
+3109221376,3109222399,GB
+3109222400,3109223423,PL
+3109223424,3109224447,TR
+3109224448,3109225471,RU
+3109225472,3109226495,EE
+3109226496,3109227519,NL
+3109227520,3109228543,GB
+3109228544,3109230591,NO
+3109230592,3109231615,FR
+3109231616,3109232639,IR
+3109232640,3109233663,NL
+3109233664,3109234687,GE
+3109234688,3109235711,GB
+3109235712,3109236735,PL
+3109236736,3109237759,BE
+3109237760,3109238783,GB
+3109238784,3109239807,CZ
+3109239808,3109240831,CH
+3109240832,3109241855,GB
+3109241856,3109242879,FR
+3109242880,3109245951,IR
+3109245952,3109246975,GB
+3109246976,3109247999,IR
+3109248000,3109249023,SE
+3109249024,3109250047,FR
+3109250048,3109251071,GB
+3109251072,3109252095,ES
+3109252096,3109253119,CH
+3109253120,3109254143,IR
+3109254144,3109255167,FI
+3109255168,3109256191,GB
+3109256192,3109257215,AZ
+3109257216,3109258239,GB
+3109258240,3109259263,ES
+3109259264,3109260287,BE
+3109260288,3109261311,DE
+3109261312,3109262335,TR
+3109262336,3109264383,GB
+3109264384,3109265407,US
+3109265408,3109266431,ES
+3109266432,3109267455,NO
+3109267456,3109268479,GB
+3109268480,3109269503,IT
+3109269504,3109270527,GB
+3109270528,3109272575,IR
+3109272576,3109273599,FR
+3109273600,3109274623,NO
+3109274624,3109276671,IR
+3109276672,3109277695,FI
+3109277696,3109278719,IR
+3109278720,3109279743,PT
+3109279744,3109280767,NL
+3109280768,3109281791,IL
+3109281792,3109282815,HU
+3109282816,3109283839,DE
+3109283840,3109284863,IE
+3109284864,3109285887,FR
+3109285888,3109286911,RU
+3109286912,3109287935,TR
+3109287936,3109288959,PT
+3109288960,3109289983,MK
+3109289984,3109291007,NL
+3109291008,3109292031,CH
+3109292032,3109293055,IE
+3109293056,3109295103,GB
+3109295104,3109296127,DE
+3109296128,3109297151,BE
+3109297152,3109298175,SE
+3109298176,3109299199,RU
+3109299200,3109300223,NO
+3109300224,3109301247,RU
+3109301248,3109302271,ES
+3109302272,3109303295,AE
+3109303296,3109304319,SE
+3109304320,3109305343,DE
+3109305344,3109306367,DK
+3109306368,3109307391,RO
+3109307392,3109308415,IQ
+3109308416,3109309439,NL
+3109309440,3109310463,CH
+3109310464,3109311487,DE
+3109311488,3109312511,GB
+3109312512,3109313535,IT
+3109313536,3109314559,GB
+3109314560,3109315583,IT
+3109315584,3109316607,SI
+3109316608,3109317631,LB
+3109317632,3109318655,RU
+3109318656,3109319679,FR
+3109319680,3109320703,ES
+3109320704,3109321727,DE
+3109321728,3109322751,GR
+3109322752,3109323775,ES
+3109323776,3109324799,DK
+3109324800,3109325823,PL
+3109325824,3109326847,NL
+3109326848,3109327871,BA
+3109327872,3109328895,UA
+3109328896,3109329919,CZ
+3109329920,3109330943,RU
+3109330944,3109331967,IR
+3109331968,3109332991,SA
+3109332992,3109334015,IT
+3109334016,3109335039,RU
+3109335040,3109336063,IT
+3109336064,3109337087,TR
+3109337088,3109339135,RU
+3109339136,3109340159,CH
+3109340160,3109341183,NL
+3109341184,3109342207,GB
+3109342208,3109343231,ES
+3109343232,3109344255,CH
+3109344256,3109345279,SE
+3109345280,3109346303,DE
+3109346304,3109347327,IR
+3109347328,3109348351,LB
+3109348352,3109349375,IT
+3109349376,3109350399,CZ
+3109350400,3109351423,SY
+3109351424,3109354495,RU
+3109354496,3109355519,IE
+3109355520,3109356543,DE
+3109356544,3109357567,DK
+3109357568,3109360639,RU
+3109360640,3109362687,IT
+3109362688,3109364735,AT
+3109364736,3109365759,SK
+3109365760,3109366783,GB
+3109366784,3109367807,DK
+3109367808,3109368831,DE
+3109368832,3109369855,FI
+3109369856,3109371903,GB
+3109371904,3109372927,AT
+3109372928,3109373951,IR
+3109373952,3109374975,TR
+3109374976,3109375999,FR
+3109376000,3109377023,NL
+3109377024,3109379071,GB
+3109379072,3109380095,CZ
+3109380096,3109381119,GB
+3109381120,3109382143,SE
+3109382144,3109383167,TR
+3109383168,3109384191,CH
+3109384192,3109385215,NL
+3109385216,3109386239,GB
+3109386240,3109387263,RU
+3109387264,3109388287,CH
+3109388288,3109389311,NO
+3109389312,3109390335,DE
+3109390336,3109391359,IR
+3109391360,3109392383,NL
+3109392384,3109393407,CH
+3109393408,3109394431,SI
+3109394432,3109395455,AL
+3109395456,3109396479,SE
+3109396480,3109397503,DE
+3109397504,3109398527,CZ
+3109398528,3109399551,CH
+3109399552,3109400575,BE
+3109400576,3109402623,RO
+3109402624,3109403647,GB
+3109403648,3109404671,TR
+3109404672,3109405695,IT
+3109405696,3109406719,UA
+3109406720,3109407743,RO
+3109407744,3109408767,TR
+3109408768,3109409791,IR
+3109409792,3109410815,IT
+3109410816,3109411839,RU
+3109411840,3109412863,DE
+3109413888,3109414911,CH
+3109414912,3109415935,FR
+3109415936,3109416959,TR
+3109416960,3109417983,FR
+3109417984,3109419007,GB
+3109419008,3109420031,CH
+3109420032,3109421055,IT
+3109421056,3109422079,UA
+3109422080,3109423103,TR
+3109423104,3109424127,ES
+3109424128,3109425151,TR
+3109425152,3109426175,BE
+3109426176,3109427199,GB
+3109427200,3109428223,AT
+3109428224,3109429247,CH
+3109429248,3109430271,ES
+3109430272,3109431295,IR
+3109431296,3109432319,IL
+3109432320,3109433343,MT
+3109433344,3109435391,FR
+3109435392,3109436415,UA
+3109436416,3109437439,SM
+3109437440,3109438463,RO
+3109438464,3109439487,DK
+3109439488,3109440511,ES
+3109440512,3109441535,UA
+3109441536,3109442559,TR
+3109442560,3109443583,IT
+3109443584,3109444607,FR
+3109444608,3109445631,RU
+3109445632,3109446655,CZ
+3109446656,3109448703,SE
+3109448704,3109449727,GB
+3109449728,3109453823,RU
+3109453824,3109454847,IT
+3109454848,3109455871,RU
+3109455872,3109456895,FR
+3109456896,3109457919,PS
+3109457920,3109458943,RU
+3109458944,3109459967,SE
+3109459968,3109460991,TR
+3109460992,3109462015,DE
+3109462016,3109463039,LB
+3109463040,3109464063,TR
+3109464064,3109465087,FR
+3109465088,3109466111,DE
+3109466112,3109467135,FR
+3109467136,3109468159,IR
 3120562176,3120594943,CO
 3120594944,3120599039,AR
 3120599040,3120601087,EC
@@ -61191,8 +59825,8 @@
 3120691200,3120693247,CO
 3120693248,3120726015,BO
 3120726016,3120734207,HN
-3120734208,3120735743,RU
-3120735744,3120738303,BZ
+3120734208,3120735999,RU
+3120736000,3120738303,BZ
 3120738304,3120742399,CW
 3120742400,3120754687,PY
 3120754688,3120755711,CR
@@ -61288,9 +59922,13 @@
 3124846592,3124848639,AR
 3124848640,3124849663,PA
 3124849664,3124850687,AR
-3124850688,3124852175,HN
+3124850688,3124851471,HN
+3124851472,3124851487,CM
+3124851488,3124852175,HN
 3124852176,3124852191,PH
-3124852192,3124853887,HN
+3124852192,3124853103,HN
+3124853104,3124853119,VN
+3124853120,3124853887,HN
 3124853888,3124853903,FR
 3124853904,3124854783,HN
 3124854784,3124887551,CL
@@ -61308,7 +59946,13 @@
 3126857856,3126857983,US
 3126857984,3126858495,AR
 3126858496,3126858623,US
-3126858624,3126870015,AR
+3126858624,3126861311,AR
+3126861312,3126861439,US
+3126861440,3126862591,AR
+3126862592,3126862719,US
+3126862720,3126863999,AR
+3126864000,3126864127,US
+3126864128,3126870015,AR
 3126870016,3126874111,VE
 3126874112,3126878207,CR
 3126878208,3126882303,PA
@@ -61337,9 +59981,11 @@
 3130312704,3130314751,AR
 3130314752,3130315775,CL
 3130315776,3130316799,CR
-3130316800,3130318847,CW
+3130316800,3130317823,AW
+3130317824,3130318847,CW
 3130318848,3130319871,AR
-3130319872,3130320895,RU
+3130319872,3130320639,RU
+3130320640,3130320895,BR
 3130320896,3130327039,AR
 3130327040,3130458111,DO
 3130458112,3130523647,GT
@@ -61420,7 +60066,8 @@
 3156759432,3156759432,GB
 3156759433,3156803583,DE
 3156803584,3156869119,TR
-3156869120,3156926463,LU
+3156869120,3156924415,LU
+3156924416,3156926463,SG
 3156926464,3156928511,NL
 3156928512,3156930559,LU
 3156930560,3156933631,US
@@ -61436,7 +60083,9 @@
 3157196800,3157262335,PL
 3157262336,3157786623,SA
 3157786624,3158048767,TR
-3158048768,3158310911,CH
+3158048768,3158070548,CH
+3158070549,3158070549,SE
+3158070550,3158310911,CH
 3158310912,3158312959,FI
 3158312960,3158315007,AZ
 3158315008,3158317055,DE
@@ -61518,7 +60167,8 @@
 3158704128,3158835199,KW
 3158835200,3158851583,IQ
 3158851584,3158859775,RU
-3158859776,3158860031,NL
+3158859776,3158859903,NL
+3158859904,3158860031,CZ
 3158860032,3158860287,GB
 3158860288,3158860543,NL
 3158860544,3158860799,GB
@@ -61546,7 +60196,8 @@
 3158866944,3158867199,DE
 3158867200,3158867455,HU
 3158867456,3158867711,DE
-3158867712,3158867967,NL
+3158867712,3158867839,NL
+3158867840,3158867967,NO
 3158867968,3158884351,AZ
 3158884352,3158884863,DE
 3158884864,3158885119,GB
@@ -61743,15 +60394,17 @@
 3161784320,3161800703,FI
 3161800704,3161817087,SA
 3161817088,3161833471,PL
-3161833472,3161846015,AT
-3161846016,3161847039,MK
-3161847040,3161849855,AT
+3161833472,3161835519,RS
+3161835520,3161841663,AT
+3161841664,3161845759,RS
+3161845760,3161846015,AT
+3161846016,3161846271,MK
+3161846272,3161849855,AT
 3161849856,3161866239,BE
 3161866240,3161882623,IR
 3161882624,3161899007,DE
 3161899008,3161915391,AT
 3161915392,3161931775,TR
-3161931776,3161948159,SA
 3161948160,3161964543,RO
 3161964544,3161980927,ES
 3161980928,3161989119,SK
@@ -61818,7 +60471,8 @@
 3162374144,3162382335,BG
 3162382336,3162390527,RU
 3162390528,3162398719,SE
-3162398720,3162406911,BE
+3162398720,3162404863,NL
+3162404864,3162406911,BE
 3162406912,3162415103,IR
 3162415104,3162423295,DE
 3162423296,3162431487,NO
@@ -61838,7 +60492,7 @@
 3162669056,3162681343,RU
 3162681344,3162682367,UA
 3162682368,3162682879,RU
-3162682880,3162683135,CZ
+3162682880,3162683135,IE
 3162683136,3162683391,ES
 3162683392,3162685439,RU
 3162685440,3162693631,UA
@@ -61862,7 +60516,9 @@
 3163166976,3163167231,FR
 3163167232,3163170527,DE
 3163170528,3163170559,AE
-3163170560,3163186534,DE
+3163170560,3163184739,DE
+3163184740,3163184740,GR
+3163184741,3163186534,DE
 3163186535,3163186535,FR
 3163186536,3163186673,DE
 3163186674,3163186674,FR
@@ -61890,7 +60546,9 @@
 3164798976,3164864511,UA
 3164864512,3164864703,GB
 3164864704,3164864735,ZA
-3164864736,3164897279,GB
+3164864736,3164864748,GB
+3164864749,3164864749,IE
+3164864750,3164897279,GB
 3164897280,3164899327,IT
 3164899328,3164901375,RU
 3164901376,3164903423,PL
@@ -61910,460 +60568,108 @@
 3164936192,3164937749,LT
 3164937750,3164937750,FR
 3164937751,3164938239,LT
-3164938240,3164946431,FR
-3164946432,3164946435,BE
-3164946436,3164946463,FR
-3164946464,3164946471,IT
-3164946472,3164946655,FR
-3164946656,3164946671,BE
-3164946672,3164946727,FR
+3164938240,3164946727,FR
 3164946728,3164946731,NL
-3164946732,3164946751,FR
-3164946752,3164946783,ES
-3164946784,3164947567,FR
-3164947568,3164947575,ES
-3164947576,3164947579,DE
+3164946732,3164947579,FR
 3164947580,3164947583,IT
-3164947584,3164947631,FR
-3164947632,3164947635,IT
-3164947636,3164947727,FR
-3164947728,3164947743,GB
-3164947744,3164948671,FR
-3164948672,3164948703,IT
-3164948704,3164948851,FR
-3164948852,3164948855,IT
-3164948856,3164948959,FR
-3164948960,3164948991,ES
-3164948992,3164949103,FR
-3164949104,3164949107,LT
-3164949108,3164949135,FR
+3164947584,3164949135,FR
 3164949136,3164949151,NL
-3164949152,3164949171,FR
-3164949172,3164949175,LT
-3164949176,3164949183,FR
-3164949184,3164949191,IT
-3164949192,3164949195,FR
-3164949196,3164949199,IE
-3164949200,3164949311,FR
-3164949312,3164949327,NL
-3164949328,3164949331,DE
-3164949332,3164949407,FR
-3164949408,3164949439,GB
-3164949440,3164949479,FR
-3164949480,3164949487,PL
-3164949488,3164950063,FR
-3164950064,3164950079,IT
-3164950080,3164950407,FR
-3164950408,3164950411,DE
-3164950412,3164950451,FR
-3164950452,3164950455,FI
-3164950456,3164950511,FR
-3164950512,3164950515,NL
-3164950516,3164950519,FR
-3164950520,3164950523,ES
-3164950524,3164950559,FR
-3164950560,3164950591,GB
-3164950592,3164950687,FR
-3164950688,3164950695,PL
+3164949152,3164950695,FR
 3164950696,3164950703,NL
-3164950704,3164950707,IT
-3164950708,3164950751,FR
-3164950752,3164950759,NL
-3164950760,3164950767,GB
-3164950768,3164951167,FR
-3164951168,3164951199,PT
-3164951200,3164951247,FR
-3164951248,3164951263,ES
-3164951264,3164951295,PL
-3164951296,3164951455,ES
-3164951456,3164951523,FR
-3164951524,3164951527,PL
-3164951528,3164951547,FR
-3164951548,3164951559,IT
-3164951560,3164951567,NL
-3164951568,3164951583,FR
-3164951584,3164951591,DE
-3164951592,3164951663,FR
+3164950704,3164951663,FR
 3164951664,3164951671,PL
-3164951672,3164951675,FR
-3164951676,3164951679,ES
-3164951680,3164951683,FR
-3164951684,3164951687,GB
-3164951688,3164951743,FR
-3164951744,3164951775,PL
-3164951776,3164951807,DE
-3164951808,3164952224,FR
+3164951672,3164952224,FR
 3164952225,3164952231,GB
 3164952232,3164952233,FR
 3164952234,3164952235,GB
 3164952236,3164952236,FR
 3164952237,3164952237,GB
-3164952238,3164952271,FR
-3164952272,3164952287,DE
-3164952288,3164952303,FR
-3164952304,3164952319,LT
-3164952320,3164952399,FR
-3164952400,3164952415,NL
-3164952416,3164952431,FR
-3164952432,3164952447,ES
-3164952448,3164952479,FR
-3164952480,3164952511,ES
-3164952512,3164952527,IE
-3164952528,3164952831,FR
-3164952832,3164952895,GB
-3164952896,3164953247,FR
-3164953248,3164953255,BE
+3164952238,3164953255,FR
 3164953256,3164953263,CZ
-3164953264,3164953383,FR
-3164953384,3164953387,PL
-3164953388,3164953391,FR
+3164953264,3164953391,FR
 3164953392,3164953399,NL
-3164953400,3164953443,FR
-3164953444,3164953447,BE
-3164953448,3164953451,PL
-3164953452,3164953463,FR
-3164953464,3164953467,NL
-3164953468,3164953503,FR
-3164953504,3164953511,IT
-3164953512,3164953571,FR
-3164953572,3164953575,ES
-3164953576,3164953583,FR
+3164953400,3164953583,FR
 3164953584,3164953599,ES
-3164953600,3164953663,FR
-3164953664,3164953727,CH
-3164953728,3164953855,DE
-3164953856,3164954207,FR
-3164954208,3164954223,LT
-3164954224,3164954255,FR
-3164954256,3164954271,NL
-3164954272,3164954495,FR
-3164954496,3164954499,IT
-3164954500,3164954511,FR
+3164953600,3164954511,FR
 3164954512,3164954515,IT
-3164954516,3164954527,FR
-3164954528,3164954543,IE
-3164954544,3164954583,FR
-3164954584,3164954591,IT
-3164954592,3164958815,FR
-3164958816,3164958847,ES
-3164958848,3164958911,BE
-3164958912,3164959039,FR
-3164959040,3164959103,IT
-3164959104,3164959135,PT
-3164959136,3164959239,FR
-3164959240,3164959247,ES
-3164959248,3164959263,FR
-3164959264,3164959279,IT
-3164959280,3164959375,FR
-3164959376,3164959383,DE
-3164959384,3164959387,ES
-3164959388,3164959391,FR
-3164959392,3164959407,ES
-3164959408,3164959663,FR
-3164959664,3164959679,IT
-3164959680,3164959743,PT
-3164959744,3164959935,FR
-3164959936,3164959999,BE
-3164960000,3164960263,FR
+3164954516,3164959551,FR
+3164959552,3164959583,DE
+3164959584,3164960263,FR
 3164960264,3164960267,ES
-3164960268,3164960303,FR
-3164960304,3164960319,CH
-3164960320,3164960335,FR
-3164960336,3164960339,LT
-3164960340,3164960363,FR
-3164960364,3164960367,ES
-3164960368,3164960439,FR
+3164960268,3164960439,FR
 3164960440,3164960443,DE
-3164960444,3164960471,FR
-3164960472,3164960479,CH
-3164960480,3164960495,ES
-3164960496,3164960599,FR
-3164960600,3164960607,FI
-3164960608,3164960631,FR
-3164960632,3164960639,ES
-3164960640,3164960715,FR
+3164960444,3164960715,FR
 3164960716,3164960719,NL
 3164960720,3164960799,FR
 3164960800,3164960831,PT
 3164960832,3164960843,FR
 3164960844,3164960847,NL
-3164960848,3164960943,FR
-3164960944,3164960959,GB
-3164960960,3164960999,FR
-3164961000,3164961003,PL
-3164961004,3164961015,FR
-3164961016,3164961023,NL
-3164961024,3164961151,FR
-3164961152,3164961167,PL
-3164961168,3164961175,IE
-3164961176,3164961335,FR
-3164961336,3164961343,DE
-3164961344,3164961359,FR
-3164961360,3164961363,FI
-3164961364,3164961391,FR
+3164960848,3164961391,FR
 3164961392,3164961395,ES
-3164961396,3164961407,FR
-3164961408,3164961471,PT
-3164961472,3164961503,FR
-3164961504,3164961511,IT
-3164961512,3164961519,GB
-3164961520,3164961551,FR
-3164961552,3164961559,ES
-3164961560,3164961563,FR
-3164961564,3164961567,CH
-3164961568,3164961759,FR
-3164961760,3164961763,NL
-3164961764,3164961767,IT
-3164961768,3164961775,FR
-3164961776,3164961783,GB
-3164961784,3164961815,FR
-3164961816,3164961823,IT
-3164961824,3164961859,FR
-3164961860,3164961863,ES
-3164961864,3164961871,FR
-3164961872,3164961887,PL
-3164961888,3164961979,FR
-3164961980,3164961983,IE
-3164961984,3164962015,FR
-3164962016,3164962031,NL
-3164962032,3164962111,FR
-3164962112,3164962143,CH
-3164962144,3164962151,FR
-3164962152,3164962159,BE
-3164962160,3164962247,FR
-3164962248,3164962255,DE
-3164962256,3164962279,FR
-3164962280,3164962283,PL
-3164962284,3164962443,FR
-3164962444,3164962447,CZ
-3164962448,3164962463,FR
-3164962464,3164962471,IT
+3164961396,3164961551,FR
+3164961552,3164961555,ES
+3164961556,3164962471,FR
 3164962472,3164962475,ES
-3164962476,3164962631,FR
-3164962632,3164962639,DE
-3164962640,3164962719,FR
-3164962720,3164962723,GB
-3164962724,3164962815,FR
+3164962476,3164962815,FR
 3164962816,3164964863,ES
 3164964864,3164966911,FI
-3164966912,3164968255,FR
-3164968256,3164968271,DE
-3164968272,3164968287,GB
-3164968288,3164968319,IT
+3164966912,3164967231,FR
+3164967232,3164967239,ES
+3164967240,3164968319,FR
 3164968320,3164968447,GB
 3164968448,3164968455,FR
 3164968456,3164968459,NL
-3164968460,3164968463,FR
-3164968464,3164968471,IT
-3164968472,3164968687,FR
-3164968688,3164968703,IT
-3164968704,3164968831,FR
-3164968832,3164968835,PL
+3164968460,3164968835,FR
 3164968836,3164968839,ES
-3164968840,3164968903,FR
-3164968904,3164968911,IT
-3164968912,3164969019,FR
+3164968840,3164969019,FR
 3164969020,3164969023,BE
-3164969024,3164969027,IT
-3164969028,3164969039,FR
+3164969024,3164969039,FR
 3164969040,3164969047,NL
-3164969048,3164969191,FR
-3164969192,3164969199,ES
-3164969200,3164969203,DE
-3164969204,3164969503,FR
-3164969504,3164969535,IT
-3164969536,3164969647,FR
-3164969648,3164969655,GB
-3164969656,3164969663,FR
-3164969664,3164969695,BE
-3164969696,3164969895,FR
-3164969896,3164969899,ES
-3164969900,3164969919,FR
-3164969920,3164969951,DE
-3164969952,3164970207,FR
-3164970208,3164970215,PL
-3164970216,3164970219,GB
-3164970220,3164970287,FR
-3164970288,3164970291,ES
-3164970292,3164970295,FR
-3164970296,3164970299,ES
-3164970300,3164970303,FR
-3164970304,3164970335,NL
-3164970336,3164970347,FR
-3164970348,3164970351,ES
-3164970352,3164970359,PL
-3164970360,3164970371,FR
-3164970372,3164970375,CH
-3164970376,3164970383,FR
-3164970384,3164970387,PL
-3164970388,3164970413,FR
+3164969048,3164970413,FR
 3164970414,3164970415,IT
-3164970416,3164970495,FR
-3164970496,3164970527,BE
-3164970528,3164970543,FR
-3164970544,3164970551,IE
-3164970552,3164970599,FR
-3164970600,3164970603,BE
-3164970604,3164970607,FR
-3164970608,3164970615,DE
-3164970616,3164970639,FR
-3164970640,3164970647,DE
-3164970648,3164970687,FR
-3164970688,3164970691,DE
-3164970692,3164970879,FR
-3164970880,3164970883,ES
-3164970884,3164970911,FR
-3164970912,3164970915,ES
-3164970916,3164970923,FR
+3164970416,3164970923,FR
 3164970924,3164970927,LT
-3164970928,3164971455,FR
-3164971456,3164971459,CZ
-3164971460,3164971567,FR
-3164971568,3164971571,DE
-3164971572,3164971679,FR
-3164971680,3164971711,NL
-3164971712,3164971791,FR
+3164970928,3164971791,FR
 3164971792,3164971799,IT
-3164971800,3164971967,FR
-3164971968,3164971983,PT
-3164971984,3164972027,FR
-3164972028,3164972031,DE
-3164972032,3164972499,FR
-3164972500,3164972503,IT
-3164972504,3164972511,FR
-3164972512,3164972527,IT
-3164972528,3164972687,FR
-3164972688,3164972695,PT
-3164972696,3164972703,FR
-3164972704,3164972719,IT
-3164972720,3164973419,FR
+3164971800,3164973419,FR
 3164973420,3164973423,ES
-3164973424,3164973627,FR
-3164973628,3164973631,IT
-3164973632,3164973695,GB
-3164973696,3164973759,FR
-3164973760,3164973791,IE
-3164973792,3164973843,FR
-3164973844,3164973847,IE
-3164973848,3164973855,PL
-3164973856,3164973863,FR
-3164973864,3164973867,BE
-3164973868,3164973871,GB
-3164973872,3164973879,FR
-3164973880,3164973883,PL
-3164973884,3164974111,FR
-3164974112,3164974119,ES
-3164974120,3164974127,FR
-3164974128,3164974135,NL
-3164974136,3164974239,FR
-3164974240,3164974271,PT
-3164974272,3164974303,FR
-3164974304,3164974335,NL
+3164973424,3164973663,FR
+3164973664,3164973695,GB
+3164973696,3164974335,FR
 3164974336,3164974463,GB
 3164974464,3164974527,FR
 3164974528,3164974559,ES
-3164974560,3164974647,FR
-3164974648,3164974655,DE
-3164974656,3164974667,FR
-3164974668,3164974671,BE
-3164974672,3164974727,FR
-3164974728,3164974731,CH
-3164974732,3164974887,FR
-3164974888,3164974895,GB
-3164974896,3164975039,FR
-3164975040,3164975103,GB
-3164975104,3164975135,PT
-3164975136,3164975167,FR
-3164975168,3164975199,NL
-3164975200,3164975739,FR
-3164975740,3164975743,BE
-3164975744,3164975815,FR
-3164975816,3164975823,IT
-3164975824,3164975939,FR
-3164975940,3164975943,DE
-3164975944,3164975999,FR
-3164976000,3164976015,ES
-3164976016,3164976063,FR
-3164976064,3164976095,GB
-3164976096,3164976127,FR
-3164976128,3164976135,GB
-3164976136,3164976143,FR
+3164974560,3164974651,FR
+3164974652,3164974655,DE
+3164974656,3164976143,FR
 3164976144,3164976159,BE
-3164976160,3164976175,IT
-3164976176,3164976191,FR
-3164976192,3164976207,DE
-3164976208,3164976239,FR
-3164976240,3164976255,GB
-3164976256,3164976263,FR
-3164976264,3164976271,ES
-3164976272,3164976295,FR
+3164976160,3164976295,FR
 3164976296,3164976303,IT
-3164976304,3164976315,FR
-3164976316,3164976319,GB
-3164976320,3164976327,ES
-3164976328,3164976463,FR
-3164976464,3164976479,ES
-3164976480,3164976535,FR
-3164976536,3164976539,ES
-3164976540,3164976571,FR
-3164976572,3164976575,DE
-3164976576,3164976583,FR
-3164976584,3164976591,IT
-3164976592,3164976663,FR
-3164976664,3164976671,ES
-3164976672,3164976831,FR
-3164976832,3164976839,DE
-3164976840,3164977415,FR
-3164977416,3164977423,GB
-3164977424,3164977503,FR
-3164977504,3164977535,CZ
-3164977536,3164977551,PT
-3164977552,3164977599,FR
-3164977600,3164977631,GB
-3164977632,3164977647,IE
-3164977648,3164977855,FR
-3164977856,3164977871,LT
-3164977872,3164977883,FR
-3164977884,3164977887,PL
-3164977888,3164977903,FR
-3164977904,3164977907,GB
-3164977908,3164977911,FR
-3164977912,3164977919,IT
-3164977920,3164978063,FR
-3164978064,3164978067,ES
-3164978068,3164978151,FR
-3164978152,3164978155,CH
-3164978156,3164978159,FR
-3164978160,3164978175,ES
-3164978176,3164978607,FR
-3164978608,3164978623,IT
-3164978624,3164978719,FR
-3164978720,3164978751,ES
-3164978752,3164978975,FR
-3164978976,3164978979,PL
-3164978980,3164978983,FR
-3164978984,3164978991,IT
-3164978992,3164978999,FR
-3164979000,3164979003,ES
-3164979004,3164979103,FR
-3164979104,3164979111,IT
-3164979112,3164979159,FR
-3164979160,3164979167,IT
-3164979168,3164995583,FR
-3164995584,3165061119,RU
+3164976304,3164995583,FR
+3164995584,3165061119,NL
 3165061120,3165126655,SK
 3165126656,3165192191,RU
 3165192192,3165257727,GE
-3165257728,3165323263,RO
+3165257728,3165323263,RU
 3165323264,3165388799,ES
 3165388800,3165417471,MT
 3165417472,3165421567,DE
 3165421568,3165425663,IE
 3165425664,3165429759,GB
 3165429760,3165437951,RO
-3165437952,3165439487,AT
+3165437952,3165438207,DK
+3165438208,3165439487,AT
 3165439488,3165439743,GB
-3165439744,3165454335,AT
+3165439744,3165439999,AT
+3165440000,3165440255,JP
+3165440256,3165440511,HK
+3165440512,3165440767,JP
+3165440768,3165442047,AT
+3165442048,3165442303,TW
+3165442304,3165442559,AU
+3165442560,3165442815,KR
+3165442816,3165443071,HK
+3165443072,3165454335,AT
 3165454336,3165519871,RO
 3165519872,3165585407,DE
 3165585408,3165650943,CZ
@@ -62376,8 +60682,10 @@
 3166568448,3166601215,UA
 3166601216,3166609407,RU
 3166609408,3166633983,UA
-3166633984,3166638079,RU
-3166638080,3166646271,UA
+3166633984,3166639103,RU
+3166639104,3166639359,UA
+3166639360,3166642175,RU
+3166642176,3166646271,UA
 3166646272,3166650367,CZ
 3166650368,3166654463,UA
 3166654464,3166658559,RU
@@ -62406,64 +60714,83 @@
 3167223808,3167748095,NL
 3167748096,3167762431,RO
 3167762432,3167764479,MD
-3167764480,3167772671,RO
-3167772672,3167773695,MD
-3167773696,3167774719,RO
+3167764480,3167772671,IR
+3167772672,3167774207,RO
+3167774208,3167774463,SG
+3167774464,3167774719,RO
 3167774720,3167775743,MD
 3167775744,3167776511,RO
 3167776512,3167776767,GB
 3167776768,3167777791,MD
 3167777792,3167778815,RO
 3167778816,3167780863,MD
-3167780864,3167797247,RO
+3167780864,3167784959,RO
+3167784960,3167797247,IR
 3167797248,3167798271,MD
 3167798272,3167799295,RO
-3167799296,3167803391,MD
-3167803392,3167813631,RO
+3167799296,3167800319,MD
+3167800320,3167801343,RO
+3167801344,3167803391,MD
+3167803392,3167805439,RO
+3167805440,3167813631,IR
 3167813632,3167815679,MD
-3167815680,3167842303,RO
+3167815680,3167817727,RO
+3167817728,3167825919,IR
+3167825920,3167830015,NL
+3167830016,3167834111,IR
+3167834112,3167838207,IT
+3167838208,3167842303,RO
 3167842304,3167843327,ES
 3167843328,3167846399,RO
-3167846400,3167851519,IR
-3167851520,3167852543,DE
-3167852544,3167862783,RO
-3167862784,3167866879,IR
+3167846400,3167852543,IR
+3167852544,3167853055,RO
+3167853056,3167853567,IR
+3167853568,3167854591,RO
+3167854592,3167866879,IR
 3167866880,3167868927,RO
 3167868928,3167879167,MD
 3167879168,3167895551,DE
 3167895552,3167899647,IR
 3167899648,3167902719,RO
 3167902720,3167902975,BE
-3167902976,3167928319,RO
-3167928320,3167932415,IR
+3167902976,3167903231,NL
+3167903232,3167903743,RO
+3167903744,3167932415,IR
 3167932416,3167934463,RO
 3167934464,3167935487,ES
-3167935488,3167938559,RO
+3167935488,3167936511,PL
+3167936512,3167938559,RO
 3167938560,3167939583,MD
 3167939584,3167940607,RO
 3167940608,3167943679,MD
 3167943680,3167944447,RO
 3167944448,3167944703,GB
 3167944704,3167948799,IR
-3167948800,3167987711,RO
-3167987712,3167989759,MD
-3167989760,3168005887,RO
+3167948800,3167951359,RO
+3167951360,3167951615,SG
+3167951616,3167952895,RO
+3167952896,3167985663,IR
+3167985664,3167989759,RO
+3167989760,3168002047,IR
+3168002048,3168005887,RO
 3168005888,3168006143,NL
-3168006144,3168010239,RO
+3168006144,3168008191,SE
+3168008192,3168010239,RO
 3168010240,3168011263,MD
 3168011264,3168012287,RO
 3168012288,3168014335,MD
 3168014336,3168016383,RO
 3168016384,3168018431,MD
-3168018432,3168020479,RO
-3168020480,3168022527,MD
-3168022528,3168026623,IR
-3168026624,3168039935,RO
+3168018432,3168022527,RO
+3168022528,3168034815,IR
+3168034816,3168039935,RO
 3168039936,3168040959,BE
 3168040960,3168050431,RO
 3168050432,3168050687,MD
-3168050688,3168071679,RO
-3168071680,3168073727,IR
+3168050688,3168051199,RO
+3168051200,3168059391,IR
+3168059392,3168063487,RO
+3168063488,3168073727,IR
 3168073728,3168077823,RO
 3168077824,3168079871,ES
 3168079872,3168081919,RO
@@ -62475,32 +60802,38 @@
 3168089088,3168090111,MD
 3168090112,3168092159,ES
 3168092160,3168096255,IR
-3168096256,3168111615,RO
+3168096256,3168100351,MD
+3168100352,3168108543,IR
+3168108544,3168111615,RO
 3168111616,3168112639,FR
-3168112640,3168124927,RO
-3168124928,3168126975,IR
+3168112640,3168116735,IR
+3168116736,3168120831,RO
+3168120832,3168126975,IR
 3168126976,3168129023,RO
 3168129024,3168130047,MD
-3168130048,3168132095,RO
-3168132096,3168133119,MD
-3168133120,3168136191,RO
+3168130048,3168131583,RO
+3168131584,3168131839,SG
+3168131840,3168136191,RO
 3168136192,3168137215,MD
-3168137216,3168138239,RO
-3168138240,3168139263,MD
-3168139264,3168156671,RO
+3168137216,3168137983,RO
+3168137984,3168138239,NL
+3168138240,3168156671,RO
 3168156672,3168157695,MD
 3168157696,3168161791,IR
 3168161792,3168165119,RO
 3168165120,3168165375,DE
 3168165376,3168165887,RO
 3168165888,3168166911,MD
-3168166912,3168169983,RO
+3168166912,3168167935,FR
+3168167936,3168169983,RO
 3168169984,3168172031,ES
 3168172032,3168176127,RO
 3168176128,3168177151,MD
 3168177152,3168178175,RO
 3168178176,3168179199,MD
-3168179200,3168191999,RO
+3168179200,3168182271,RO
+3168182272,3168190463,IR
+3168190464,3168191999,RO
 3168192000,3168192255,GB
 3168192256,3168192511,RO
 3168192512,3168194559,MD
@@ -62508,7 +60841,13 @@
 3168199680,3168200703,MD
 3168200704,3168202751,IR
 3168202752,3168203775,ES
-3168203776,3168267263,RO
+3168203776,3168215551,RO
+3168215552,3168215807,SG
+3168215808,3168239615,RO
+3168239616,3168243711,IR
+3168243712,3168247807,RO
+3168247808,3168264191,IR
+3168264192,3168267263,RO
 3168267264,3168269311,MD
 3168269312,3168271359,RO
 3168271360,3168272383,MD
@@ -62546,25 +60885,25 @@
 3169648640,3169714175,MD
 3169714176,3169779711,FI
 3169779712,3169845247,UA
-3169845248,3169851391,RO
-3169851392,3169853439,MD
-3169853440,3169854463,RO
+3169845248,3169854463,RO
 3169854464,3169855487,IR
 3169855488,3169863167,RO
 3169863168,3169863423,MD
-3169863424,3169863679,RO
-3169863680,3169864703,MD
-3169864704,3169869823,RO
+3169863424,3169869823,RO
 3169869824,3169878015,MD
 3169878016,3169882111,RO
-3169882112,3169886207,MD
-3169886208,3169894399,RO
-3169894400,3169895423,MD
-3169895424,3169896447,RO
-3169896448,3169898495,ES
-3169898496,3169927423,RO
+3169882112,3169886207,SE
+3169886208,3169894399,GB
+3169894400,3169895423,ES
+3169895424,3169899263,RO
+3169899264,3169899519,SG
+3169899520,3169927423,RO
 3169927424,3169927679,NL
-3169927680,3169976319,RO
+3169927680,3169951743,RO
+3169951744,3169955839,SE
+3169955840,3169960191,RO
+3169960192,3169960447,NL
+3169960448,3169976319,RO
 3169976320,3170111487,RU
 3170111488,3170115583,MD
 3170115584,3170119679,RU
@@ -62585,14 +60924,23 @@
 3170295808,3170303999,RU
 3170304000,3170312191,SY
 3170312192,3170320383,RU
-3170320384,3170328575,JO
+3170320384,3170327593,JO
+3170327594,3170327594,US
+3170327595,3170328575,JO
 3170328576,3170336767,UA
-3170336768,3170369535,RO
+3170336768,3170338815,RO
+3170338816,3170344959,ES
+3170344960,3170347007,RO
+3170347008,3170349055,ES
+3170349056,3170361343,KZ
+3170361344,3170369535,RO
 3170369536,3170500607,SA
 3170500608,3170631679,PT
 3170631680,3170664447,PL
 3170664448,3170697215,HR
-3170697216,3170729983,IR
+3170697216,3170717695,IR
+3170717696,3170720767,BG
+3170720768,3170729983,IR
 3170729984,3170762751,AZ
 3170762752,3170795519,RU
 3170795520,3170828287,BG
@@ -62648,13 +60996,17 @@
 3187936048,3187936063,HN
 3187936064,3187936711,GT
 3187936712,3187936719,HN
-3187936720,3187939847,GT
+3187936720,3187937799,GT
+3187937800,3187937807,HN
+3187937808,3187939847,GT
 3187939848,3187939855,HN
 3187939856,3187940479,GT
 3187940480,3187940543,HN
 3187940544,3187940963,GT
 3187940964,3187940967,HN
-3187940968,3187943055,GT
+3187940968,3187941207,GT
+3187941208,3187941215,HN
+3187941216,3187943055,GT
 3187943056,3187943063,HN
 3187943064,3187943127,GT
 3187943128,3187943135,HN
@@ -62668,7 +61020,9 @@
 3187945972,3187945975,HN
 3187945976,3187946111,GT
 3187946112,3187946239,HN
-3187946240,3187946639,GT
+3187946240,3187946495,GT
+3187946496,3187946511,HN
+3187946512,3187946639,GT
 3187946640,3187946647,HN
 3187946648,3187947983,GT
 3187947984,3187947987,HN
@@ -62727,8 +61081,7 @@
 3188242432,3188244479,AR
 3188244480,3188260863,CO
 3188260864,3188269055,AR
-3188269056,3188269183,VE
-3188269184,3188269311,MX
+3188269056,3188269311,MX
 3188269312,3188269439,VE
 3188269440,3188269567,CO
 3188269568,3188269823,MX
@@ -62819,14 +61172,17 @@
 3191108960,3191108991,CO
 3191108992,3191109119,PE
 3191109120,3191109631,MX
-3191109632,3191111679,PE
+3191109632,3191110655,PE
+3191110656,3191111167,MX
+3191111168,3191111679,PE
 3191111680,3191128063,PY
 3191128064,3191132159,EC
 3191132160,3191136255,AR
 3191136256,3191144447,DO
 3191144448,3191152639,SV
 3191152640,3191155711,NI
-3191155712,3191156735,SV
+3191155712,3191156223,SV
+3191156224,3191156735,NI
 3191156736,3191169023,HN
 3191169024,3191193599,SV
 3191193600,3191209983,HN
@@ -62841,18 +61197,22 @@
 3191472128,3191603199,TT
 3191603200,3191603519,CO
 3191603520,3191603583,PR
-3191603584,3191607807,CO
+3191603584,3191607295,CO
+3191607296,3191607327,MX
+3191607328,3191607807,CO
 3191607808,3191608319,CL
 3191608320,3191610623,CO
-3191610624,3191610879,PE
-3191610880,3191611391,CO
+3191610624,3191611135,PE
+3191611136,3191611391,CO
 3191611392,3191619583,VE
-3191619584,3191635967,CL
+3191619584,3191619903,CL
+3191619904,3191619935,VE
+3191619936,3191635967,CL
 3191635968,3191637759,CO
 3191637760,3191638015,AR
 3191638016,3191647743,CO
-3191647744,3191647807,AR
-3191647808,3191648255,CO
+3191647744,3191647935,AR
+3191647936,3191648255,CO
 3191648256,3191649791,US
 3191649792,3191650303,CO
 3191650304,3191650815,US
@@ -62873,8 +61233,8 @@
 3191681280,3191681535,US
 3191681536,3191682303,AR
 3191682304,3191682559,US
-3191682560,3191683327,AR
-3191683328,3191685119,US
+3191682560,3191683071,AR
+3191683072,3191685119,US
 3191685120,3191685631,AR
 3191685632,3191685887,US
 3191685888,3191687167,AR
@@ -62891,21 +61251,18 @@
 3191704576,3191704831,CO
 3191704832,3191705343,US
 3191705344,3191705599,CO
-3191705600,3191705855,US
-3191705856,3191706111,CO
-3191706112,3191706623,US
+3191705600,3191706623,US
 3191706624,3191707647,CO
 3191707648,3191719935,CL
 3191719936,3191722495,AR
-3191722496,3191724031,CL
-3191724032,3191725055,CO
+3191722496,3191725055,CL
 3191725056,3191725311,AR
 3191725312,3191725567,CL
 3191725568,3191726079,CO
 3191726080,3191726335,AR
-3191726336,3191726591,CO
+3191726336,3191726591,CL
 3191726592,3191726847,AR
-3191726848,3191727103,CO
+3191726848,3191727103,CL
 3191727104,3191727359,AR
 3191727360,3191729919,CO
 3191729920,3191730431,CL
@@ -62948,24 +61305,27 @@
 3193595648,3193599743,CO
 3193599744,3193600255,EC
 3193600256,3193604351,CO
-3193604352,3193605119,EC
-3193605120,3193605375,CO
-3193605376,3193605631,EC
+3193604352,3193605631,EC
 3193605632,3193606143,CO
 3193606144,3193606399,EC
 3193606400,3193606655,CO
 3193606656,3193607167,EC
 3193607168,3193617151,CO
 3193617152,3193617407,EC
-3193617408,3193622527,CO
+3193617408,3193621759,CO
+3193621760,3193622015,EC
+3193622016,3193622527,CO
 3193622528,3193623551,EC
 3193623552,3193625599,CO
 3193625600,3193625855,EC
 3193625856,3193626111,CO
 3193626112,3193626623,US
-3193626624,3193629439,CO
-3193629440,3193629695,EC
-3193629696,3193634815,CO
+3193626624,3193628927,CO
+3193628928,3193629695,EC
+3193629696,3193630975,CO
+3193630976,3193631231,EC
+3193631232,3193634559,CO
+3193634560,3193634815,EC
 3193634816,3193700351,CL
 3193700352,3193722751,HN
 3193722752,3193722879,GT
@@ -62976,14 +61336,12 @@
 3193735168,3193735679,US
 3193735680,3193736191,AR
 3193736192,3193736447,US
-3193736448,3193737471,AR
-3193737472,3193739007,US
+3193736448,3193737215,AR
+3193737216,3193739007,US
 3193739008,3193739263,AR
 3193739264,3193740543,US
 3193740544,3193741311,AR
-3193741312,3193741823,US
-3193741824,3193742079,AR
-3193742080,3193742335,US
+3193741312,3193742335,US
 3193742336,3193742591,AR
 3193742592,3193742847,US
 3193742848,3193743231,AR
@@ -63005,18 +61363,20 @@
 3193747456,3193747583,AR
 3193747584,3193748479,US
 3193748480,3193748863,AR
-3193748864,3193749759,US
-3193749760,3193750015,AR
-3193750016,3193750271,US
+3193748864,3193750271,US
 3193750272,3193750527,AR
 3193750528,3193750783,US
-3193750784,3193751807,AR
+3193750784,3193751039,AR
+3193751040,3193751295,US
+3193751296,3193751807,AR
 3193751808,3193752703,US
 3193752704,3193752831,AR
 3193752832,3193752959,US
 3193752960,3193753087,AR
 3193753088,3193753343,US
-3193753344,3193754623,AR
+3193753344,3193753471,AR
+3193753472,3193753599,US
+3193753600,3193754623,AR
 3193754624,3193754751,US
 3193754752,3193755135,AR
 3193755136,3193755263,US
@@ -63096,7 +61456,7 @@
 3194189824,3194191871,CR
 3194191872,3194224639,CO
 3194224640,3194355711,CL
-3194355712,3194363903,CW
+3194355712,3194363903,SX
 3194363904,3194367999,CR
 3194368000,3194370047,BO
 3194370048,3194372095,PA
@@ -63140,7 +61500,8 @@
 3194601472,3194602495,CW
 3194602496,3194610943,AR
 3194610944,3194611199,CO
-3194611200,3194613759,AR
+3194611200,3194613503,AR
+3194613504,3194613759,CL
 3194613760,3194617855,PE
 3194617856,3194626047,NI
 3194626048,3194630143,AR
@@ -63156,8 +61517,8 @@
 3194659840,3194660351,US
 3194660352,3194661119,AR
 3194661120,3194661375,US
-3194661376,3194662143,AR
-3194662144,3194662399,US
+3194661376,3194661887,AR
+3194661888,3194662399,US
 3194662400,3194663167,AR
 3194663168,3194664447,US
 3194664448,3194664959,AR
@@ -63337,12 +61698,16 @@
 3195721728,3195723775,VE
 3195723776,3195731967,AR
 3195731968,3195736063,EC
-3195736064,3195737087,BQ
+3195736064,3195736575,BQ
+3195736576,3195736831,AI
+3195736832,3195737087,BQ
 3195737088,3195738111,CW
 3195738112,3195740159,HN
 3195740160,3195740415,US
 3195740416,3195740927,PA
-3195740928,3195741951,US
+3195740928,3195741055,US
+3195741056,3195741087,HN
+3195741088,3195741951,US
 3195741952,3195744255,PA
 3195744256,3195748351,EC
 3195748352,3195752447,CL
@@ -63433,7 +61798,8 @@
 3199729664,3199762431,NI
 3199762432,3199778815,CO
 3199778816,3199779839,AR
-3199779840,3199780863,CR
+3199779840,3199780735,CR
+3199780736,3199780863,US
 3199780864,3199782911,CO
 3199782912,3199784959,AR
 3199784960,3199785983,EC
@@ -63491,7 +61857,9 @@
 3201867776,3201869823,PE
 3201869824,3201869855,AR
 3201869856,3201869871,PE
-3201869872,3201871743,AR
+3201869872,3201869919,AR
+3201869920,3201869935,PE
+3201869936,3201871743,AR
 3201871744,3201871807,PE
 3201871808,3201871811,AR
 3201871812,3201871815,PE
@@ -63592,8 +61960,8 @@
 3210747904,3210748159,BR
 3210748160,3210748175,JP
 3210748176,3210748415,BR
-3210748416,3210751999,CL
-3210752000,3210752255,US
+3210748416,3210749951,CL
+3210749952,3210752255,US
 3210752256,3210755839,CL
 3210755840,3210755855,MY
 3210755856,3210755871,US
@@ -63606,18 +61974,19 @@
 3210764048,3210764063,US
 3210764064,3210765055,CL
 3210765056,3210765071,SE
-3210765072,3210769919,CL
+3210765072,3210765311,BR
+3210765312,3210769919,CL
 3210769920,3210770175,US
 3210770176,3210771199,CL
 3210771200,3210771215,TH
 3210771216,3210772991,CL
 3210772992,3210773247,US
-3210773248,3210773503,CL
+3210773248,3210773503,BR
 3210773504,3210773519,PL
-3210773520,3210774271,CL
+3210773520,3210774015,CL
+3210774016,3210774271,BR
 3210774272,3210774287,NO
-3210774288,3210774527,CL
-3210774528,3210774783,BR
+3210774288,3210774783,BR
 3210774784,3210774799,IT
 3210774800,3210775295,BR
 3210775296,3210775311,CH
@@ -63636,7 +62005,8 @@
 3210784000,3210784015,JP
 3210784016,3210784511,CL
 3210784512,3210784527,BE
-3210784528,3210786047,CL
+3210784528,3210785791,CL
+3210785792,3210786047,BR
 3210786048,3210786063,AU
 3210786064,3210786559,CL
 3210786560,3210786575,GR
@@ -63672,121 +62042,217 @@
 3210928128,3210936319,NI
 3210936320,3211067391,EC
 3211067392,3211071487,US
-3211071488,3211071999,DE
+3211071488,3211071743,NL
+3211071744,3211071999,DE
 3211072000,3211072511,US
 3211072512,3211073023,NL
-3211073024,3211073279,CA
-3211073280,3211073535,US
-3211073536,3211075583,NL
-3211075584,3211075839,US
+3211073024,3211073279,GB
+3211073280,3211073791,US
+3211073792,3211074047,LT
+3211074048,3211075583,NL
+3211075584,3211075839,GB
 3211075840,3211076095,CL
-3211076096,3211076607,LT
-3211076608,3211079167,CL
+3211076096,3211076863,LT
+3211076864,3211079167,CL
 3211079168,3211079423,NL
-3211079424,3211080703,CL
+3211079424,3211079679,CL
+3211079680,3211079935,GB
+3211079936,3211080703,CL
 3211080704,3211080959,GB
 3211080960,3211081215,CL
 3211081216,3211081727,CH
-3211081728,3211083775,CL
+3211081728,3211082239,US
+3211082240,3211082751,GB
+3211082752,3211083007,SG
+3211083008,3211083519,US
+3211083520,3211083775,HK
 3211083776,3211083791,RU
-3211083792,3211084287,CL
+3211083792,3211083855,CL
+3211083856,3211083871,DE
+3211083872,3211084031,CL
+3211084032,3211084287,DE
 3211084288,3211084303,NL
-3211084304,3211084671,CL
+3211084304,3211084367,CL
+3211084368,3211084383,DE
+3211084384,3211084559,CL
+3211084560,3211084575,DE
+3211084576,3211084671,CL
 3211084672,3211084799,BY
 3211084800,3211084815,AT
-3211084816,3211084927,CL
+3211084816,3211084879,CL
+3211084880,3211084895,DE
+3211084896,3211084927,CL
 3211084928,3211085055,US
-3211085056,3211085311,CL
+3211085056,3211085071,CL
+3211085072,3211085087,DE
+3211085088,3211085311,CL
 3211085312,3211085327,GB
-3211085328,3211085695,CL
+3211085328,3211085391,CL
+3211085392,3211085407,DE
+3211085408,3211085583,CL
+3211085584,3211085599,DE
+3211085600,3211085695,CL
 3211085696,3211085823,GE
 3211085824,3211085839,TH
-3211085840,3211086095,CL
-3211086096,3211086111,US
+3211085840,3211085903,CL
+3211085904,3211085919,DE
+3211085920,3211086095,CL
+3211086096,3211086111,DE
 3211086112,3211086335,CL
 3211086336,3211086351,FR
-3211086352,3211086463,CL
+3211086352,3211086367,DE
+3211086368,3211086463,CL
 3211086464,3211086591,US
-3211086592,3211086847,CL
+3211086592,3211086607,CL
+3211086608,3211086623,DE
+3211086624,3211086847,CL
 3211086848,3211086863,PL
-3211086864,3211087359,CL
+3211086864,3211086879,DE
+3211086880,3211087119,CL
+3211087120,3211087135,DE
+3211087136,3211087359,CL
 3211087360,3211087375,GB
-3211087376,3211087871,CL
+3211087376,3211087391,DE
+3211087392,3211087631,CL
+3211087632,3211087647,DE
+3211087648,3211087871,CL
 3211087872,3211087887,ES
-3211087888,3211087999,CL
+3211087888,3211087903,DE
+3211087904,3211087999,CL
 3211088000,3211088127,US
-3211088128,3211088383,CL
+3211088128,3211088143,CL
+3211088144,3211088159,DE
+3211088160,3211088383,CL
 3211088384,3211088399,BE
-3211088400,3211088895,CL
+3211088400,3211088415,DE
+3211088416,3211088655,CL
+3211088656,3211088671,DE
+3211088672,3211088895,CL
 3211088896,3211088911,DK
-3211088912,3211089407,CL
+3211088912,3211089407,DE
 3211089408,3211089423,GB
-3211089424,3211089535,CL
+3211089424,3211089439,DE
+3211089440,3211089535,CL
 3211089536,3211089663,US
-3211089664,3211089919,CL
+3211089664,3211089919,DE
 3211089920,3211089935,GB
-3211089936,3211090431,CL
+3211089936,3211090431,DE
 3211090432,3211090447,GR
-3211090448,3211090943,CL
+3211090448,3211090943,DE
 3211090944,3211090959,TR
-3211090960,3211091071,CL
+3211090960,3211091071,DE
 3211091072,3211091199,US
-3211091200,3211091455,CL
+3211091200,3211091215,CL
+3211091216,3211091231,DE
+3211091232,3211091455,CL
 3211091456,3211091471,FI
-3211091472,3211091967,CL
+3211091472,3211091487,DE
+3211091488,3211091727,CL
+3211091728,3211091743,DE
+3211091744,3211091967,CL
 3211091968,3211091983,RU
-3211091984,3211092479,CL
+3211091984,3211091999,DE
+3211092000,3211092239,CL
+3211092240,3211092255,DE
+3211092256,3211092479,CL
 3211092480,3211092495,BE
-3211092496,3211092607,CL
+3211092496,3211092511,DE
+3211092512,3211092607,CL
 3211092608,3211092735,US
-3211092736,3211092991,CL
+3211092736,3211092751,CL
+3211092752,3211092767,DE
+3211092768,3211092991,CL
 3211092992,3211093007,SK
-3211093008,3211093503,CL
+3211093008,3211093023,DE
+3211093024,3211093263,CL
+3211093264,3211093279,DE
+3211093280,3211093503,CL
 3211093504,3211093519,HR
-3211093520,3211094015,CL
+3211093520,3211093535,DE
+3211093536,3211093775,CL
+3211093776,3211093791,DE
+3211093792,3211094015,CL
 3211094016,3211094031,CZ
-3211094032,3211094143,CL
+3211094032,3211094047,DE
+3211094048,3211094143,CL
 3211094144,3211094271,US
-3211094272,3211094527,CL
+3211094272,3211094287,CL
+3211094288,3211094303,DE
+3211094304,3211094527,CL
 3211094528,3211094543,HR
-3211094544,3211095039,CL
+3211094544,3211095039,DE
 3211095040,3211095055,ES
-3211095056,3211095551,CL
+3211095056,3211095071,DE
+3211095072,3211095311,CL
+3211095312,3211095327,DE
+3211095328,3211095551,CL
 3211095552,3211095567,GB
-3211095568,3211095679,CL
+3211095568,3211095583,DE
+3211095584,3211095679,CL
 3211095680,3211095807,US
-3211095808,3211096063,CL
+3211095808,3211096063,DE
 3211096064,3211096079,GB
-3211096080,3211096575,CL
-3211096576,3211096831,US
-3211096832,3211097087,CL
+3211096080,3211096095,DE
+3211096096,3211096335,CL
+3211096336,3211096351,DE
+3211096352,3211096575,CL
+3211096576,3211096831,DE
+3211096832,3211096847,CL
+3211096848,3211096863,DE
+3211096864,3211097087,CL
 3211097088,3211097103,DE
 3211097104,3211097151,GB
 3211097152,3211097215,CL
 3211097216,3211097343,GB
-3211097344,3211097599,CL
+3211097344,3211097359,CL
+3211097360,3211097375,DE
+3211097376,3211097599,CL
 3211097600,3211097855,US
-3211097856,3211098111,CL
+3211097856,3211097871,CL
+3211097872,3211097887,DE
+3211097888,3211098111,CL
 3211098112,3211098367,US
-3211098368,3211098623,CL
+3211098368,3211098383,CL
+3211098384,3211098399,DE
+3211098400,3211098623,CL
 3211098624,3211098879,US
-3211098880,3211099135,CL
+3211098880,3211098895,CL
+3211098896,3211098911,DE
+3211098912,3211099135,CL
 3211099136,3211099391,DE
-3211099392,3211099647,CL
-3211099648,3211099663,DE
-3211099664,3211099679,GB
-3211099680,3211099711,CL
+3211099392,3211099407,CL
+3211099408,3211099423,DE
+3211099424,3211099647,CL
+3211099648,3211099679,DE
+3211099680,3211099711,GB
 3211099712,3211099775,DE
 3211099776,3211099903,GB
-3211099904,3211101951,CL
+3211099904,3211099919,CL
+3211099920,3211099935,DE
+3211099936,3211101951,CL
 3211101952,3211102207,AR
 3211102208,3211104767,AU
 3211104768,3211106303,CL
 3211106304,3211108351,US
-3211108352,3211129343,CL
+3211108352,3211113471,CL
+3211113472,3211113727,GB
+3211113728,3211113983,LT
+3211113984,3211114239,LU
+3211114240,3211114495,SE
+3211114496,3211114751,IT
+3211114752,3211115007,US
+3211115008,3211115263,NO
+3211115264,3211115519,BE
+3211115520,3211115775,DK
+3211115776,3211116287,RU
+3211116288,3211116543,ES
+3211116544,3211124735,CL
+3211124736,3211128831,US
+3211128832,3211129343,CL
 3211129344,3211129599,SG
-3211129600,3211129855,BR
-3211129856,3211132927,CL
+3211129600,3211129855,NL
+3211129856,3211130879,CL
+3211130880,3211132927,US
 3211132928,3211137023,CO
 3211137024,3211141119,AR
 3211141120,3211142143,CL
@@ -63906,14 +62372,17 @@
 3221226240,3221226495,US
 3221226496,3221227519,KY
 3221227520,3221242879,US
-3221242880,3221243391,GB
+3221242880,3221243135,AU
+3221243136,3221243391,DE
 3221243392,3221243647,US
 3221243648,3221243903,SG
 3221243904,3221258239,US
 3221258240,3221291007,CA
 3221291008,3221334269,US
 3221334270,3221334270,DZ
-3221334271,3221560319,US
+3221334271,3221469175,US
+3221469176,3221469183,CA
+3221469184,3221560319,US
 3221560320,3221561087,GB
 3221561088,3221562367,US
 3221562368,3221562623,SE
@@ -63966,15 +62435,24 @@
 3221806080,3221806335,IN
 3221806336,3221806591,US
 3221806592,3221806847,IN
-3221806848,3221843967,US
+3221806848,3221808383,US
+3221808384,3221808639,IN
+3221808640,3221810431,US
+3221810432,3221810687,IN
+3221810688,3221813759,US
+3221813760,3221814015,IN
+3221814016,3221815039,US
+3221815040,3221815295,IN
+3221815296,3221843967,US
 3221843968,3221844223,EU
-3221844224,3221991167,US
+3221844224,3221946367,US
+3221946368,3221991167,FR
 3221991168,3221991423,NZ
-3221991424,3221993727,US
+3221991424,3221993727,FR
 3221993728,3221993983,EU
-3221993984,3222003967,US
+3221993984,3222003967,FR
 3222003968,3222004223,AP
-3222004224,3222011903,US
+3222004224,3222011903,FR
 3222011904,3222012159,CA
 3222012160,3222012415,GB
 3222012416,3222023935,US
@@ -63996,7 +62474,8 @@
 3222036736,3222036991,US
 3222036992,3222037247,CA
 3222037248,3222037503,NL
-3222037504,3222044927,US
+3222037504,3222040575,US
+3222042624,3222044927,US
 3222044928,3222045183,CA
 3222045184,3222056447,US
 3222056448,3222059007,CA
@@ -64253,7 +62732,9 @@
 3223578112,3223580671,US
 3223580672,3223581951,AT
 3223581952,3223582207,US
-3223582208,3223582719,NL
+3223582208,3223582212,NL
+3223582213,3223582213,PT
+3223582214,3223582719,NL
 3223582720,3223582975,AU
 3223582976,3223584767,US
 3223584768,3223585023,GB
@@ -64302,7 +62783,9 @@
 3223638272,3223638527,GB
 3223638528,3223640831,SE
 3223640832,3223641087,GB
-3223641088,3223646207,SE
+3223641088,3223644415,SE
+3223644416,3223644671,DE
+3223644672,3223646207,SE
 3223646208,3223646463,IT
 3223646464,3223646975,SE
 3223646976,3223647231,IT
@@ -64322,6 +62805,7 @@
 3223865344,3223867391,FI
 3223867392,3223867647,GB
 3223867648,3223867903,CA
+3223867904,3223868415,US
 3223868416,3223869439,BM
 3223869440,3223871487,US
 3223871488,3223873535,CA
@@ -64329,16 +62813,15 @@
 3223881728,3223882751,CA
 3223882752,3223883263,US
 3223883264,3223883519,CA
-3223883520,3223902207,US
+3223883520,3223902463,US
 3223902464,3223902719,CA
 3223902720,3223905279,US
 3223905280,3223905535,FI
 3223905536,3223905791,US
 3223906304,3223909375,CA
-3223909376,3223910911,US
-3223911424,3223911935,US
+3223909376,3223911935,US
 3223911936,3223912191,CA
-3223912192,3223938815,US
+3223912448,3223938815,US
 3223938816,3223946239,GB
 3223946240,3223947519,CH
 3223947520,3223948287,US
@@ -64432,6 +62915,7 @@
 3224099584,3224099839,CA
 3224099840,3224101375,US
 3224101376,3224102399,AU
+3224102400,3224103423,US
 3224103424,3224103679,NL
 3224103680,3224104703,US
 3224104704,3224104959,AU
@@ -64478,8 +62962,7 @@
 3224430336,3224430591,NL
 3224430592,3224431103,US
 3224431104,3224431359,CA
-3224431360,3224431615,US
-3224432128,3224434687,US
+3224431360,3224434687,US
 3224434688,3224434943,AU
 3224434944,3224435967,US
 3224435968,3224436223,MU
@@ -64489,11 +62972,13 @@
 3224567808,3224571903,NO
 3224571904,3224580095,JP
 3224580096,3224580351,US
-3224580352,3224633343,JP
+3224580352,3224616959,JP
+3224616960,3224617471,US
+3224617472,3224633343,JP
 3224633344,3224646399,DE
 3224646400,3224651775,US
 3224651776,3224652287,AU
-3224652800,3224660991,US
+3224652288,3224660991,US
 3224660992,3224661247,CA
 3224661248,3224664063,US
 3224672000,3224672255,US
@@ -64501,8 +62986,7 @@
 3224672512,3224674047,US
 3224674048,3224674559,DE
 3224674560,3224674815,GB
-3224674816,3224675839,US
-3224676864,3224677119,US
+3224674816,3224677119,US
 3224677120,3224678655,AU
 3224678656,3224680703,US
 3224680704,3224680959,AU
@@ -64514,8 +62998,7 @@
 3224692736,3224692991,NL
 3224692992,3224694527,US
 3224694528,3224694783,CA
-3224694784,3224697343,US
-3224697856,3224698111,US
+3224694784,3224698111,US
 3224698112,3224698623,NL
 3224698624,3224699135,US
 3224699136,3224699647,BE
@@ -64550,7 +63033,8 @@
 3224799488,3224799743,AU
 3224799744,3224799999,US
 3224800000,3224800255,DE
-3224800256,3224816639,FR
+3224800256,3224800511,US
+3224800512,3224816639,FR
 3224816640,3224816895,IL
 3224816896,3224820735,FR
 3224820736,3224820991,PL
@@ -64608,7 +63092,7 @@
 3224878080,3224878335,NL
 3224878336,3224878591,US
 3224878592,3224878847,AU
-3224878848,3224879103,US
+3224878848,3224879359,US
 3224879360,3224879615,NL
 3224879616,3224879871,CA
 3224879872,3224880383,US
@@ -64630,7 +63114,7 @@
 3224889344,3224889599,AU
 3224889600,3224890879,US
 3224890880,3224891135,AU
-3224891136,3224891903,US
+3224891136,3224892415,US
 3224892416,3224892671,NL
 3224892672,3224899071,US
 3224899072,3224899327,AT
@@ -64649,11 +63133,11 @@
 3225034752,3225035775,BG
 3225035776,3225037055,US
 3225037056,3225049599,FI
-3225050112,3225057535,US
+3225049600,3225057535,US
 3225057536,3225057791,CA
-3225057792,3225060351,US
-3225060352,3225061631,AU
-3225061632,3225061887,US
+3225057792,3225060607,US
+3225060608,3225061631,AU
+3225061632,3225062399,US
 3225062400,3225063423,VC
 3225063424,3225076223,US
 3225076224,3225076479,CA
@@ -64670,42 +63154,42 @@
 3225089280,3225089535,CA
 3225089536,3225090047,US
 3225090048,3225090303,AP
-3225090304,3225091071,US
-3225091584,3225314303,US
+3225090304,3225314303,US
 3225314304,3225314559,GB
-3225314560,3225419775,US
-3225420032,3225420287,US
+3225314560,3225420799,US
 3225420800,3225423871,CA
 3225423872,3225426943,US
 3225426944,3225427199,NL
 3225427200,3225427455,US
+3225427456,3225427967,CA
 3225427968,3225428991,US
-3225429504,3225431039,CA
+3225428992,3225431039,CA
 3225431040,3225431551,NL
 3225431552,3225434111,US
 3225434112,3225436159,CA
-3225436160,3225444607,US
+3225436160,3225445375,US
 3225445376,3225446399,BE
 3225446400,3225450495,US
 3225450496,3225451263,AG
 3225451264,3225451519,MS
 3225451520,3225451775,US
 3225451776,3225452031,NL
+3225452032,3225452543,US
 3225452544,3225456639,CA
 3225456640,3225459711,US
 3225459712,3225459967,CA
 3225459968,3225460479,US
-3225460480,3225462015,CA
-3225462016,3225462271,US
-3225462784,3225468927,US
-3225468928,3225469951,CA
-3225470464,3225470975,US
+3225460480,3225460735,CA
+3225460736,3225460991,US
+3225460992,3225462015,CA
+3225462016,3225468927,US
+3225468928,3225470463,CA
+3225470464,3225471487,US
 3225471488,3225471743,NL
 3225471744,3225472255,HK
-3225472256,3225472511,US
-3225473024,3225498111,US
+3225472256,3225498367,US
 3225498368,3225503487,NL
-3225503488,3225506047,US
+3225503488,3225506303,US
 3225506304,3225508863,AU
 3225508864,3225509631,CH
 3225509632,3225509887,US
@@ -64713,25 +63197,27 @@
 3225510144,3225518591,US
 3225518592,3225518847,AU
 3225518848,3225519359,NL
-3225519872,3225520639,US
+3225519360,3225520895,US
 3225520896,3225521151,NL
 3225521152,3225522175,US
 3225522176,3225522943,GB
 3225522944,3225524223,US
 3225524224,3225524479,VE
 3225524480,3225524735,GB
-3225525248,3225526271,US
+3225524736,3225526271,US
 3225526272,3225528319,BB
-3225528320,3225530367,US
+3225528320,3225528831,US
+3225528832,3225529087,VI
+3225529088,3225530367,US
 3225530368,3225530623,PR
-3225530624,3225530879,US
-3225531136,3225531647,US
+3225530624,3225531903,US
 3225531904,3225532159,AU
 3225532160,3225535999,CH
 3225536000,3225540863,US
 3225540864,3225541119,AU
 3225541120,3225541375,US
-3225541376,3225544703,GB
+3225541376,3225543935,GB
+3225543936,3225544703,US
 3225544704,3225546751,CA
 3225546752,3225548799,US
 3225548800,3225549055,AU
@@ -64739,18 +63225,20 @@
 3225549312,3225549567,AU
 3225549568,3225550847,US
 3225550848,3225616383,DK
+3225616384,3225616639,US
 3225616640,3225616895,AU
+3225616896,3225617151,US
 3225617152,3225617407,IE
 3225617408,3225617663,NL
-3225617920,3225618175,US
-3225618432,3225618687,US
+3225617664,3225618687,US
 3225618688,3225618943,CA
-3225619200,3225619455,US
+3225618944,3225619455,US
 3225619456,3225619711,AU
 3225619712,3225624575,US
 3225624576,3225625599,CA
+3225625600,3225626367,US
 3225626368,3225626623,GB
-3225626880,3225627391,US
+3225626624,3225627391,US
 3225627392,3225627647,NL
 3225627648,3225627903,US
 3225627904,3225628159,CA
@@ -64760,7 +63248,7 @@
 3225629184,3225629439,NL
 3225629440,3225629695,US
 3225629696,3225629951,NL
-3225629952,3225630207,US
+3225629952,3225630463,US
 3225630464,3225630719,NL
 3225630720,3225631231,US
 3225631232,3225631487,NL
@@ -64772,38 +63260,40 @@
 3225637888,3225638399,AU
 3225638400,3225638655,US
 3225638656,3225638911,GB
-3225639424,3225640447,US
+3225638912,3225640447,US
 3225640448,3225640703,NL
 3225640704,3225641983,US
 3225641984,3225643263,GB
 3225643264,3225643775,CA
 3225643776,3225650943,US
 3225650944,3225651199,GB
-3225651200,3225658367,US
-3225658624,3225658879,US
+3225651200,3225659135,US
 3225659136,3225659391,DE
 3225659392,3225659647,AU
+3225659648,3225659903,US
 3225659904,3225660159,DE
 3225660160,3225660415,AU
-3225660416,3225664511,US
-3225664512,3225669887,DE
+3225660416,3225664767,US
+3225664768,3225669887,DE
 3225669888,3225671935,US
 3225671936,3225672191,AU
 3225672192,3225672447,DE
 3225672448,3225672703,US
 3225672704,3225673215,NL
+3225673216,3225673471,CA
 3225673472,3225673727,IE
 3225673728,3225679871,US
 3225679872,3225680127,AU
 3225680128,3225680383,GR
-3225680640,3225681919,US
+3225680384,3225680639,CA
+3225680640,3225681663,US
+3225681664,3225681919,CA
 3225681920,3225682943,DE
 3225682944,3225683199,AT
 3225683200,3225687039,DE
 3225687040,3225687807,US
 3225687808,3225688063,NL
-3225688064,3225689343,US
-3225689600,3225689855,US
+3225688064,3225689855,US
 3225689856,3225694975,NL
 3225694976,3225695231,PL
 3225695232,3225695487,US
@@ -64819,17 +63309,19 @@
 3225716992,3225717247,CA
 3225717248,3225717503,MU
 3225717504,3225717759,AU
-3225717760,3225720063,US
+3225717760,3225720575,US
 3225720576,3225721343,GB
-3225721344,3225723903,US
-3225723904,3225725439,DE
+3225721344,3225723647,US
+3225723648,3225723903,CA
+3225723904,3225724159,US
+3225724160,3225725439,DE
 3225725440,3225725695,GB
 3225725696,3225726207,AU
 3225726208,3225726463,US
 3225726464,3225726719,NL
 3225726720,3225726975,US
 3225726976,3225727231,NL
-3225727232,3225727487,US
+3225727232,3225727743,US
 3225727744,3225727999,AU
 3225728000,3225728511,US
 3225728512,3225728767,NL
@@ -64837,7 +63329,9 @@
 3225729024,3225729279,CA
 3225729280,3225729535,US
 3225729536,3225729791,NL
-3225729792,3225735167,US
+3225729792,3225730047,US
+3225730048,3225730303,CA
+3225730304,3225735423,US
 3225735424,3225735679,PT
 3225735680,3225735935,US
 3225735936,3225737215,DE
@@ -64849,30 +63343,35 @@
 3225739520,3225740543,US
 3225740544,3225740799,CA
 3225740800,3225741055,NL
-3225741056,3225741823,US
+3225741056,3225742079,US
 3225742080,3225745919,JP
 3225745920,3225746687,NL
 3225746688,3225746943,US
 3225746944,3225747199,NL
-3225747456,3225757695,US
+3225747200,3225747711,US
+3225747712,3225747967,CA
+3225747968,3225757695,US
 3225757696,3225758719,CA
-3225759232,3225759487,US
-3225759744,3225763839,US
+3225759232,3225763839,US
 3225763840,3225764095,BE
+3225764096,3225764863,US
 3225764864,3225765887,CA
+3225765888,3225766399,US
 3225766400,3225766655,CA
-3225766912,3225773055,US
+3225766656,3225769471,US
+3225769472,3225769983,CA
+3225769984,3225773311,US
 3225773312,3225773567,CA
-3225774080,3225776383,US
+3225773568,3225776639,US
+3225776640,3225777151,CA
 3225777152,3225777407,AU
-3225777408,3225777663,US
-3225778176,3225780479,US
+3225777408,3225781247,US
 3225781248,3225782271,CA
-3225782272,3225785343,US
-3225785344,3225788415,CA
-3225788416,3225806847,US
+3225782272,3225785599,US
+3225785600,3225788159,CA
+3225788160,3225807359,US
 3225807360,3225807615,DE
-3225807872,3225812991,US
+3225807616,3225812991,US
 3225812992,3225843711,FR
 3225843712,3225847039,US
 3225847040,3225847551,TR
@@ -64892,23 +63391,29 @@
 3225868288,3225868543,AU
 3225868544,3225869055,US
 3225869056,3225869311,AU
-3225869312,3225870335,US
+3225869312,3225869567,CA
+3225869568,3225870335,US
 3225870336,3225870591,CA
 3225870592,3225873663,US
 3225873664,3225873919,ZA
 3225873920,3225874943,US
 3225874944,3225875199,GB
-3225875456,3225875967,US
-3225876480,3225878527,US
+3225875200,3225878527,US
 3225878528,3225880319,SE
 3225880320,3225880575,US
 3225880576,3225881343,SE
 3225881344,3225881599,IT
-3225881600,3225885183,SE
+3225881600,3225882367,SE
+3225882368,3225882623,DE
+3225882624,3225882879,SE
+3225882880,3225883391,DE
+3225883392,3225885183,SE
 3225885184,3225885695,AT
 3225885696,3225887999,SE
 3225888000,3225888255,GB
-3225888256,3225905407,SE
+3225888256,3225894399,SE
+3225894400,3225895423,GB
+3225895424,3225905407,SE
 3225905408,3225905663,IT
 3225905664,3225913855,SE
 3225913856,3225914111,DE
@@ -64941,7 +63446,7 @@
 3225936896,3225937407,SE
 3225937408,3225937663,US
 3225937664,3225938175,SE
-3225938176,3225938431,RU
+3225938176,3225938431,CH
 3225938432,3225938687,US
 3225938688,3225940991,SE
 3225940992,3225941247,IL
@@ -64949,22 +63454,23 @@
 3225941504,3225942038,SE
 3225942039,3225942039,EU
 3225942040,3225942271,SE
-3225942272,3225942527,HU
+3225942272,3225942527,BE
 3225942528,3225944063,SE
-3225944064,3226008831,TW
-3226008832,3226009343,US
-3226009600,3226010879,US
+3225944064,3225944831,US
+3225944832,3226008831,TW
+3226008832,3226010879,US
 3226010880,3226011135,CA
 3226011136,3226012671,US
 3226012672,3226012927,AU
-3226012928,3226014207,US
+3226012928,3226014463,US
 3226014464,3226014975,NL
 3226014976,3226015487,AU
+3226015488,3226015743,US
 3226015744,3226016255,AU
 3226016256,3226018303,US
 3226018304,3226018559,DE
 3226018560,3226021119,CH
-3226021376,3226026495,US
+3226021120,3226026495,US
 3226026496,3226026751,AU
 3226026752,3226067455,US
 3226067456,3226067711,BE
@@ -64972,32 +63478,46 @@
 3226068224,3226068479,NL
 3226068480,3226074879,US
 3226074880,3226075135,AT
-3226075136,3226109951,US
-3226110208,3226110719,US
+3226075136,3226110719,US
 3226110720,3226128639,AU
-3226128640,3226140671,US
-3226140672,3226141695,CA
+3226128640,3226140927,US
+3226140928,3226141695,CA
 3226141696,3226141951,US
-3226141952,3226157567,CA
+3226141952,3226143487,CA
+3226143488,3226143743,US
+3226143744,3226156543,CA
+3226156544,3226156799,US
+3226156800,3226157567,CA
 3226157568,3226157823,US
-3226157824,3226175487,CA
-3226175744,3226175999,US
+3226157824,3226167807,CA
+3226167808,3226168063,US
+3226168064,3226175231,CA
+3226175232,3226175999,US
 3226176000,3226177535,CA
 3226177536,3226178559,US
-3226178560,3226189823,CA
+3226178560,3226188543,CA
+3226188544,3226188799,PR
+3226188800,3226189823,CA
 3226189824,3226191871,US
-3226191872,3226201087,CA
+3226191872,3226194175,CA
+3226194176,3226194431,US
+3226194432,3226194687,CA
+3226194688,3226194943,US
+3226194944,3226201087,CA
 3226201088,3226201343,US
 3226201344,3226201855,CA
-3226202112,3226206207,CA
-3226206208,3226207231,US
+3226202112,3226205951,CA
+3226205952,3226207743,US
 3226207744,3226215423,GB
-3226215424,3226236927,US
-3226237184,3226237439,US
+3226215424,3226237439,US
 3226237440,3226237695,AU
-3226237696,3226241535,DE
-3226241536,3226241791,LI
-3226241792,3226250495,DE
+3226237696,3226240255,DE
+3226240256,3226240511,US
+3226240512,3226241535,DE
+3226241536,3226241791,AT
+3226241792,3226248447,DE
+3226248448,3226248703,IE
+3226248704,3226250495,DE
 3226250496,3226251263,US
 3226251264,3226251519,DE
 3226251520,3226267903,US
@@ -65006,14 +63526,13 @@
 3226268416,3226268927,AT
 3226268928,3226269951,DE
 3226269952,3226270719,US
-3226271744,3226273791,US
+3226271488,3226273791,US
 3226273792,3226274047,AU
 3226274048,3226274559,US
 3226274560,3226274815,NL
 3226274816,3226276095,US
 3226276096,3226276351,AU
-3226276352,3226276863,US
-3226277632,3226283519,US
+3226276352,3226283519,US
 3226283520,3226291199,CA
 3226291200,3226300927,US
 3226300928,3226301439,DE
@@ -65040,49 +63559,65 @@
 3226473728,3226473983,PT
 3226473984,3226474495,US
 3226474496,3226474751,CL
-3226475264,3226475519,US
-3226475776,3226476287,US
+3226474752,3226476287,US
 3226476288,3226479359,CH
-3226479360,3226479871,US
+3226479360,3226480127,US
 3226480128,3226480383,NL
 3226480384,3226481407,US
 3226481408,3226481663,DE
-3226481664,3226521855,US
+3226481664,3226488831,US
+3226488832,3226489087,CA
+3226489088,3226521855,US
 3226521856,3226522111,BR
-3226522112,3226536191,US
+3226522112,3226536959,US
 3226536960,3226542079,CA
-3226542080,3226546431,US
-3226547200,3226548223,CA
+3226542080,3226547199,US
+3226547200,3226548735,CA
+3226548736,3226548991,US
 3226548992,3226549247,BE
-3226549248,3226550271,NL
-3226550272,3226555391,US
-3226555648,3226555903,CA
-3226556416,3226561535,US
+3226549248,3226549503,US
+3226549504,3226550015,NL
+3226550016,3226550783,US
+3226550784,3226551039,CA
+3226551040,3226551807,US
+3226551808,3226552319,CA
+3226552320,3226552831,VI
+3226552832,3226555391,US
+3226555392,3226555903,CA
+3226555904,3226556671,US
+3226556672,3226556927,CA
+3226556928,3226561535,US
 3226561792,3226562047,NO
-3226562560,3226564607,US
+3226562048,3226564863,US
 3226564864,3226565119,NL
+3226565120,3226565375,US
 3226565376,3226565631,FI
 3226565632,3226574847,US
 3226574848,3226575103,FI
-3226576384,3226576639,US
+3226575104,3226575359,US
+3226575360,3226576383,CA
+3226576384,3226576895,US
 3226576896,3226578943,CA
-3226578944,3226579967,US
+3226578944,3226580479,US
 3226580480,3226581247,FI
 3226581248,3226583295,US
+3226583296,3226583551,CA
 3226583552,3226583807,NL
-3226584064,3226584415,US
+3226583808,3226584415,US
 3226584416,3226584447,AU
 3226584448,3226591231,US
 3226591232,3226592255,CA
+3226592256,3226592767,US
 3226592768,3226593023,NL
+3226593024,3226593791,US
 3226593792,3226594047,NL
-3226594304,3226626047,US
+3226594048,3226626047,US
 3226626048,3226626303,CA
 3226626304,3226629375,US
 3226629376,3226629631,CA
 3226629632,3226630399,US
 3226630400,3226630655,NL
-3226630912,3226631167,US
+3226630656,3226631167,US
 3226631168,3226631423,NL
 3226631424,3226631935,US
 3226631936,3226632191,PT
@@ -65093,16 +63628,15 @@
 3226635520,3226635775,US
 3226635776,3226636031,ZA
 3226636032,3226636287,AU
-3226637056,3226637823,US
+3226636288,3226637823,US
 3226637824,3226638079,CA
-3226638080,3226638335,US
+3226638080,3226638591,US
 3226638592,3226638847,NL
 3226638848,3226639615,US
 3226639616,3226640127,AT
 3226640128,3226640639,US
 3226640640,3226640895,AU
-3226640896,3226652927,US
-3226653696,3226654207,US
+3226640896,3226654207,US
 3226654208,3226654463,PT
 3226654464,3226655743,US
 3226655744,3226656255,NL
@@ -65111,29 +63645,29 @@
 3226658304,3226658559,AU
 3226658560,3226661119,US
 3226661120,3226661375,NL
-3226661888,3226662143,US
-3226662912,3226664959,US
+3226661888,3226664959,US
 3226664960,3226690815,FI
 3226690816,3226691071,CA
 3226691072,3226691327,NL
+3226691328,3226691583,US
 3226691584,3226691839,AU
-3226691840,3226693631,US
-3226694144,3226695167,US
+3226691840,3226695167,US
 3226695168,3226695679,AU
 3226695680,3226695935,US
 3226695936,3226696191,CA
 3226696192,3226696703,AU
-3226696704,3226704895,US
+3226696704,3226705151,US
 3226705152,3226705407,AU
 3226705408,3226705919,US
 3226705920,3226706175,FR
-3226706176,3226706943,US
+3226706176,3226707199,US
 3226707200,3226707455,PL
 3226707456,3226715391,TW
 3226715392,3226715647,US
 3226715648,3226715903,AU
 3226715904,3226716159,US
 3226716160,3226716415,GB
+3226716416,3226716671,US
 3226716672,3226716927,GB
 3226716928,3226718207,US
 3226720768,3226721279,JP
@@ -65146,13 +63680,11 @@
 3226724096,3226724351,AU
 3226724352,3226725631,US
 3226725632,3226726143,AU
-3226726144,3226727679,US
-3226727936,3226728191,US
+3226726144,3226728191,US
 3226728192,3226728447,CA
-3226728448,3226730495,US
-3226731008,3226731519,US
+3226728448,3226731775,US
 3226731776,3226732031,GB
-3226732288,3226733567,US
+3226732032,3226733567,US
 3226733568,3226733823,MX
 3226733824,3226734079,PT
 3226734080,3226734335,US
@@ -65164,7 +63696,7 @@
 3226738176,3226738431,NL
 3226738432,3226738687,US
 3226738688,3226739199,NL
-3226739712,3226746367,US
+3226739200,3226746367,US
 3226746368,3226746623,NL
 3226746624,3226748927,US
 3226749440,3226749695,US
@@ -65175,10 +63707,12 @@
 3226753280,3226753535,AU
 3226753536,3226753791,SI
 3226753792,3226754303,HR
-3226754304,3226757375,SI
+3226754304,3226756095,SI
+3226756096,3226756351,US
+3226756352,3226757375,SI
 3226757376,3226757887,HR
 3226757888,3226758655,SI
-3226758912,3226762751,US
+3226758656,3226763007,US
 3226763008,3226770687,IT
 3226770688,3226772991,US
 3226772992,3226773247,NL
@@ -65193,7 +63727,7 @@
 3226785024,3226786559,US
 3226786560,3226786815,AU
 3226786816,3226787327,NL
-3226787328,3226788095,US
+3226787328,3226788351,US
 3226788352,3226789375,HU
 3226789376,3226789631,AU
 3226789632,3226791167,US
@@ -65205,14 +63739,13 @@
 3226793216,3226793983,DE
 3226793984,3226795263,US
 3226795264,3226795519,AU
-3226795520,3226795775,US
-3226796032,3226800127,US
+3226795520,3226800127,US
 3226800128,3226800639,DE
 3226800640,3226811391,US
 3226811392,3226811647,DE
 3226811648,3226824191,US
 3226824192,3226824447,EU
-3226824448,3226861567,US
+3226824448,3226861823,US
 3226861824,3226862079,CA
 3226862080,3226864383,US
 3226864384,3226864639,RU
@@ -65232,14 +63765,13 @@
 3226894080,3226894335,GB
 3226894336,3226894591,US
 3226894592,3226894847,AU
-3226895104,3226895359,US
+3226894848,3226895359,US
 3226895360,3226895871,AU
 3226895872,3226896127,NL
 3226896128,3226896639,US
 3226896640,3226896895,NL
 3226896896,3226897151,PT
-3226897152,3226902527,US
-3226903040,3226903295,US
+3226897152,3226903295,US
 3226903296,3226903551,NL
 3226903552,3226903807,US
 3226903808,3226904063,AU
@@ -65249,6 +63781,7 @@
 3226905088,3226926591,US
 3226926592,3226926847,NL
 3226927104,3226992639,NL
+3226992640,3226992895,US
 3226992896,3226993151,NL
 3226993152,3226993663,US
 3226993664,3226993919,NL
@@ -65256,8 +63789,9 @@
 3226994176,3226994687,AU
 3226994688,3226994943,US
 3226994944,3226995455,GB
-3226995456,3226996735,US
+3226995456,3226996991,US
 3226996992,3226997247,PT
+3226997248,3226997759,US
 3226998016,3226998527,US
 3226998528,3226999039,NL
 3226999040,3227013119,US
@@ -65266,24 +63800,24 @@
 3227013888,3227014399,NL
 3227014400,3227014655,AU
 3227014656,3227014911,NL
-3227014912,3227017215,US
+3227014912,3227017471,US
 3227017472,3227017983,NL
+3227018240,3227018495,US
 3227018496,3227019007,AU
 3227019008,3227020287,US
 3227020288,3227020543,NL
-3227020800,3227022847,US
+3227020544,3227022847,US
 3227022848,3227023103,NL
 3227023104,3227023359,AU
-3227023360,3227023615,US
-3227023872,3227024127,US
+3227023360,3227024127,US
 3227024128,3227024383,NL
-3227024384,3227024895,US
+3227024384,3227025407,US
 3227025408,3227025663,NL
 3227025664,3227025919,US
 3227025920,3227026175,GB
 3227026176,3227026687,US
 3227026688,3227026943,GB
-3227027456,3227035135,US
+3227026944,3227035135,US
 3227035136,3227035391,EU
 3227035392,3227035647,AP
 3227035648,3227040255,US
@@ -65300,11 +63834,13 @@
 3227051776,3227053567,US
 3227053568,3227054079,NL
 3227054080,3227056639,US
-3227056640,3227058175,PT
+3227056640,3227057919,PT
+3227057920,3227058175,US
 3227058176,3227123711,FI
 3227123712,3227204617,US
 3227204618,3227204619,EU
-3227204620,3227225087,US
+3227204620,3227224831,US
+3227224832,3227225087,CA
 3227225088,3227225599,NL
 3227225600,3227234559,US
 3227234560,3227234815,NL
@@ -65326,11 +63862,11 @@
 3227243520,3227243775,US
 3227243776,3227244031,AU
 3227244032,3227249151,SE
-3227249408,3227249663,US
+3227249152,3227249663,US
 3227249664,3227252735,CH
 3227252736,3227254271,US
 3227254272,3227254527,AU
-3227254784,3227258623,US
+3227254528,3227258623,US
 3227258624,3227258879,AU
 3227258880,3227273983,US
 3227273984,3227274239,FI
@@ -65360,6 +63896,7 @@
 3227289600,3227290111,NL
 3227290112,3227290367,AT
 3227290368,3227290623,CH
+3227290624,3227290879,US
 3227290880,3227291135,AT
 3227291136,3227294207,PT
 3227294464,3227294975,GR
@@ -65388,8 +63925,7 @@
 3227401728,3227402495,AU
 3227402496,3227402751,US
 3227403008,3227403519,GR
-3227403520,3227403775,US
-3227404288,3227405311,US
+3227403520,3227405311,US
 3227405312,3227405567,NL
 3227405568,3227414015,US
 3227414272,3227416063,GB
@@ -65410,7 +63946,7 @@
 3227430656,3227437055,FR
 3227437056,3227437311,AU
 3227437312,3227437823,US
-3227438848,3227439103,US
+3227438080,3227439103,US
 3227439104,3227439615,AU
 3227439616,3227439871,MU
 3227439872,3227440127,US
@@ -65465,7 +64001,9 @@
 3227465152,3227466135,CA
 3227466136,3227466143,US
 3227466144,3227467775,CA
-3227467776,3227484159,US
+3227468032,3227468287,US
+3227468288,3227468799,CA
+3227468800,3227484159,US
 3227484160,3227516927,CA
 3227517184,3227517695,ZA
 3227517696,3227519743,MU
@@ -65478,11 +64016,15 @@
 3227523072,3227526143,MU
 3227526400,3227526655,MU
 3227526656,3227526911,ZA
-3227526912,3227533311,MU
-3227533312,3227534335,US
+3227526912,3227532799,MU
+3227532800,3227534335,US
 3227534336,3227541503,MU
 3227541504,3227541759,ZA
-3227541760,3227557887,MU
+3227541760,3227551743,MU
+3227551744,3227552255,MF
+3227552256,3227556863,MU
+3227556864,3227557375,US
+3227557376,3227557631,MU
 3227557888,3227558911,US
 3227558912,3227559935,MU
 3227559936,3227561983,US
@@ -65511,31 +64053,17 @@
 3227755776,3227756031,US
 3227756032,3227756505,CA
 3227756506,3227756506,US
-3227756507,3227760715,CA
-3227760716,3227760719,BY
-3227760720,3227761179,CA
-3227761180,3227761183,BY
-3227761184,3227762655,CA
+3227756507,3227762655,CA
 3227762656,3227762671,US
 3227762672,3227765503,CA
 3227765504,3227765759,US
-3227765760,3227766355,CA
-3227766356,3227766359,BY
-3227766360,3227769663,CA
-3227769664,3227769667,BY
-3227769668,3227771203,CA
-3227771204,3227771207,BY
-3227771208,3227775391,CA
-3227775392,3227775395,BY
-3227775396,3227777759,CA
+3227765760,3227777759,CA
 3227777760,3227777763,US
 3227777764,3227777951,CA
 3227777952,3227777967,US
 3227777968,3227777983,CA
 3227777984,3227777999,US
-3227778000,3227779047,CA
-3227779048,3227779055,BY
-3227779056,3227779071,CA
+3227778000,3227779071,CA
 3227779328,3227779583,MU
 3227779584,3227779839,AU
 3227779840,3227783679,US
@@ -65599,7 +64127,7 @@
 3227837952,3227842303,MX
 3227842304,3227842815,BR
 3227842816,3227843327,MX
-3227843328,3227843583,BR
+3227843328,3227844095,BR
 3227844096,3227844351,AR
 3227844864,3227845119,NL
 3227845120,3227845631,US
@@ -65611,7 +64139,7 @@
 3227848704,3227848959,AU
 3227848960,3227851775,US
 3227851776,3227852031,NL
-3227852032,3227852799,US
+3227852032,3227853311,US
 3227853312,3227853567,GB
 3227853568,3227860991,US
 3227863808,3227864063,NL
@@ -65679,6 +64207,7 @@
 3227971584,3227974143,US
 3227974144,3227974655,AU
 3227974656,3227975167,US
+3227975168,3227975679,CA
 3227975936,3227976191,US
 3227976192,3227976447,LU
 3227976448,3227977471,US
@@ -65744,8 +64273,7 @@
 3228078848,3228079103,GR
 3228079104,3228080639,US
 3228080640,3228081151,NL
-3228081152,3228082175,US
-3228082944,3228083967,US
+3228081152,3228083967,US
 3228083968,3228084479,NL
 3228084480,3228085247,US
 3228085248,3228085503,AU
@@ -65885,7 +64413,7 @@
 3228461568,3228461823,CA
 3228461824,3228464127,US
 3228464128,3228464383,CA
-3228464384,3228477695,US
+3228464384,3228478463,US
 3228478464,3228479487,CA
 3228479488,3228496127,US
 3228496128,3228496383,GB
@@ -65898,8 +64426,7 @@
 3228511232,3228511487,CZ
 3228511488,3228511999,US
 3228512000,3228512511,NL
-3228512512,3228513791,US
-3228514304,3228522495,US
+3228512512,3228522495,US
 3228522496,3228522751,NL
 3228522752,3228525823,US
 3228525824,3228526079,NL
@@ -65911,7 +64438,9 @@
 3228531712,3228532223,NO
 3228532224,3228532479,US
 3228532480,3228532735,NL
-3228532736,3228558591,US
+3228532736,3228539247,US
+3228539248,3228539251,AT
+3228539252,3228558591,US
 3228558592,3228559103,BR
 3228559104,3228564479,US
 3228564480,3228564735,AT
@@ -65952,13 +64481,7 @@
 3228826373,3228830719,IL
 3228830720,3228833791,PS
 3228833792,3229024255,IL
-3229024256,3229061119,US
-3229061120,3229062433,CA
-3229062434,3229062450,US
-3229062451,3229064951,CA
-3229064952,3229064955,US
-3229064956,3229065215,CA
-3229065216,3229092095,US
+3229024256,3229092095,US
 3229092096,3229093887,AU
 3229093888,3229104895,US
 3229104896,3229105151,ES
@@ -65976,9 +64499,11 @@
 3229160960,3229161471,DE
 3229161472,3229161727,SE
 3229161728,3229161983,GB
-3229161984,3229164543,SE
+3229161984,3229164287,SE
+3229164288,3229164543,DK
 3229164544,3229165055,GB
-3229165056,3229167103,SE
+3229165056,3229165311,NO
+3229165312,3229167103,SE
 3229167104,3229167615,IT
 3229167616,3229171711,SE
 3229171712,3229172223,GB
@@ -65988,7 +64513,9 @@
 3229184000,3229184511,GB
 3229184512,3229186815,SE
 3229186816,3229187327,ES
-3229187328,3229195263,SE
+3229187328,3229187583,SE
+3229187584,3229187839,DK
+3229187840,3229195263,SE
 3229195264,3229196287,DE
 3229196288,3229196799,SE
 3229196800,3229197311,NL
@@ -66056,8 +64583,8 @@
 3229391616,3229391871,NL
 3229391872,3229392895,US
 3229392896,3229393151,NZ
-3229393152,3229394175,US
-3229394944,3229408255,RU
+3229393152,3229395455,US
+3229395456,3229408255,RU
 3229408256,3229412095,US
 3229412096,3229412351,NL
 3229412352,3229414911,DE
@@ -66065,8 +64592,7 @@
 3229415168,3229415679,NL
 3229415936,3229483007,DE
 3229483008,3229499647,FI
-3229499648,3229500671,US
-3229501440,3229614847,US
+3229499648,3229614847,US
 3229614848,3229615103,GB
 3229615104,3229679103,US
 3229679104,3229679359,EU
@@ -66106,7 +64632,7 @@
 3229844480,3229844735,BE
 3229844736,3229844991,US
 3229845248,3229845503,US
-3229845504,3229847295,CA
+3229845504,3229846527,CA
 3229847296,3229849599,US
 3229849600,3229849855,AU
 3229849856,3229864703,US
@@ -66135,7 +64661,7 @@
 3229890304,3229890559,PT
 3229890560,3229891583,US
 3229891584,3229891839,CA
-3229892608,3229900031,US
+3229892096,3229900031,US
 3229900032,3229900287,AU
 3229900288,3229901567,US
 3229901568,3229901823,GB
@@ -66152,7 +64678,8 @@
 3229940736,3229940991,CH
 3229940992,3229941247,AU
 3229941248,3229941503,US
-3229941760,3229944319,US
+3229941760,3229942271,CA
+3229942272,3229944319,US
 3229944320,3229944575,AU
 3229944576,3229945087,US
 3229945344,3229945599,AU
@@ -66177,7 +64704,7 @@
 3229958144,3229958399,NL
 3229958400,3229958655,US
 3229958656,3229959167,AU
-3229959168,3229968895,US
+3229959168,3229969407,US
 3229969408,3229969663,PT
 3229969664,3229969919,AT
 3229969920,3229970431,FI
@@ -66188,6 +64715,7 @@
 3229975552,3230004223,US
 3230004224,3230004479,GB
 3230004480,3230004991,US
+3230005248,3230005759,US
 3230005760,3230006015,MU
 3230006016,3230007295,US
 3230007296,3230072831,FR
@@ -66202,7 +64730,7 @@
 3230085376,3230085631,US
 3230085888,3230086143,DE
 3230086144,3230086655,GB
-3230087168,3230088191,US
+3230086656,3230088191,US
 3230088960,3230089215,NL
 3230089216,3230089727,US
 3230089728,3230089983,NL
@@ -66215,7 +64743,8 @@
 3230094080,3230094335,CA
 3230094336,3230095615,US
 3230095616,3230095871,JP
-3230096384,3230101503,JP
+3230096384,3230100735,JP
+3230100992,3230101503,PR
 3230101504,3230105855,US
 3230105856,3230106111,NL
 3230106112,3230106879,US
@@ -66808,7 +65337,10 @@
 3231369216,3231369471,TW
 3231369472,3231383551,US
 3231383552,3231385599,NO
-3231385600,3231477759,US
+3231397888,3231398911,US
+3231399936,3231444071,US
+3231444072,3231444079,CA
+3231444080,3231477759,US
 3231477760,3231478015,CA
 3231478016,3231482879,US
 3231482880,3231483135,BE
@@ -66931,7 +65463,7 @@
 3231673856,3231674111,US
 3231674112,3231674367,CA
 3231674368,3231675391,US
-3231675392,3231675647,BR
+3231675392,3231675903,BR
 3231675904,3231676159,NL
 3231676416,3231677439,NL
 3231677440,3231694847,US
@@ -66999,7 +65531,9 @@
 3231755520,3231755775,US
 3231755776,3231756543,PR
 3231756544,3231757311,GB
-3231757312,3231760895,US
+3231757312,3231759359,US
+3231759360,3231759615,BR
+3231759616,3231760895,US
 3231760896,3231761151,GB
 3231761152,3231761407,NL
 3231761408,3231763711,US
@@ -67022,8 +65556,7 @@
 3231800320,3231801343,CN
 3231801344,3231809535,CA
 3231809536,3231810047,AU
-3231810560,3231825919,US
-3231825920,3231842303,CA
+3231810560,3231842303,US
 3231842304,3231843327,RU
 3231843328,3231844351,NO
 3231844352,3231845375,RU
@@ -67156,7 +65689,6 @@
 3232156160,3232156671,PL
 3232157696,3232159743,DE
 3232159744,3232160767,PL
-3232160768,3232161791,DE
 3232163840,3232165887,RU
 3232167936,3232168959,DE
 3232169216,3232169727,DE
@@ -67207,7 +65739,9 @@
 3232724152,3232724159,US
 3232724160,3232727039,CA
 3232727040,3232759807,US
-3232759808,3232774911,SE
+3232759808,3232765951,SE
+3232765952,3232766207,NO
+3232766208,3232774911,SE
 3232774912,3232775167,IE
 3232775168,3232794879,SE
 3232794880,3232795135,DE
@@ -67228,7 +65762,15 @@
 3233288192,3233292287,CA
 3233292288,3233431551,US
 3233431552,3233447935,CA
-3233447936,3233451519,US
+3233447936,3233449095,US
+3233449096,3233449103,GB
+3233449104,3233449207,US
+3233449208,3233449215,GB
+3233449216,3233449359,US
+3233449360,3233449367,GB
+3233449368,3233450199,US
+3233450200,3233450207,GB
+3233450208,3233451519,US
 3233451520,3233451775,GB
 3233451776,3233453567,US
 3233453568,3233453823,IT
@@ -67328,7 +65870,7 @@
 3233625344,3233625599,US
 3233625600,3233625855,AU
 3233625856,3233626111,NL
-3233626112,3233628671,US
+3233626112,3233628415,US
 3233628672,3233628927,FR
 3233628928,3233629439,CA
 3233629440,3233629695,GB
@@ -67838,7 +66380,9 @@
 3236102144,3236106239,PH
 3236106240,3236140031,US
 3236140032,3236142079,CA
-3236142080,3236142847,US
+3236142080,3236142335,US
+3236142336,3236142463,CA
+3236142464,3236142847,US
 3236142848,3236143005,CA
 3236143006,3236143006,US
 3236143007,3236143103,CA
@@ -67850,7 +66394,9 @@
 3236237568,3236237936,EU
 3236237937,3236238591,US
 3236239360,3236241407,CA
-3236241408,3236302847,US
+3236241408,3236291071,US
+3236291072,3236291327,GB
+3236291328,3236302847,US
 3236306944,3236312063,US
 3236312064,3236312319,MO
 3236312320,3236312575,GH
@@ -67877,7 +66423,9 @@
 3236389376,3236392447,US
 3236392448,3236392703,CL
 3236392704,3236393471,US
-3236393472,3236395519,BR
+3236393472,3236393983,BR
+3236393984,3236395007,CO
+3236395008,3236395519,BR
 3236395520,3236396799,US
 3236396800,3236397055,AU
 3236397056,3236398591,US
@@ -67890,8 +66438,9 @@
 3236406784,3236407551,AU
 3236407552,3236408063,SG
 3236408064,3236408319,US
-3236408320,3236409343,CA
-3236409344,3236411135,US
+3236408320,3236409087,CA
+3236409088,3236409599,BR
+3236409600,3236411135,US
 3236411136,3236411391,AU
 3236411392,3236413695,US
 3236413696,3236413951,AU
@@ -67979,9 +66528,7 @@
 3236828416,3236828671,A1
 3236828672,3236958207,US
 3236958208,3236962303,AU
-3236962304,3237021695,US
-3237021696,3237023743,CA
-3237023744,3237038079,US
+3236962304,3237038079,US
 3237038080,3237038335,CA
 3237038336,3237043967,US
 3237043968,3237044223,CH
@@ -67989,9 +66536,7 @@
 3237046016,3237046271,RO
 3237046272,3237047039,US
 3237047040,3237047295,FR
-3237047296,3237047551,US
-3237047552,3237047807,IE
-3237047808,3237050111,US
+3237047296,3237050111,US
 3237050112,3237050367,GB
 3237050368,3237051903,US
 3237051904,3237052159,TR
@@ -67999,9 +66544,7 @@
 3237052288,3237154815,US
 3237154816,3237155839,ES
 3237155840,3237156863,AU
-3237156864,3237163007,US
-3237163008,3237167103,DM
-3237167104,3237182463,US
+3237156864,3237182463,US
 3237182464,3237183487,NL
 3237183488,3237216255,US
 3237216256,3237281791,JP
@@ -68011,7 +66554,9 @@
 3237285120,3237285631,AU
 3237285632,3237287935,US
 3237287936,3237288191,CA
-3237288192,3237290495,US
+3237288192,3237289471,US
+3237289472,3237289727,BR
+3237289728,3237290495,US
 3237291008,3237291263,NZ
 3237291264,3237294847,US
 3237294848,3237295103,CA
@@ -68042,7 +66587,7 @@
 3237328640,3237328895,CA
 3237328896,3237329151,US
 3237329152,3237329407,NZ
-3237329408,3237330943,US
+3237329664,3237330943,US
 3237330944,3237331199,AU
 3237331456,3237331711,US
 3237331968,3237332223,AU
@@ -68144,7 +66689,8 @@
 3237870976,3237871103,JP
 3237871104,3237871231,PH
 3237871232,3237871359,TW
-3237871360,3237871615,NZ
+3237871360,3237871487,SG
+3237871488,3237871615,MY
 3237871616,3237896191,US
 3237896192,3237900287,PR
 3237900288,3237957631,US
@@ -68192,7 +66738,8 @@
 3238049792,3238050303,RU
 3238050304,3238050815,DE
 3238050816,3238051071,AT
-3238051072,3238051583,RO
+3238051072,3238051327,GB
+3238051328,3238051583,RO
 3238051584,3238051839,GB
 3238051840,3238053375,PL
 3238053376,3238053631,RU
@@ -68239,9 +66786,10 @@
 3238395904,3238461439,HU
 3238461440,3238502399,DE
 3238502400,3238504447,RU
-3238504448,3238526975,DE
+3238504448,3238510591,DE
+3238518784,3238526975,DE
 3238526976,3238527231,RU
-3238527232,3238535167,CH
+3238529024,3238535167,CH
 3238535168,3238536191,SE
 3238536192,3238537215,DK
 3238537216,3238538495,CH
@@ -68251,7 +66799,8 @@
 3238541568,3238541823,PL
 3238541824,3238542591,CH
 3238542592,3238542847,PL
-3238542848,3238545407,CH
+3238542848,3238543103,CH
+3238543360,3238545407,CH
 3238545920,3238546431,RU
 3238546432,3238546943,CH
 3238546944,3238547455,UA
@@ -68269,7 +66818,8 @@
 3238578432,3238578687,UA
 3238578688,3238578943,CH
 3238578944,3238579199,RU
-3238579200,3238589951,CH
+3238579200,3238579455,CH
+3238580224,3238589951,CH
 3238589952,3238590207,LT
 3238590208,3238590719,CH
 3238590976,3238591231,SA
@@ -68292,7 +66842,6 @@
 3238599168,3238599679,HU
 3238599680,3238599935,UA
 3238599936,3238600703,HU
-3238600704,3238604799,DE
 3238608896,3238621183,SE
 3238623232,3238623487,LV
 3238623488,3238623743,PL
@@ -68435,8 +66984,7 @@
 3239116544,3239116799,PL
 3239116800,3239117055,PT
 3239117056,3239117311,SI
-3239117312,3239117823,DE
-3239118336,3239118591,DE
+3239117312,3239117567,DE
 3239118848,3239119871,DE
 3239119872,3239120127,GB
 3239120128,3239120383,CZ
@@ -68473,7 +67021,7 @@
 3239137024,3239137279,LI
 3239138304,3239138559,PL
 3239138560,3239138815,CH
-3239138816,3239141375,DE
+3239139328,3239141375,DE
 3239141376,3239145471,US
 3239145472,3239147519,DE
 3239147520,3239149567,SG
@@ -68484,7 +67032,7 @@
 3239161088,3239161343,BY
 3239161344,3239161599,PL
 3239161600,3239161855,HU
-3239161856,3239162623,DE
+3239162368,3239162623,DE
 3239162624,3239162879,BE
 3239163904,3239164159,PL
 3239164160,3239164671,DE
@@ -68583,8 +67131,8 @@
 3239445760,3239446015,PL
 3239446016,3239446271,RU
 3239446272,3239446527,FR
-3239446528,3239449599,DE
-3239450624,3239451647,DE
+3239446528,3239447551,DE
+3239448576,3239449599,DE
 3239451648,3239451903,PL
 3239451904,3239452159,DE
 3239452160,3239452415,CY
@@ -68626,7 +67174,6 @@
 3239489536,3239496959,DE
 3239496960,3239497215,EU
 3239497216,3239501823,DE
-3239505920,3239506431,DE
 3239506432,3239506687,RU
 3239506688,3239506943,GB
 3239507200,3239507455,GB
@@ -68638,10 +67185,7 @@
 3239508992,3239509247,PL
 3239509248,3239509503,DE
 3239509504,3239509759,CH
-3239509760,3239510015,DE
-3239510016,3239510271,UA
-3239510272,3239511039,DE
-3239512064,3239514111,DE
+3239509760,3239514111,DE
 3239518208,3239521023,DE
 3239521024,3239521279,AP
 3239521280,3239521791,DE
@@ -68670,7 +67214,6 @@
 3239541248,3239541503,UA
 3239541504,3239541759,FR
 3239541760,3239542015,GB
-3239542016,3239542271,PL
 3239542272,3239542527,RU
 3239543808,3239544831,DE
 3239544832,3239545087,GB
@@ -68680,7 +67223,7 @@
 3239546112,3239546367,GB
 3239546368,3239546623,RU
 3239546624,3239546879,NL
-3239546880,3239549951,DE
+3239547904,3239549951,DE
 3239549952,3239550207,TR
 3239550208,3239550463,UA
 3239550464,3239550719,FR
@@ -68705,7 +67248,8 @@
 3239568896,3239574783,DE
 3239575040,3239575295,DE
 3239575296,3239575551,DK
-3239575552,3239578879,DE
+3239575552,3239577599,DE
+3239578624,3239578879,DE
 3239579136,3239579391,PL
 3239579392,3239581695,DE
 3239581696,3239581951,PL
@@ -68755,8 +67299,8 @@
 3239682048,3239682559,PL
 3239682560,3239683071,BG
 3239683072,3239683583,PT
-3239683584,3239684607,PL
-3239684608,3239686143,DE
+3239683584,3239684095,PL
+3239684096,3239686143,DE
 3239686144,3239686655,UA
 3239686656,3239687167,IT
 3239687168,3239687679,UA
@@ -68831,7 +67375,7 @@
 3239773952,3239774207,SA
 3239774464,3239774719,ES
 3239774976,3239775231,PT
-3239776256,3239782399,DE
+3239776256,3239778303,DE
 3239782400,3239782655,AT
 3239782656,3239782911,RU
 3239782912,3239783167,GB
@@ -68884,7 +67428,6 @@
 3239837696,3239837951,PL
 3239838976,3239839231,DE
 3239839232,3239839487,RU
-3239839488,3239839743,DE
 3239839744,3239839999,SK
 3239840000,3239840511,SA
 3239840512,3239840767,DE
@@ -68969,14 +67512,14 @@
 3239902720,3239902975,EE
 3239903232,3239904255,DE
 3239904512,3239904767,GB
-3239905024,3239907327,DE
+3239905536,3239905791,DE
 3239907328,3239907583,UA
 3239907584,3239907839,DE
 3239908096,3239908351,RU
-3239908352,3239911423,DE
+3239908352,3239910399,DE
 3239912960,3239913215,DE
 3239913216,3239913471,LT
-3239913472,3239915519,DE
+3239914240,3239914495,DE
 3239915520,3239915775,PL
 3239915776,3239916031,HU
 3239916032,3239916287,SA
@@ -68987,10 +67530,11 @@
 3239917312,3239917567,BG
 3239919616,3239938815,DE
 3239938816,3239939071,NL
-3239939072,3239949311,DE
+3239939072,3239948543,DE
 3239950848,3239951103,DE
 3239951104,3239951359,AT
-3239951360,3239954431,DE
+3239951360,3239951615,DE
+3239952384,3239954431,DE
 3239954432,3239954687,UA
 3239954688,3239954943,DK
 3239954944,3239955199,ES
@@ -69008,13 +67552,14 @@
 3239967744,3239968255,DE
 3239968512,3239968767,PL
 3239968768,3239969023,NO
-3239969536,3239971839,DE
+3239969536,3239970047,DE
+3239970816,3239971839,DE
 3239972864,3239974911,DE
 3239974912,3239975935,GB
 3239975936,3239976191,RO
 3239976192,3239976447,DE
 3239976448,3239976959,NL
-3239976960,3239978751,DE
+3239977984,3239978751,DE
 3239978752,3239979007,RU
 3239979264,3239979519,GB
 3239979520,3239979775,DE
@@ -69044,13 +67589,15 @@
 3240032256,3240033279,RS
 3240033280,3240033535,GB
 3240033536,3240033791,UA
-3240033792,3240034303,RO
+3240033792,3240034303,GB
 3240034304,3240034559,RU
 3240034560,3240035327,DE
 3240036096,3240037375,DE
 3240037888,3240038143,AT
 3240038400,3240040447,DE
-3240042496,3240083455,DE
+3240046592,3240050687,DE
+3240054784,3240058879,DE
+3240067072,3240083455,DE
 3240083456,3240085503,RU
 3240085504,3240087551,KZ
 3240087552,3240097791,DE
@@ -69065,7 +67612,8 @@
 3240104704,3240104959,NL
 3240104960,3240105215,RU
 3240105216,3240105471,UA
-3240105472,3240107583,GB
+3240105472,3240107007,GB
+3240107520,3240107583,GB
 3240107584,3240107599,EU
 3240107600,3240109055,GB
 3240109056,3240109567,PL
@@ -69083,14 +67631,16 @@
 3240115200,3240116223,RU
 3240116224,3240116479,DE
 3240116480,3240116735,DK
-3240116736,3240117247,RO
+3240116736,3240117247,GB
 3240117248,3240118271,EU
 3240118272,3240120319,ES
 3240120320,3240120831,IR
 3240120832,3240121343,GB
 3240122368,3240123391,GB
 3240125440,3240125695,RO
-3240125696,3240165375,GB
+3240125696,3240125951,GB
+3240126208,3240132607,GB
+3240163328,3240165375,GB
 3240165376,3240165887,PL
 3240165888,3240166399,ES
 3240166400,3240166911,PL
@@ -69260,7 +67810,6 @@
 3240280064,3240280191,DE
 3240280192,3240280319,SE
 3240280320,3240280447,PL
-3240280704,3240280831,RU
 3240280832,3240280959,GB
 3240280960,3240281215,PL
 3240281344,3240281471,PL
@@ -69303,10 +67852,10 @@
 3240312064,3240312319,RU
 3240312320,3240312575,IR
 3240312576,3240312831,RU
-3240312832,3240321023,GB
+3240312832,3240316927,GB
 3240321024,3240321791,RU
 3240321792,3240322047,PL
-3240322048,3240322559,RU
+3240322048,3240322303,RU
 3240322560,3240324095,CZ
 3240324096,3240324351,RO
 3240324352,3240324607,RU
@@ -69347,11 +67896,10 @@
 3240411136,3240419327,RO
 3240419840,3240420095,AT
 3240420608,3240420863,NL
-3240420864,3240421375,GB
+3240420864,3240421119,GB
 3240423424,3240435711,GB
 3240436480,3240436735,GB
 3240436736,3240437759,DE
-3240438784,3240439807,GB
 3240450048,3240454911,GB
 3240454912,3240455167,IN
 3240456192,3240460287,GB
@@ -69382,18 +67930,17 @@
 3240468224,3240468479,CH
 3240468480,3240476671,GB
 3240484864,3240486911,GB
-3240487424,3240487935,GB
 3240487936,3240488191,CH
 3240488192,3240488447,GB
 3240488448,3240488703,BG
 3240488704,3240488959,NL
-3240488960,3240493055,GB
+3240488960,3240491007,GB
 3240493056,3240501247,SE
-3240503296,3240505343,GB
 3240505344,3240505599,PL
 3240505600,3240505855,GB
 3240506368,3240506623,GB
-3240507392,3240529919,GB
+3240507392,3240525823,GB
+3240529408,3240529919,GB
 3240534016,3240536640,GB
 3240536641,3240536641,US
 3240536642,3240550399,GB
@@ -69420,7 +67967,7 @@
 3240588800,3240589055,UA
 3240589056,3240589311,RO
 3240589312,3240593407,SE
-3240593408,3240594175,GB
+3240593408,3240593663,GB
 3240594176,3240594431,DK
 3240594432,3240607743,GB
 3240609792,3240611839,DE
@@ -69428,7 +67975,6 @@
 3240615936,3240622079,GB
 3240622080,3240622591,RU
 3240622592,3240623103,GB
-3240623872,3240624127,GB
 3240624128,3240689663,EE
 3240689664,3240690175,GB
 3240690176,3240690687,TR
@@ -69533,7 +68079,8 @@
 3240752128,3240754175,RO
 3240754176,3240755199,DE
 3240755200,3240787967,IT
-3240788992,3240791551,IT
+3240788992,3240790015,IT
+3240790528,3240791551,IT
 3240791552,3240791807,RU
 3240791808,3240792063,ES
 3240792064,3240792319,GB
@@ -69576,7 +68123,7 @@
 3240827392,3240827647,BG
 3240827648,3240827903,CH
 3240828160,3240828415,DE
-3240828416,3240837119,IT
+3240828928,3240837119,IT
 3240839424,3240839679,IT
 3240840192,3240840447,IT
 3240840448,3240840703,PL
@@ -69626,7 +68173,9 @@
 3240886272,3241017343,SE
 3241017344,3241017855,AT
 3241017856,3241018111,RU
-3241018112,3241029119,AT
+3241018112,3241018367,FR
+3241018368,3241022463,AT
+3241027584,3241029119,AT
 3241029120,3241029375,UA
 3241029376,3241029631,PL
 3241029632,3241031679,AT
@@ -69676,9 +68225,8 @@
 3241071616,3241071871,PL
 3241071872,3241072127,RU
 3241072384,3241072639,DE
-3241073664,3241073919,AT
 3241073920,3241074175,GB
-3241074432,3241076735,AT
+3241074688,3241076735,AT
 3241077248,3241077759,AT
 3241077760,3241078015,LV
 3241078016,3241078271,PL
@@ -69688,7 +68236,8 @@
 3241082880,3241083135,FR
 3241083136,3241084927,CH
 3241084928,3241085183,AP
-3241085184,3241100287,CH
+3241085184,3241091071,CH
+3241099264,3241100287,CH
 3241101056,3241101311,DK
 3241101312,3241101567,RO
 3241101568,3241101823,DE
@@ -69753,15 +68302,15 @@
 3241148416,3241416767,FR
 3241416768,3241416831,US
 3241416832,3241476095,FR
-3241476608,3241477375,BE
+3241476864,3241477375,BE
 3241477632,3241477887,GB
 3241478144,3241481727,BE
 3241481728,3241481983,PT
 3241481984,3241482239,DE
 3241482240,3241484799,SE
 3241484800,3241485055,BE
-3241485312,3241486591,BE
-3241486592,3241487615,SE
+3241485312,3241486335,BE
+3241486336,3241487615,SE
 3241487616,3241496575,BE
 3241496576,3241496831,AT
 3241497344,3241497599,UA
@@ -69782,18 +68331,21 @@
 3241503488,3241508095,BE
 3241508096,3241508351,NL
 3241508352,3241508607,BE
-3241508864,3241541375,BE
+3241508864,3241540607,BE
+3241540864,3241541119,BE
 3241541376,3241541631,PL
-3241541632,3241699327,FR
-3241699584,3241699839,FR
+3241541632,3241689087,FR
+3241693184,3241699327,FR
 3241699840,3241700095,SE
-3241700096,3241723903,FR
+3241700352,3241722879,FR
 3241724160,3241724415,FR
 3241724416,3241724671,RU
 3241724672,3241724927,FR
-3241725952,3241763071,FR
+3241725952,3241742335,FR
+3241743360,3241743615,DE
+3241744128,3241763071,FR
 3241763072,3241763327,DE
-3241763328,3241803775,FR
+3241764864,3241803775,FR
 3241803776,3241803823,CY
 3241803824,3241803831,EU
 3241803832,3241803839,GB
@@ -69864,7 +68416,7 @@
 3243376640,3243442175,GB
 3243442176,3243507711,AT
 3243507712,3243507967,GB
-3243509248,3243509759,CZ
+3243509504,3243509759,CZ
 3243509760,3243510015,RU
 3243510016,3243510271,NL
 3243510272,3243510527,CZ
@@ -69932,7 +68484,6 @@
 3243571456,3243571711,CZ
 3243571968,3243572223,GR
 3243572224,3243572479,CZ
-3243572736,3243572991,CZ
 3243572992,3243573247,RU
 3243573248,3243704319,CZ
 3243704320,3243769855,SK
@@ -69992,7 +68543,7 @@
 3244153856,3244154879,NO
 3244154880,3244155903,GB
 3244155904,3244156927,UA
-3244156928,3244158975,RU
+3244157952,3244158975,RU
 3244158976,3244159999,DE
 3244160000,3244161023,RU
 3244161024,3244163071,NO
@@ -70019,7 +68570,6 @@
 3244820736,3244820991,DE
 3244820992,3244821247,SI
 3244821248,3244821503,RU
-3244821504,3244821759,UA
 3244821760,3244822015,TR
 3244822016,3244822271,RU
 3244822272,3244822527,GB
@@ -70182,7 +68732,8 @@
 3244866560,3244866815,FI
 3244866816,3244867071,UA
 3244867072,3244867583,RU
-3244867584,3244868095,NL
+3244867584,3244867839,NL
+3244867840,3244868095,BE
 3244868096,3244868351,DE
 3244868352,3244868607,RU
 3244868608,3244868863,FI
@@ -70477,7 +69028,6 @@
 3244953600,3244954623,DE
 3244955648,3244956671,UA
 3244956672,3244957695,LT
-3244957696,3244958719,EU
 3244958720,3244959743,FR
 3244959744,3244960767,RU
 3244960768,3244961791,RO
@@ -70613,7 +69163,7 @@
 3245106688,3245107711,UA
 3245107712,3245108735,CZ
 3245108736,3245109247,FR
-3245109248,3245112319,UA
+3245110272,3245112319,UA
 3245112320,3245113343,PL
 3245113344,3245113855,UA
 3245113856,3245114367,RU
@@ -70667,7 +69217,6 @@
 3245135872,3245136127,FR
 3245136128,3245136383,DE
 3245136384,3245136639,GB
-3245136640,3245136895,RU
 3245136896,3245137151,PL
 3245137152,3245137407,GB
 3245137408,3245137663,DE
@@ -70713,7 +69262,6 @@
 3245169152,3245169407,IT
 3245169408,3245169663,PL
 3245169920,3245170175,PT
-3245170176,3245170431,GB
 3245170432,3245170687,CH
 3245170688,3245171711,DE
 3245172736,3245173759,IT
@@ -70970,10 +69518,16 @@
 3246260224,3246325759,PT
 3246325760,3246351615,EU
 3246351616,3246352639,ES
-3246352640,3246378751,EU
+3246352640,3246370815,EU
+3246370816,3246371073,ES
+3246371074,3246371074,PT
+3246371075,3246374911,ES
+3246374912,3246378751,EU
 3246378752,3246379007,ES
 3246379008,3246381055,GB
-3246381056,3246391295,EU
+3246381056,3246387199,EU
+3246387200,3246388223,GB
+3246388224,3246391295,EU
 3246391296,3246547199,GB
 3246547200,3246547455,EU
 3246547456,3246613503,GB
@@ -70988,7 +69542,7 @@
 3246828068,3246915583,CH
 3246915584,3247046655,PT
 3247046656,3247046911,AT
-3247046912,3247048191,SI
+3247046912,3247047679,SI
 3247048192,3247048703,NO
 3247048704,3247048959,EE
 3247048960,3247049215,SI
@@ -71094,18 +69648,18 @@
 3247300608,3247308799,NL
 3247308800,3247309055,BG
 3247309056,3247309567,FI
-3247309824,3247313663,FI
+3247309824,3247313407,FI
 3247313664,3247313919,AM
-3247313920,3247316479,FI
-3247316480,3247316991,RU
+3247314688,3247315967,FI
+3247316480,3247316735,IR
+3247316736,3247316991,RU
 3247321600,3247322111,FI
 3247322368,3247322623,DE
-3247322624,3247323135,FI
+3247322880,3247323135,FI
 3247323136,3247323647,RU
-3247324160,3247324415,FI
 3247324416,3247324671,SE
 3247324672,3247324927,CH
-3247324928,3247333631,FI
+3247325184,3247333631,FI
 3247333632,3247333887,DE
 3247333888,3247334399,FI
 3247334400,3247334655,NO
@@ -71125,7 +69679,6 @@
 3247341312,3247341567,DE
 3247343616,3247345663,FI
 3247345920,3247346175,HU
-3247346432,3247346943,FI
 3247346944,3247347199,SI
 3247347200,3247347455,FI
 3247347456,3247347711,IL
@@ -71134,7 +69687,8 @@
 3247349248,3247349503,FR
 3247349504,3247349759,UA
 3247349760,3247353855,SE
-3247353856,3247362047,FI
+3247353856,3247357951,FI
+3247361024,3247361279,FI
 3247362048,3247362303,RO
 3247362304,3247362559,HU
 3247362560,3247362815,PL
@@ -71168,7 +69722,7 @@
 3247394048,3247394303,PL
 3247394560,3247397887,FI
 3247397888,3247398143,RU
-3247398144,3247399167,FI
+3247398144,3247398911,FI
 3247399424,3247399679,RU
 3247399680,3247404799,FI
 3247404800,3247405055,RU
@@ -71178,7 +69732,7 @@
 3247406080,3247431679,FI
 3247431936,3247432191,FI
 3247432192,3247432447,TR
-3247432448,3247437823,FI
+3247432704,3247437823,FI
 3247438080,3247438335,IT
 3247438848,3247439871,FI
 3247439872,3247702015,ES
@@ -71191,7 +69745,6 @@
 3247713280,3247713535,RU
 3247713536,3247713791,BE
 3247713792,3247714047,SK
-3247714304,3247716351,CH
 3247726592,3247742975,ES
 3247742976,3247751167,DE
 3247751168,3247769599,ES
@@ -71334,7 +69887,6 @@
 3248541184,3248541695,SE
 3248545792,3248546815,UA
 3248546816,3248547839,RU
-3248547840,3248548351,NO
 3248549632,3248549887,SE
 3248551936,3248553215,NO
 3248553728,3248553983,RU
@@ -71425,7 +69977,7 @@
 3248816128,3248881663,CZ
 3248881664,3249012735,FI
 3249012736,3249012991,DE
-3249012992,3249014271,LU
+3249012992,3249013503,LU
 3249014272,3249014783,DE
 3249014784,3249025023,LU
 3249025536,3249025791,FR
@@ -71553,28 +70105,27 @@
 3249538048,3249541119,NL
 3249545216,3249551359,NL
 3249551360,3249552639,GB
-3249552640,3249553407,NL
+3249552640,3249552895,NL
+3249553152,3249553407,NL
 3249561600,3249565695,NL
 3249569792,3249574143,NL
 3249574144,3249574399,RU
-3249574400,3249574655,GB
+3249574400,3249574655,SE
 3249574656,3249574911,UA
 3249574912,3249590527,NL
 3249590528,3249590783,FR
-3249590784,3249591295,NL
-3249591808,3249600255,NL
+3249592320,3249600255,NL
 3249600256,3249600511,AT
 3249600512,3249601535,UA
 3249601536,3249601791,RU
 3249601792,3249668095,NL
 3249668096,3249676287,IE
 3249676288,3249676543,GB
-3249676544,3249676799,IE
 3249676800,3249677055,UA
 3249677056,3249677311,SE
-3249677312,3249678847,IE
+3249678336,3249678847,IE
 3249679104,3249679359,CH
-3249679360,3249682943,IE
+3249679360,3249682431,IE
 3249683456,3249684479,SE
 3249684480,3249696767,IE
 3249697280,3249697535,IE
@@ -71630,7 +70181,6 @@
 3249723392,3249723647,IT
 3249723648,3249723903,GB
 3249724160,3249724415,LU
-3249724416,3249724671,IL
 3249724672,3249724927,RU
 3249724928,3249725183,BG
 3249725184,3249725439,GB
@@ -71678,8 +70228,8 @@
 3249863424,3249863679,SE
 3249863680,3249863935,ES
 3249863936,3249865471,SE
-3249865472,3249866751,GB
-3249866752,3249868543,SE
+3249865472,3249865727,GB
+3249865728,3249868543,SE
 3249868544,3249868799,DE
 3249868800,3249869823,NL
 3249869824,3249871103,SE
@@ -71688,9 +70238,7 @@
 3249871616,3249871871,NO
 3249871872,3249872383,SE
 3249872384,3249872639,GB
-3249872640,3249910783,SE
-3249910784,3249911807,GB
-3249911808,3249926143,SE
+3249872640,3249926143,SE
 3249926144,3249926399,AU
 3249926400,3249926655,SE
 3249926656,3249926911,BE
@@ -71699,7 +70247,9 @@
 3249929984,3249932287,SE
 3249932288,3249934335,US
 3249934336,3249934847,IT
-3249934848,3249960447,SE
+3249934848,3249935871,SE
+3249935872,3249936383,DE
+3249936384,3249960447,SE
 3249960448,3249960959,DE
 3249960960,3249961215,CA
 3249961216,3249961471,SE
@@ -71740,7 +70290,13 @@
 3250010368,3250010879,CH
 3250010880,3250012159,SE
 3250012160,3250013183,DE
-3250013184,3250020863,SE
+3250013184,3250014207,SE
+3250014208,3250014719,DE
+3250014720,3250015231,SE
+3250015232,3250015743,FI
+3250015744,3250017791,SE
+3250017792,3250018303,DE
+3250018304,3250020863,SE
 3250020864,3250021375,IT
 3250021376,3250022399,FR
 3250022400,3250023423,SE
@@ -71758,7 +70314,9 @@
 3250035456,3250035711,US
 3250035712,3250038271,SE
 3250038272,3250039295,ES
-3250039296,3250042623,SE
+3250039296,3250039807,SE
+3250039808,3250040319,GB
+3250040320,3250042623,SE
 3250042624,3250043135,FR
 3250043136,3250061311,SE
 3250061312,3250192383,FI
@@ -71794,7 +70352,7 @@
 3250246656,3250257663,AT
 3250257664,3250257919,PL
 3250257920,3250258175,EU
-3250258176,3250271231,AT
+3250258432,3250271231,AT
 3250271232,3250271743,PL
 3250271744,3250271999,LB
 3250272000,3250272255,GB
@@ -71814,9 +70372,8 @@
 3250324480,3250324991,GB
 3250324992,3250325247,AE
 3250325248,3250325503,MA
-3250325504,3250326527,OM
 3250326528,3250327039,BH
-3250327040,3250327551,SA
+3250327040,3250327295,SA
 3250331648,3250335743,MT
 3250335744,3250339839,KW
 3250339840,3250348031,JO
@@ -71831,7 +70388,6 @@
 3250357904,3250357919,FR
 3250357920,3250357927,PL
 3250357928,3250357959,CY
-3250357984,3250357999,GB
 3250358016,3250358527,LB
 3250358528,3250358783,HU
 3250359296,3250359807,HU
@@ -71843,8 +70399,7 @@
 3250372608,3250373631,HU
 3250373632,3250374143,DE
 3250374144,3250374655,PL
-3250374656,3250374911,SA
-3250374912,3250375679,SE
+3250374656,3250375679,SE
 3250375680,3250376703,GB
 3250376704,3250377983,AT
 3250377984,3250378239,AP
@@ -71971,7 +70526,6 @@
 3250748416,3250749439,UA
 3250749440,3250749695,GH
 3250749696,3250749951,EU
-3250750208,3250750463,RO
 3250750464,3250750537,FR
 3250750538,3250750541,EU
 3250750542,3250751487,FR
@@ -72071,7 +70625,6 @@
 3251147264,3251147519,PL
 3251147520,3251147775,NL
 3251147776,3251148031,SE
-3251148032,3251148287,RU
 3251148288,3251148543,EU
 3251148544,3251148799,UA
 3251149056,3251149311,NL
@@ -72097,7 +70650,7 @@
 3251155456,3251155711,NL
 3251155712,3251155967,UA
 3251155968,3251156223,TR
-3251156224,3251156735,FR
+3251156480,3251156735,FR
 3251156736,3251156991,UA
 3251156992,3251157247,FR
 3251157248,3251157503,BE
@@ -72176,7 +70729,6 @@
 3251186432,3251186687,SE
 3251186688,3251186943,RO
 3251186944,3251187199,SI
-3251187200,3251187455,GR
 3251187456,3251187711,GB
 3251187712,3251188735,NL
 3251188736,3251189759,DE
@@ -72316,14 +70868,13 @@
 3251290112,3251302399,GB
 3251302400,3251306239,LI
 3251306240,3251306495,EU
-3251306496,3251306751,AT
-3251306752,3251307007,MK
+3251306496,3251307007,AT
 3251307520,3251307775,MK
 3251307776,3251308031,GB
 3251308032,3251308543,RS
 3251311104,3251311615,RS
 3251311616,3251312127,GB
-3251312384,3251312639,CH
+3251312384,3251312639,RS
 3251313152,3251313663,RS
 3251314688,3251315711,FR
 3251315712,3251317759,RU
@@ -72498,7 +71049,9 @@
 3252415488,3252415743,US
 3252415744,3252420607,FR
 3252420608,3252424703,NO
-3252424704,3252428799,FR
+3252424704,3252428321,FR
+3252428322,3252428322,AO
+3252428323,3252428799,FR
 3252428800,3252429823,NO
 3252429824,3252448511,FR
 3252448512,3252448767,NO
@@ -72546,7 +71099,6 @@
 3252518656,3252518911,DE
 3252518912,3252527103,NL
 3252527104,3252535295,BE
-3252540416,3252541951,NL
 3252541952,3252542207,CI
 3252542208,3252542719,BE
 3252543488,3252551679,BE
@@ -72558,11 +71110,12 @@
 3252566016,3252566271,DE
 3252566272,3252566527,RO
 3252566528,3252566783,RU
-3252566784,3252567295,CH
+3252566784,3252567039,CH
 3252567296,3252567551,GB
 3252567552,3252567807,RU
 3252567808,3252568063,RO
-3252568064,3252579327,CH
+3252568064,3252576255,CH
+3252578816,3252579327,CH
 3252579328,3252579583,FR
 3252579584,3252579839,RU
 3252579840,3252580095,SE
@@ -72664,7 +71217,7 @@
 3252944896,3252945151,AT
 3252945152,3252945407,GB
 3252945408,3252945663,UA
-3252945664,3252977663,AT
+3252945920,3252977663,AT
 3252980992,3252981247,GB
 3252981248,3252981503,RU
 3252981504,3252981759,SE
@@ -72682,7 +71235,7 @@
 3252985344,3252985855,RU
 3252985856,3252989183,AT
 3252989440,3252989695,PL
-3252989696,3253004799,AT
+3252989952,3253004799,AT
 3253004800,3253005055,CZ
 3253005056,3253006335,AT
 3253006336,3253010431,DE
@@ -72692,7 +71245,9 @@
 3253270528,3253271551,BY
 3253271552,3253338111,RU
 3253338112,3253338367,PL
-3253338368,3253380863,SE
+3253338368,3253380351,SE
+3253380352,3253380607,GB
+3253380608,3253380863,SE
 3253380864,3253381119,IT
 3253381120,3253383935,SE
 3253383936,3253384191,NO
@@ -72700,9 +71255,12 @@
 3253388288,3253388799,FR
 3253388800,3253389055,SE
 3253389056,3253389823,FR
-3253389824,3253395455,SE
+3253389824,3253395199,SE
+3253395200,3253395455,GB
 3253395456,3253395967,IT
-3253395968,3253398271,SE
+3253395968,3253397503,SE
+3253397504,3253397759,GB
+3253397760,3253398271,SE
 3253398272,3253398783,FR
 3253398784,3253399039,SE
 3253399040,3253399295,FR
@@ -72726,7 +71284,9 @@
 3253412352,3253412607,US
 3253412608,3253416447,SE
 3253416448,3253416703,GB
-3253416704,3253428223,SE
+3253416704,3253419519,SE
+3253419520,3253419775,GB
+3253419776,3253428223,SE
 3253428224,3253428479,DE
 3253428480,3253429247,SE
 3253429248,3253429759,JP
@@ -72790,7 +71350,6 @@
 3253627904,3253628927,UA
 3253628928,3253629951,GR
 3253629952,3253630975,UA
-3253630976,3253631999,RU
 3253632000,3253633023,DE
 3253633024,3253635071,RU
 3253635072,3253636095,IT
@@ -72906,7 +71465,9 @@
 3253737848,3253737855,HU
 3253737856,3253738559,GB
 3253738560,3253738567,CZ
-3253738568,3253738575,BE
+3253738568,3253738569,BE
+3253738570,3253738570,EU
+3253738571,3253738575,BE
 3253738576,3253739263,GB
 3253739264,3253739519,FR
 3253739520,3253741055,GB
@@ -72941,7 +71502,14 @@
 3253765280,3253765295,NL
 3253765296,3253765311,BE
 3253765312,3253765375,TR
-3253765376,3253796863,GB
+3253765376,3253767615,GB
+3253767616,3253767675,IE
+3253767676,3253767679,DE
+3253767680,3253767711,GB
+3253767712,3253767743,DE
+3253767744,3253771199,GB
+3253771200,3253771263,IE
+3253771264,3253796863,GB
 3253796864,3253862399,SE
 3253862400,3253862655,GB
 3253862656,3253882879,FR
@@ -72989,7 +71557,7 @@
 3253901824,3253902079,SI
 3253902080,3253902335,DK
 3253902336,3253904383,UA
-3253904384,3253904895,GB
+3253904384,3253904895,ES
 3253904896,3253905151,UA
 3253905152,3253905407,RU
 3253905408,3253905919,PL
@@ -73047,11 +71615,18 @@
 3254079744,3254079999,HU
 3254080000,3254124543,BE
 3254124544,3254255615,CH
-3254255616,3254256127,FR
-3254256128,3254256383,GP
-3254256384,3254260991,FR
+3254255616,3254256127,RE
+3254256128,3254256639,GP
+3254256640,3254257151,YT
+3254257152,3254259455,FR
+3254259456,3254259967,YT
+3254259968,3254260223,GF
+3254260224,3254260479,MQ
+3254260480,3254260991,FR
 3254260992,3254262015,YT
-3254262016,3254266367,FR
+3254262016,3254262527,FR
+3254262528,3254263039,YT
+3254263040,3254266367,FR
 3254266368,3254266623,RE
 3254266624,3254277119,FR
 3254277120,3254278143,YT
@@ -73085,7 +71660,9 @@
 3254495488,3254495743,DZ
 3254495744,3254508799,FR
 3254508800,3254508831,MQ
-3254508832,3254521855,FR
+3254508832,3254509412,FR
+3254509413,3254509413,GQ
+3254509414,3254521855,FR
 3254521856,3254522111,GB
 3254522112,3254608895,FR
 3254608896,3254609151,RE
@@ -73100,7 +71677,8 @@
 3254611456,3254611967,YT
 3254611968,3254612991,FR
 3254612992,3254613247,RE
-3254613248,3254615551,FR
+3254613248,3254615039,FR
+3254615040,3254615551,RE
 3254615552,3254616063,YT
 3254616064,3254648831,FR
 3254648832,3254649855,AL
@@ -73112,7 +71690,7 @@
 3254656512,3254656767,DE
 3254656768,3254657023,GB
 3254657024,3254661119,ES
-3254661120,3254665215,RO
+3254661120,3254665215,GB
 3254665216,3254681599,EU
 3254681600,3254697983,DE
 3254697984,3254698495,SE
@@ -73168,7 +71746,9 @@
 3254788352,3254789119,ES
 3254789120,3254789375,FR
 3254789376,3254789631,BE
-3254789632,3254790655,EU
+3254789632,3254789889,EU
+3254789890,3254789890,TK
+3254789891,3254790655,EU
 3254790656,3254790911,LU
 3254790912,3254791423,BE
 3254791424,3254791679,SK
@@ -73275,7 +71855,6 @@
 3254837248,3254837503,HR
 3254837504,3254837759,RU
 3254837760,3254838015,IE
-3254838016,3254838271,GE
 3254838528,3254838783,CH
 3254838784,3254839039,AT
 3254839296,3254839551,DE
@@ -73361,20 +71940,25 @@
 3254904832,3254907903,RU
 3254908160,3254908415,CH
 3254908416,3254908671,PL
-3254908672,3254908927,MT
+3254908672,3254908927,SE
 3254908928,3254909951,RU
 3254909952,3254910719,PL
 3254910720,3254910975,HR
-3254910976,3255120127,FR
-3255120384,3255120639,FR
+3254910976,3254962380,FR
+3254962381,3254962381,NL
+3254962382,3254962421,FR
+3254962422,3254962422,NL
+3254962423,3255119871,FR
 3255120640,3255120895,DE
-3255120896,3255123711,FR
+3255120896,3255121919,FR
+3255123200,3255123711,FR
 3255123712,3255123967,DE
-3255123968,3255126527,FR
+3255123968,3255124991,FR
+3255126016,3255126527,FR
 3255126528,3255127551,EU
 3255127808,3255128575,FR
 3255129856,3255130111,HR
-3255130112,3255171071,FR
+3255130112,3255169279,FR
 3255172352,3255172607,DE
 3255172608,3255173119,FR
 3255173120,3255173631,SH
@@ -73610,7 +72194,6 @@
 3255492608,3255496703,GB
 3255496704,3255498751,EU
 3255498752,3255500799,FR
-3255500800,3255504895,CH
 3255504896,3255505151,RU
 3255505152,3255505663,GB
 3255505920,3255506431,RU
@@ -73623,7 +72206,8 @@
 3255508224,3255508479,RU
 3255508480,3255521023,CH
 3255521024,3255521279,EU
-3255521280,3255544319,CH
+3255521280,3255529471,CH
+3255533568,3255544319,CH
 3255544320,3255544575,DE
 3255544576,3255544831,AT
 3255544832,3255558143,CH
@@ -73631,7 +72215,7 @@
 3255558656,3255563263,CH
 3255563776,3255564031,CH
 3255564032,3255564287,RU
-3255564288,3255565311,CH
+3255564288,3255564543,CH
 3255565312,3255565955,DE
 3255565956,3255565956,EU
 3255565957,3255566079,DE
@@ -73645,7 +72229,7 @@
 3255623680,3255631871,BG
 3255631872,3255660287,NL
 3255660288,3255660543,GR
-3255660544,3255666431,NL
+3255660544,3255666175,NL
 3255666432,3255666687,DE
 3255666688,3255697407,NL
 3255697408,3255699711,SE
@@ -73672,7 +72256,7 @@
 3255792640,3255793663,RU
 3255793664,3255794943,PL
 3255794944,3255795711,RU
-3255795712,3255799039,DE
+3255795712,3255798783,DE
 3255799040,3255799295,SE
 3255799296,3255800575,DE
 3255800576,3255800831,UA
@@ -73824,7 +72408,6 @@
 3256745984,3256778751,ES
 3256778752,3256786943,CY
 3256786944,3256787199,NL
-3256787200,3256787455,RO
 3256787456,3256787711,DE
 3256787712,3256787967,UA
 3256787968,3256788223,PL
@@ -73883,13 +72466,15 @@
 3256876032,3256876287,PL
 3256876288,3256876543,RU
 3256876544,3256876799,CH
-3256877056,3256898559,GB
+3256877056,3256897535,GB
+3256898048,3256898303,GB
 3256898560,3256899071,TR
 3256899072,3256899583,RU
-3256899584,3256915455,GB
+3256905216,3256905471,GB
+3256909824,3256915455,GB
 3256915456,3256915711,RS
 3256915712,3256915967,SE
-3256915968,3256945663,GB
+3256915968,3256944639,GB
 3256945664,3256945919,SI
 3256945920,3256946175,GB
 3256946176,3256946431,RO
@@ -73941,9 +72526,11 @@
 3257024512,3257032703,AU
 3257032704,3257057279,GB
 3257058816,3257059071,PL
-3257059072,3257092607,GB
+3257059328,3257065471,GB
+3257073664,3257092351,GB
 3257092608,3257092863,RO
-3257092864,3257139199,GB
+3257092864,3257093119,GB
+3257093632,3257139199,GB
 3257139200,3257139455,DK
 3257139456,3257143295,GB
 3257143296,3257143807,RU
@@ -73953,7 +72540,6 @@
 3257144576,3257144831,GB
 3257144832,3257145087,FR
 3257145088,3257145343,GB
-3257146112,3257146367,GB
 3257147392,3257180159,GB
 3257180160,3257180415,TR
 3257180416,3257180671,RU
@@ -73963,22 +72549,24 @@
 3257181440,3257181695,PL
 3257181696,3257181951,FR
 3257182208,3257182463,PL
-3257182464,3257186303,GB
-3257188352,3257196543,GB
+3257184256,3257186303,GB
+3257192448,3257196543,GB
 3257196544,3257200639,LU
 3257200640,3257204735,GB
-3257204736,3257268223,AT
+3257204736,3257225215,AT
+3257226240,3257227263,DE
+3257229312,3257268223,AT
 3257268224,3257268479,UA
 3257268480,3257268735,SE
-3257268736,3257269247,AT
+3257268992,3257269247,AT
 3257269248,3257269503,IT
-3257269504,3257270015,AT
+3257269504,3257269759,AT
 3257270016,3257270271,DE
 3257286656,3257294847,CH
 3257294848,3257303039,HU
 3257303040,3257311231,PT
 3257311232,3257335807,CH
-3257335808,3257357311,DE
+3257335808,3257356799,DE
 3257357312,3257357567,PT
 3257357568,3257357823,SI
 3257357824,3257371903,DE
@@ -73987,9 +72575,9 @@
 3257372672,3257382911,DE
 3257382912,3257383167,NL
 3257383168,3257383679,DE
-3257383936,3257388799,DE
-3257388800,3257389055,FR
-3257389056,3257391615,DE
+3257383936,3257389055,DE
+3257390592,3257390847,DE
+3257391104,3257391615,DE
 3257391616,3257391871,EU
 3257391872,3257401343,DE
 3257401344,3257453567,CH
@@ -74002,17 +72590,15 @@
 3257467392,3257467903,SE
 3257467904,3257468927,IT
 3257469184,3257469439,IT
-3257469440,3257469951,GB
 3257469952,3257470975,PL
 3257470976,3257471999,FI
 3257472000,3257472511,SG
 3257472512,3257475071,FI
-3257476608,3257477119,DE
+3257476864,3257477119,DE
 3257481216,3257481471,GB
 3257481472,3257481727,DE
 3257481728,3257481983,FI
-3257481984,3257482239,FR
-3257482240,3257482751,RO
+3257482240,3257482751,GB
 3257482752,3257483007,NL
 3257483008,3257491455,CH
 3257491456,3257495551,BE
@@ -74032,7 +72618,11 @@
 3257546688,3257546719,DE
 3257546720,3257546751,DK
 3257546752,3257548799,IE
-3257548800,3257556991,GB
+3257548800,3257551623,GB
+3257551624,3257551647,BE
+3257551648,3257551711,GB
+3257551712,3257551719,BE
+3257551720,3257556991,GB
 3257557504,3257558015,LU
 3257558016,3257559039,RO
 3257559552,3257560063,UA
@@ -74097,12 +72687,13 @@
 3257841664,3257841919,IE
 3257841920,3257842943,GB
 3257842944,3257843199,IE
-3257843200,3257844735,GB
-3257844736,3257860095,IE
+3257843200,3257843711,GB
+3257843712,3257860095,IE
 3257860096,3257925631,SE
 3257925632,3257925887,AT
 3257925888,3257926143,SE
-3257926144,3257977855,AT
+3257926144,3257926399,AT
+3257926656,3257977855,AT
 3257977856,3257978111,GB
 3257978112,3257978367,SE
 3257978368,3257978623,BG
@@ -74118,13 +72709,14 @@
 3257981184,3257981439,GB
 3257981440,3257981695,RU
 3257981696,3257981951,PL
-3257981952,3257987327,AT
+3257986048,3257987327,AT
 3257987328,3257987583,CZ
-3257987584,3257988095,AT
-3257989120,3257991167,AT
+3257987840,3257988095,AT
+3257990656,3257990911,AT
 3257991168,3258003967,DE
 3258003968,3258004479,RU
-3258004992,3258021887,DE
+3258004992,3258005503,DE
+3258006528,3258021887,DE
 3258021888,3258022911,RU
 3258022912,3258023167,PL
 3258023168,3258023423,DE
@@ -74138,7 +72730,7 @@
 3258059264,3258059519,RU
 3258059520,3258059775,RO
 3258062848,3258063103,RU
-3258063104,3258063871,CZ
+3258063360,3258063871,CZ
 3258063872,3258064127,AT
 3258064128,3258064383,FR
 3258064384,3258065151,GB
@@ -74168,7 +72760,6 @@
 3258073088,3258074111,CZ
 3258074112,3258074879,DE
 3258074880,3258075135,IL
-3258075136,3258075391,RO
 3258075904,3258076159,PL
 3258076160,3258076415,BG
 3258076416,3258076927,FR
@@ -74199,7 +72790,6 @@
 3258084352,3258084607,GB
 3258084608,3258084863,AT
 3258084864,3258085119,PL
-3258085120,3258085375,LT
 3258085376,3258085631,NL
 3258085632,3258085887,DE
 3258085888,3258086143,UA
@@ -74251,15 +72841,16 @@
 3258103552,3258103807,AE
 3258104320,3258104575,PL
 3258104576,3258104831,DE
-3258105088,3258105599,CZ
+3258105088,3258105343,CZ
 3258105600,3258105855,DE
 3258105856,3258109951,CZ
 3258109952,3258110207,DK
-3258110208,3258111487,CZ
+3258110208,3258110975,CZ
+3258111232,3258111487,CZ
 3258111488,3258111743,PL
 3258111744,3258118399,CZ
 3258118400,3258118655,UA
-3258118656,3258119679,CZ
+3258118656,3258118911,CZ
 3258120192,3258120703,CZ
 3258121216,3258121471,PL
 3258121728,3258121983,UA
@@ -74269,9 +72860,10 @@
 3258230784,3258232831,NO
 3258232832,3258249215,SE
 3258249216,3258253311,NO
-3258253312,3258272767,NL
+3258253312,3258269695,NL
+3258271744,3258272767,NL
 3258272768,3258273791,FR
-3258273792,3258290175,NL
+3258273792,3258288127,NL
 3258294272,3258297343,NL
 3258297344,3258297599,BE
 3258297600,3258298111,NL
@@ -74293,26 +72885,27 @@
 3258343424,3258351615,NO
 3258351616,3258352639,RO
 3258352640,3258353663,RU
-3258353664,3258354687,NO
 3258354688,3258355711,BG
 3258355712,3258356735,NL
 3258356736,3258357759,RU
 3258357760,3258360831,UA
 3258360832,3258361855,SE
 3258361856,3258362879,IL
-3258362880,3258363903,IM
+3258362880,3258362891,IM
+3258362892,3258362892,GB
+3258362893,3258363903,IM
 3258363904,3258364927,RU
 3258364928,3258365951,RS
 3258365952,3258366975,UA
 3258366976,3258367999,PL
 3258368000,3258384383,KW
-3258384384,3258427647,DE
+3258384384,3258426367,DE
 3258427648,3258427903,RO
 3258427904,3258428159,DE
 3258428416,3258449919,DE
 3258449920,3258486783,CH
 3258486784,3258487807,LI
-3258487808,3258503935,CH
+3258488832,3258503935,CH
 3258503936,3258504191,PL
 3258504192,3258504703,CH
 3258504704,3258504959,DE
@@ -74322,7 +72915,8 @@
 3258507008,3258515455,CH
 3258515456,3258580991,FR
 3258580992,3258646527,RU
-3258646528,3258690559,DE
+3258646528,3258689535,DE
+3258689792,3258690047,DE
 3258690560,3258690815,EU
 3258690816,3258691583,DE
 3258691840,3258692351,AT
@@ -74352,9 +72946,10 @@
 3258732544,3258732799,SE
 3258732800,3258733055,CH
 3258733056,3258733311,RO
-3258733312,3258734591,GB
+3258733312,3258734079,GB
 3258735104,3258735359,GB
-3258736640,3258764287,GB
+3258736640,3258762239,GB
+3258763264,3258764287,GB
 3258764288,3258764543,DE
 3258764800,3258765055,BE
 3258765056,3258765311,NL
@@ -74383,19 +72978,21 @@
 3258794496,3258794751,PL
 3258794752,3258795007,RU
 3258795008,3258796031,PL
-3258796032,3258802175,GB
+3258797056,3258802175,GB
 3258802176,3258806271,LU
-3258806272,3258818047,GB
+3258808832,3258809343,GB
+3258812416,3258813439,GB
 3258818048,3258818303,SE
 3258818560,3258843135,GB
 3258843136,3258843391,RU
-3258843648,3258847231,GB
+3258844928,3258847231,GB
 3258848256,3258848767,GB
 3258848768,3258849023,RO
 3258849024,3258849279,DE
 3258849280,3258859519,GB
 3258859520,3258859775,BY
-3258859776,3258900479,GB
+3258859776,3258860031,GB
+3258860288,3258900479,GB
 3258901504,3258902783,GB
 3258903040,3258903295,FR
 3258903296,3258903551,GB
@@ -74511,7 +73108,7 @@
 3259814400,3259814655,AT
 3259814656,3259821055,DE
 3259821824,3259822079,AT
-3259822080,3259823103,DE
+3259822592,3259823103,DE
 3259823104,3259823615,RO
 3259823616,3259823871,NO
 3259823872,3259824127,IE
@@ -74561,11 +73158,10 @@
 3260549120,3260549375,AT
 3260549376,3260549631,CH
 3260549632,3260549887,DE
-3260550144,3260550399,PL
 3260550656,3260551167,RU
 3260551168,3260553983,DE
 3260553984,3260554239,GB
-3260554240,3260555263,SE
+3260554240,3260555263,CH
 3260555264,3260563455,HU
 3260563456,3260571647,GB
 3260571648,3260579839,BE
@@ -74649,7 +73245,7 @@
 3261239239,3261267967,FR
 3261267968,3261280512,DE
 3261280513,3261280513,EU
-3261280514,3261281023,DE
+3261280514,3261280767,DE
 3261281280,3261297663,DE
 3261297664,3261297919,RU
 3261297920,3261298175,PL
@@ -74735,9 +73331,10 @@
 3261798144,3261798399,RU
 3261798400,3261805567,AT
 3261805568,3261806591,DE
-3261806592,3261812735,AT
+3261806592,3261810687,AT
 3261812736,3261812991,RU
-3261812992,3261816575,AT
+3261812992,3261815807,AT
+3261816064,3261816575,AT
 3261816576,3261816831,DE
 3261816832,3261820927,AT
 3261820928,3261821183,RO
@@ -74759,17 +73356,11 @@
 3261857792,3261923327,CZ
 3261923328,3261988863,NL
 3261988864,3261989119,SE
-3261989120,3261989631,FI
-3261990144,3261990399,FI
 3261990400,3261990655,UA
-3261990656,3261990911,FI
-3261992448,3261992703,FI
-3261992960,3261993215,FI
 3261993472,3261993727,RU
-3261993728,3261995263,FI
+3261994752,3261995263,FI
 3261995264,3261995519,DE
 3261995520,3261995775,PL
-3261995776,3261996031,FI
 3261996800,3262005247,FI
 3262005248,3262005759,PL
 3262005760,3262006015,RU
@@ -74784,20 +73375,16 @@
 3262008576,3262008831,PL
 3262008832,3262009087,AT
 3262009088,3262009343,UA
-3262009344,3262013439,FI
+3262010112,3262010367,FI
 3262013440,3262017535,SE
-3262017536,3262018559,FI
 3262018560,3262018815,PL
-3262018816,3262019071,FI
-3262020096,3262020607,FI
-3262020864,3262021119,FI
 3262021120,3262021375,UA
 3262021376,3262021631,PL
 3262021632,3262021887,CH
 3262021888,3262022143,UA
 3262022912,3262023167,DE
 3262023680,3262023935,DK
-3262023936,3262025727,FI
+3262025216,3262025471,FI
 3262027264,3262027519,TR
 3262027520,3262027775,BE
 3262027776,3262028287,RU
@@ -74806,7 +73393,6 @@
 3262028800,3262029823,DE
 3262029824,3262030847,NL
 3262030848,3262031871,FR
-3262031872,3262033919,FI
 3262033920,3262038015,AX
 3262038016,3262038271,FR
 3262038272,3262038527,RU
@@ -74909,11 +73495,14 @@
 3262152704,3262185471,AT
 3262185472,3262200319,DE
 3262200576,3262200831,EU
-3262200832,3262224383,DE
+3262200832,3262201087,DE
+3262201856,3262224383,DE
 3262224896,3262225151,AT
-3262225152,3262227711,DE
+3262226432,3262227455,DE
 3262227712,3262227967,RO
-3262227968,3262229247,DE
+3262227968,3262228223,DE
+3262228480,3262228735,DE
+3262228992,3262229247,DE
 3262229248,3262229503,NL
 3262229504,3262283775,DE
 3262283776,3262284799,RU
@@ -74980,7 +73569,6 @@
 3262446592,3262447103,PL
 3262447104,3262447615,GB
 3262447616,3262460415,PT
-3262460416,3262460543,UA
 3262460544,3262460671,RU
 3262460672,3262460927,AE
 3262460928,3262461055,CY
@@ -75067,9 +73655,7 @@
 3262478308,3262478311,ES
 3262478312,3262478319,DE
 3262478320,3262478323,GB
-3262478324,3262478345,DE
-3262478346,3262478346,PT
-3262478347,3262478389,DE
+3262478324,3262478389,DE
 3262478390,3262478390,ES
 3262478391,3262478404,DE
 3262478405,3262478405,GB
@@ -75092,16 +73678,13 @@
 3262479428,3262479428,FR
 3262479429,3262479654,DE
 3262479655,3262479655,NL
-3262479656,3262479751,DE
-3262479752,3262479752,CH
-3262479753,3262479871,DE
+3262479656,3262479871,DE
 3262479872,3262479881,EU
 3262479882,3262479882,DE
 3262479883,3262480127,EU
 3262480128,3262480282,DE
 3262480283,3262480283,GB
-3262480284,3262480316,DE
-3262480317,3262480317,NL
+3262480284,3262480317,DE
 3262480318,3262480318,IT
 3262480319,3262480383,DE
 3262480384,3262488575,GB
@@ -75111,7 +73694,8 @@
 3262505984,3262506495,PL
 3262506496,3262507007,RO
 3262507008,3262507519,DK
-3262507520,3262508543,RO
+3262507520,3262508031,VG
+3262508032,3262508543,RO
 3262509056,3262509567,PL
 3262509568,3262510079,RO
 3262510080,3262511103,FR
@@ -75129,7 +73713,9 @@
 3262654464,3262654719,DE
 3262654720,3262664703,NL
 3262664704,3262665727,DE
-3262665728,3262665983,EU
+3262665728,3262665736,EU
+3262665737,3262665737,CH
+3262665738,3262665983,EU
 3262665984,3262666751,DE
 3262666752,3262667007,EU
 3262667008,3262670847,DE
@@ -75184,7 +73770,7 @@
 3263085568,3263086591,CH
 3263086592,3263086847,DK
 3263086848,3263087103,NL
-3263087104,3263087871,DE
+3263087360,3263087871,DE
 3263087872,3263088127,SI
 3263088128,3263088383,DE
 3263088384,3263088639,LV
@@ -75200,7 +73786,6 @@
 3263091456,3263091711,NO
 3263091712,3263091967,FI
 3263091968,3263092479,HR
-3263092480,3263092735,ES
 3263092736,3263092991,PL
 3263092992,3263093247,FR
 3263093248,3263093503,CH
@@ -75210,7 +73795,6 @@
 3263094784,3263095039,UA
 3263095040,3263095295,ES
 3263095296,3263095551,EU
-3263095552,3263095807,RO
 3263095808,3263096063,DE
 3263096064,3263096319,PL
 3263096320,3263096575,TR
@@ -75253,7 +73837,9 @@
 3263168512,3263430655,GB
 3263430656,3263436543,SE
 3263436544,3263436799,ES
-3263436800,3263458047,SE
+3263436800,3263446527,SE
+3263446528,3263447039,DE
+3263447040,3263458047,SE
 3263458048,3263458303,DE
 3263458304,3263459583,SE
 3263459584,3263459839,FR
@@ -75265,7 +73851,9 @@
 3263478528,3263478783,ES
 3263478784,3263480831,SE
 3263480832,3263481855,JP
-3263481856,3263496191,SE
+3263481856,3263482879,SE
+3263482880,3263483903,GB
+3263483904,3263496191,SE
 3263496192,3263501519,GB
 3263501520,3263501527,IE
 3263501528,3263503103,GB
@@ -75362,14 +73950,12 @@
 3264307200,3264311295,PL
 3264311808,3264312063,DE
 3264312064,3264312319,EU
-3264312320,3264312575,PL
 3264312576,3264312831,UA
 3264312832,3264313087,DE
 3264313088,3264313343,NL
 3264313344,3264313599,RO
 3264313600,3264313855,PT
 3264313856,3264314623,DE
-3264314624,3264314879,SE
 3264314880,3264315135,GB
 3264315392,3264317439,IE
 3264318464,3264318975,ES
@@ -75380,7 +73966,6 @@
 3264321024,3264321535,DE
 3264321792,3264322047,RS
 3264322048,3264322303,FR
-3264322304,3264322559,RO
 3264322560,3264322815,HU
 3264322816,3264323071,CH
 3264323072,3264323327,RU
@@ -75401,7 +73986,7 @@
 3264334336,3264334847,UA
 3264334848,3264335359,PL
 3264335360,3264335871,SK
-3264335872,3264336383,GB
+3264335872,3264336383,BZ
 3264337408,3264338431,UA
 3264338432,3264338943,DE
 3264338944,3264339455,UA
@@ -75423,10 +74008,14 @@
 3264345088,3264346111,NL
 3264346112,3264347135,SE
 3264347136,3264348159,DE
-3264348160,3264372223,FR
+3264348160,3264356351,FR
+3264356608,3264356863,FR
+3264357632,3264357887,DE
+3264359936,3264360191,FR
+3264360448,3264369151,FR
 3264372224,3264372735,EU
-3264372736,3264375039,FR
-3264375040,3264376063,SE
+3264372736,3264373759,FR
+3264374784,3264376063,SE
 3264376064,3264376319,HR
 3264376320,3264376575,UA
 3264376576,3264376831,CH
@@ -75470,12 +74059,13 @@
 3264430592,3264430847,CH
 3264431104,3264431615,LI
 3264431616,3264431871,CH
-3264432128,3264441343,CH
+3264432128,3264440831,CH
 3264441344,3264441599,PL
-3264442112,3264446463,CH
+3264442368,3264446463,CH
 3264447488,3264447743,CH
 3264447744,3264447999,DE
-3264448000,3264452607,CH
+3264448000,3264448511,CH
+3264449536,3264452607,CH
 3264454656,3264463871,CH
 3264463872,3264466943,LI
 3264466944,3264475391,CH
@@ -75483,8 +74073,12 @@
 3264476672,3264477183,RU
 3264477184,3264477439,PL
 3264477440,3264477695,RU
-3264477696,3264544767,CH
-3264544768,3264561151,HU
+3264477952,3264544767,CH
+3264544768,3264556799,HU
+3264556800,3264557055,BG
+3264557056,3264557823,HU
+3264557824,3264558079,BG
+3264558080,3264561151,HU
 3264561152,3264563199,RU
 3264563200,3264564223,ES
 3264564224,3264565247,IE
@@ -75510,7 +74104,11 @@
 3264606976,3264607231,BE
 3264607232,3264607487,IT
 3264607488,3264610303,DE
-3264610304,3264614911,GB
+3264610304,3264612479,GB
+3264612480,3264612575,FR
+3264612576,3264613027,GB
+3264613028,3264613031,FR
+3264613032,3264614911,GB
 3264614912,3264615167,SE
 3264615168,3264617983,GB
 3264617984,3264618239,US
@@ -75520,7 +74118,7 @@
 3264624640,3264624671,US
 3264624672,3264626687,GB
 3264626688,3264627711,EE
-3264628736,3264630783,UA
+3264628736,3264629759,UA
 3264630784,3264631807,DE
 3264631808,3264632831,RO
 3264632832,3264633855,RU
@@ -75650,19 +74248,16 @@
 3264846208,3264846335,AE
 3264846336,3264846463,GB
 3264846464,3264846591,NO
-3264846592,3264846719,US
 3264846720,3264846847,RU
 3264846848,3264846911,DK
 3264846912,3264847103,CY
 3264847168,3264847199,IE
-3264847200,3264847231,NO
 3264847232,3264847263,CH
 3264847264,3264847295,LI
 3264847296,3264847359,CY
 3264847488,3264847615,RU
 3264847616,3264847679,PL
 3264847680,3264847743,FI
-3264847744,3264847807,BE
 3264847808,3264847871,SE
 3264847872,3264849919,DE
 3264849920,3264850431,GB
@@ -75694,11 +74289,12 @@
 3265015808,3265016063,EU
 3265016064,3265018879,DE
 3265018880,3265019903,HK
-3265036288,3265044991,DE
-3265045504,3265045759,DE
+3265036288,3265044479,DE
+3265044736,3265044991,DE
 3265045760,3265046015,TR
 3265046016,3265048575,DE
-3265050624,3265054719,DE
+3265050624,3265052671,DE
+3265053696,3265054719,DE
 3265055232,3265055743,FR
 3265055744,3265069055,DE
 3265069056,3265134591,FI
@@ -75708,9 +74304,13 @@
 3265138600,3265138607,NL
 3265138608,3265138863,CH
 3265138864,3265138879,SE
-3265138880,3265139999,CH
+3265138880,3265139967,CH
+3265139968,3265139975,BE
+3265139976,3265139999,CH
 3265140000,3265140015,BE
-3265140016,3265141135,CH
+3265140016,3265140119,CH
+3265140120,3265140127,BE
+3265140128,3265141135,CH
 3265141136,3265141151,GB
 3265141152,3265141551,CH
 3265141552,3265141555,IE
@@ -75771,7 +74371,7 @@
 3265596416,3265596927,GB
 3265596928,3265597439,FR
 3265597440,3265599999,RU
-3265600000,3265600511,HU
+3265600000,3265600255,HU
 3265600512,3265601023,GB
 3265601024,3265601535,RU
 3265601536,3265601791,SE
@@ -75779,7 +74379,6 @@
 3265602048,3265602303,NL
 3265602560,3265602815,IT
 3265602816,3265603071,IE
-3265603072,3265603327,DK
 3265603328,3265603583,MD
 3265603584,3265603839,DE
 3265603840,3265604095,PL
@@ -75812,7 +74411,12 @@
 3265724416,3265789951,FR
 3265789952,3265824767,GB
 3265824768,3265825023,US
-3265825024,3265887487,GB
+3265825024,3265867775,GB
+3265868288,3265868543,GB
+3265868800,3265869055,DE
+3265869312,3265869823,GB
+3265871872,3265886207,GB
+3265887232,3265887487,GB
 3265887488,3265887743,PT
 3265887744,3265888255,PL
 3265888256,3265902335,GB
@@ -75820,7 +74424,6 @@
 3265904384,3265904639,RO
 3265904640,3265904895,DE
 3265905152,3265905663,GB
-3265905664,3265905919,IE
 3265905920,3265906175,GB
 3265906176,3265906431,DE
 3265906432,3265906687,CH
@@ -75842,7 +74445,6 @@
 3265911808,3265912063,PL
 3265912064,3265912319,GB
 3265912320,3265912575,DE
-3265912576,3265912831,RO
 3265912832,3265913087,CZ
 3265913088,3265913343,SE
 3265913344,3265914367,PL
@@ -75858,7 +74460,6 @@
 3265917184,3265917439,PL
 3265917696,3265917951,SE
 3265917952,3265918207,GB
-3265918208,3265918463,EU
 3265918464,3265918719,AT
 3265918720,3265918975,RU
 3265918976,3265919231,NL
@@ -75947,19 +74548,21 @@
 3266510848,3266543615,ES
 3266543616,3266576383,IT
 3266576384,3266617279,DE
-3266617312,3266617327,DE
 3266617328,3266617343,GB
-3266617344,3266634383,DE
+3266617344,3266634303,DE
+3266634368,3266634383,DE
 3266634392,3266634399,EE
 3266634400,3266634431,DE
-3266634464,3266634751,DE
-3266635520,3266641919,DE
+3266634496,3266634751,DE
+3266635776,3266641919,DE
 3266641920,3266707455,PL
 3266707456,3266772991,DK
 3266772992,3266781183,IT
 3266781184,3266789375,PL
 3266789376,3266797567,SM
-3266797568,3266805759,GB
+3266797568,3266797823,GB
+3266797824,3266798079,ES
+3266798080,3266805759,GB
 3266805760,3266813951,AT
 3266813952,3266822143,UA
 3266822144,3266830335,FR
@@ -75973,7 +74576,6 @@
 3267040256,3267041279,RO
 3267042304,3267043327,UA
 3267043328,3267044351,GB
-3267044352,3267045375,RU
 3267045376,3267046399,PL
 3267046400,3267047423,NL
 3267047424,3267048447,UA
@@ -76004,7 +74606,7 @@
 3267073024,3267075071,UA
 3267075072,3267076095,CH
 3267076096,3267078143,DE
-3267078144,3267079167,PL
+3267078144,3267079167,FR
 3267079168,3267080191,IT
 3267080192,3267081215,AT
 3267081216,3267082239,PL
@@ -76068,9 +74670,7 @@
 3267631104,3267631615,GB
 3267631616,3267634175,EU
 3267634176,3267635199,GB
-3267635200,3267636863,EU
-3267636864,3267636991,ZA
-3267636992,3267648319,EU
+3267635200,3267648319,EU
 3267648320,3267648335,GB
 3267648336,3267650319,EU
 3267650320,3267650335,AT
@@ -76080,9 +74680,7 @@
 3267657696,3267657703,RO
 3267657704,3267657711,EU
 3267657712,3267657727,RO
-3267657728,3267660607,EU
-3267660608,3267660671,ES
-3267660672,3267661903,EU
+3267657728,3267661903,EU
 3267661904,3267661967,ES
 3267661968,3267662895,EU
 3267662896,3267662911,IE
@@ -76196,7 +74794,9 @@
 3268236192,3268236207,GB
 3268236208,3268236543,EU
 3268236544,3268236799,GB
-3268236800,3268238335,EU
+3268236800,3268237823,EU
+3268237824,3268237839,GB
+3268237840,3268238335,EU
 3268238336,3268238359,GB
 3268238360,3268238367,EU
 3268238368,3268238399,GB
@@ -76204,10 +74804,10 @@
 3268238472,3268238543,GB
 3268238544,3268238551,EU
 3268238552,3268238591,GB
-3268238592,3268238607,EU
-3268238608,3268238623,GB
-3268238624,3268238631,EU
-3268238632,3268238847,GB
+3268238592,3268238631,EU
+3268238632,3268238783,GB
+3268238784,3268238815,EU
+3268238816,3268238847,GB
 3268238848,3268239583,EU
 3268239584,3268240127,GB
 3268240128,3268240159,EU
@@ -76483,7 +75083,7 @@
 3269285088,3269285135,DE
 3269285136,3269285151,GB
 3269285152,3269285215,DE
-3269285216,3269285311,EU
+3269285216,3269285311,FR
 3269285312,3269285327,DE
 3269285328,3269285335,EU
 3269285336,3269285343,FR
@@ -76668,7 +75268,8 @@
 3270680576,3270688767,FR
 3270688768,3270836223,IT
 3270836224,3270901759,DE
-3270901760,3270905855,IT
+3270901760,3270903807,IT
+3270903808,3270905855,SE
 3270905856,3270906111,EU
 3270906112,3270909951,IT
 3270909952,3270911743,DE
@@ -76809,7 +75410,7 @@
 3271745024,3271745535,PL
 3271745536,3271746047,GB
 3271746048,3271746559,RU
-3271746560,3271747071,CH
+3271746560,3271747071,US
 3271747072,3271747583,KZ
 3271747584,3271748095,RU
 3271748096,3271748607,GR
@@ -76833,7 +75434,7 @@
 3271794688,3271795711,IT
 3271795712,3271796735,NL
 3271796736,3271797759,SK
-3271797760,3271798783,GB
+3271797760,3271798783,SA
 3271798784,3271799807,NL
 3271799808,3271800831,RU
 3271800832,3271801855,GB
@@ -76871,7 +75472,7 @@
 3271916032,3271916543,GB
 3271916544,3271917311,UA
 3271917312,3271925759,RU
-3271925760,3271926015,DE
+3271925760,3271926015,DK
 3271926016,3271926271,MD
 3271926272,3271926527,RU
 3271926528,3271926783,NL
@@ -77176,7 +75777,7 @@
 3272417280,3272418303,FR
 3272418304,3272418559,GB
 3272418560,3272418687,FR
-3272418688,3272419327,PL
+3272418816,3272419327,PL
 3272419328,3272420351,DE
 3272420864,3272420991,PL
 3272420992,3272421119,DK
@@ -77211,7 +75812,6 @@
 3272479744,3272480255,SE
 3272480256,3272480511,FR
 3272480512,3272480767,CH
-3272480768,3272481023,DE
 3272481024,3272481279,SE
 3272481792,3272482047,IT
 3272482048,3272482303,NL
@@ -77272,7 +75872,7 @@
 3272884224,3272892415,DE
 3272892416,3272892927,UA
 3272893440,3272893951,SE
-3272893952,3272894463,UA
+3272893952,3272894463,RU
 3272894976,3272895487,RO
 3272895488,3272895999,GB
 3272896000,3272896511,PL
@@ -77295,7 +75895,8 @@
 3272902912,3272903167,RU
 3272903168,3272903423,PL
 3272903424,3272903679,AT
-3272903680,3272904191,RU
+3272903680,3272903935,RU
+3272903936,3272904191,DK
 3272904192,3272904447,SI
 3272904704,3272904959,NL
 3272904960,3272905215,RO
@@ -77387,7 +75988,6 @@
 3273261056,3273261567,NO
 3273261568,3273262079,BE
 3273262080,3273262591,LU
-3273262592,3273263103,RU
 3273263616,3273264127,SE
 3273264128,3273264639,PL
 3273264640,3273265151,AT
@@ -77414,7 +76014,9 @@
 3273326984,3273326987,DE
 3273326988,3273326991,EU
 3273326992,3273327047,DE
-3273327048,3273327263,EU
+3273327048,3273327103,EU
+3273327104,3273327231,DE
+3273327232,3273327263,EU
 3273327264,3273327287,DE
 3273327288,3273327375,EU
 3273327376,3273327423,IE
@@ -77460,8 +76062,8 @@
 3273335040,3273335295,EU
 3273335296,3273335423,GB
 3273335424,3273335431,EU
-3273335432,3273335447,GB
-3273335448,3273335935,EU
+3273335432,3273335455,GB
+3273335456,3273335935,EU
 3273335936,3273335999,DE
 3273336000,3273336847,EU
 3273336848,3273336863,DE
@@ -77724,7 +76326,6 @@
 3273867264,3273867519,BE
 3273867520,3273867775,UA
 3273867776,3273868031,PT
-3273868032,3273868287,GB
 3273868288,3273869311,RU
 3273869312,3273871359,DE
 3273871360,3273871615,PL
@@ -77759,7 +76360,9 @@
 3273883392,3273883647,DE
 3273883648,3273916415,NL
 3273916416,3273932799,IT
-3273932800,3273949183,DE
+3273932800,3273940991,DE
+3273940992,3273943039,GB
+3273943040,3273949183,DE
 3273949184,3273981951,FR
 3273981952,3274047487,DE
 3274050560,3274051583,PL
@@ -77788,9 +76391,8 @@
 3274163200,3274163711,UA
 3274163712,3274164223,BG
 3274164224,3274164735,AT
-3274165248,3274165759,GB
 3274165760,3274166271,RU
-3274166272,3274166783,AT
+3274166272,3274166783,RO
 3274166784,3274167295,UA
 3274167296,3274167807,BG
 3274168320,3274168831,PL
@@ -77848,7 +76450,6 @@
 3274368512,3274368767,AT
 3274368768,3274369023,FR
 3274370048,3274371071,GB
-3274371072,3274373375,NL
 3274373376,3274373631,PL
 3274373632,3274374143,FR
 3274374144,3274375167,DE
@@ -78119,7 +76720,6 @@
 3274695424,3274695679,PL
 3274695680,3274695935,SI
 3274695936,3274696191,DE
-3274696192,3274696447,DK
 3274696448,3274696703,CH
 3274696704,3274696959,IT
 3274696960,3274697215,GR
@@ -78259,7 +76859,9 @@
 3275428376,3275428407,GB
 3275428408,3275428415,EU
 3275428416,3275428447,GB
-3275428448,3275429887,EU
+3275428448,3275428607,EU
+3275428608,3275428863,GB
+3275428864,3275429887,EU
 3275429888,3275430143,GB
 3275430144,3275430591,EU
 3275430592,3275430631,GB
@@ -78388,7 +76990,11 @@
 3275484160,3275484415,GB
 3275484416,3275485183,EU
 3275485184,3275485759,GB
-3275485760,3275488767,EU
+3275485760,3275485839,EU
+3275485840,3275485855,GB
+3275485856,3275486207,EU
+3275486208,3275487231,GB
+3275487232,3275488767,EU
 3275488768,3275489279,CZ
 3275489280,3275497471,GB
 3275497472,3275505663,DE
@@ -78428,7 +77034,6 @@
 3275512320,3275512447,FI
 3275512448,3275512575,DK
 3275512576,3275512703,BE
-3275512704,3275512831,PL
 3275512832,3275512895,SE
 3275512896,3275512959,AT
 3275512960,3275513023,PL
@@ -78647,7 +77252,9 @@
 3276026368,3276026623,FR
 3276026624,3276027391,GB
 3276027392,3276027647,FR
-3276027648,3276029183,GB
+3276027648,3276028543,GB
+3276028544,3276028671,FR
+3276028672,3276029183,GB
 3276029184,3276029439,FR
 3276029440,3276030591,GB
 3276030592,3276030607,FR
@@ -78804,7 +77411,6 @@
 3276428544,3276428799,BG
 3276428800,3276429055,DE
 3276429056,3276429311,NL
-3276429312,3276430079,RU
 3276430080,3276430591,PL
 3276430592,3276430847,GB
 3276430848,3276431103,DE
@@ -78824,15 +77430,18 @@
 3276478720,3276478975,FR
 3276478976,3276485631,EU
 3276485632,3276486655,GB
-3276486656,3276494335,EU
+3276486656,3276490775,EU
+3276490776,3276490776,NL
+3276490777,3276490781,EU
+3276490782,3276490782,AT
+3276490783,3276490783,CH
+3276490784,3276494335,EU
 3276494336,3276494591,GB
 3276494592,3276499503,EU
 3276499504,3276499567,DE
 3276499568,3276503039,EU
 3276503040,3276505087,DE
-3276505088,3276508679,EU
-3276508680,3276508687,GB
-3276508688,3276509183,EU
+3276505088,3276509183,EU
 3276509184,3276510207,IT
 3276510208,3276512255,EU
 3276512256,3276513023,ZA
@@ -78844,9 +77453,7 @@
 3276522496,3276523519,NL
 3276523520,3276524863,EU
 3276524864,3276524895,PT
-3276524896,3276527615,EU
-3276527616,3276527743,PK
-3276527744,3276528127,EU
+3276524896,3276528127,EU
 3276528128,3276528191,GB
 3276528192,3276528351,EU
 3276528352,3276528359,GB
@@ -78959,22 +77566,36 @@
 3276866560,3276866815,GB
 3276866816,3276867071,EU
 3276867072,3276870911,GB
-3276870912,3276871423,IT
-3276871424,3276871672,GB
-3276871673,3276871673,IT
-3276871674,3276873983,GB
+3276870912,3276871679,IT
+3276871680,3276873759,GB
+3276873760,3276873791,ES
+3276873792,3276873983,GB
 3276873984,3276874239,ES
-3276874240,3276876383,GB
+3276874240,3276874959,GB
+3276874960,3276874975,NL
+3276874976,3276876383,GB
 3276876384,3276876415,NL
-3276876416,3276886363,GB
+3276876416,3276882431,GB
+3276882432,3276882687,IT
+3276882688,3276883077,GB
+3276883078,3276883078,IT
+3276883079,3276883711,GB
+3276883712,3276883839,IT
+3276883840,3276886363,GB
 3276886364,3276886367,DE
-3276886368,3276892159,GB
+3276886368,3276890175,GB
+3276890176,3276890191,US
+3276890192,3276892159,GB
 3276892160,3276893183,IT
 3276893184,3276893695,GB
 3276893696,3276893951,IT
-3276893952,3276898671,GB
+3276893952,3276897727,GB
+3276897728,3276897791,BE
+3276897792,3276898671,GB
 3276898672,3276898687,CH
-3276898688,3276902141,GB
+3276898688,3276901613,GB
+3276901614,3276901614,CH
+3276901615,3276902141,GB
 3276902142,3276902142,CH
 3276902143,3276902655,GB
 3276902656,3276902911,SE
@@ -79035,7 +77656,6 @@
 3277178880,3277179135,ES
 3277179392,3277179647,DE
 3277179648,3277180159,BE
-3277180160,3277180415,NL
 3277180416,3277180671,RU
 3277180928,3277181183,UA
 3277181184,3277181439,PL
@@ -79058,7 +77678,6 @@
 3277186560,3277186815,PL
 3277186816,3277187071,RU
 3277187072,3277187327,GB
-3277187328,3277187583,UA
 3277187584,3277188351,RU
 3277188352,3277188607,DE
 3277188608,3277188863,RU
@@ -79067,7 +77686,6 @@
 3277189376,3277189631,PL
 3277189632,3277189887,TR
 3277189888,3277190143,PL
-3277190144,3277190399,SE
 3277190400,3277190655,GB
 3277190656,3277190911,BE
 3277190912,3277191167,FR
@@ -79234,7 +77852,7 @@
 3277482496,3277483007,PL
 3277483008,3277483519,IT
 3277483520,3277484031,RO
-3277484032,3277486079,CH
+3277484032,3277484543,CH
 3277486080,3277486591,GB
 3277486592,3277487103,UA
 3277487104,3277487615,RO
@@ -79283,7 +77901,7 @@
 3277704192,3277704703,UA
 3277704704,3277705215,RU
 3277705728,3277706239,ES
-3277706240,3277707263,UA
+3277706240,3277706751,UA
 3277707264,3277707775,CZ
 3277707776,3277708287,MD
 3277708288,3277708799,AT
@@ -79387,7 +78005,6 @@
 3277843456,3277843967,PT
 3277843968,3277845503,DK
 3277845504,3277847039,NL
-3277847040,3277847551,DK
 3277847552,3277848063,RU
 3277848064,3277848575,RO
 3277848576,3277856767,AT
@@ -79590,7 +78207,6 @@
 3279028224,3279028735,PL
 3279028736,3279029247,RU
 3279029760,3279030271,UA
-3279030272,3279030783,RU
 3279030784,3279031295,DE
 3279031296,3279031807,NL
 3279032320,3279032831,HU
@@ -79613,7 +78229,6 @@
 3279057408,3279057919,FR
 3279058944,3279059455,UA
 3279059456,3279060479,RU
-3279060480,3279060991,PL
 3279060992,3279069183,UA
 3279069184,3279077375,PL
 3279077376,3279085567,ES
@@ -79771,7 +78386,6 @@
 3280128256,3280128511,GB
 3280128512,3280129023,HU
 3280129280,3280129535,LV
-3280129536,3280129791,SA
 3280129792,3280130047,FR
 3280130304,3280130559,RU
 3280130560,3280130815,GB
@@ -79824,7 +78438,6 @@
 3280577792,3280578047,NL
 3280578048,3280578303,RO
 3280578304,3280578559,UA
-3280578560,3280578815,PL
 3280578816,3280579071,NL
 3280579072,3280579327,DE
 3280579328,3280579583,RU
@@ -79916,7 +78529,6 @@
 3280765952,3280766975,DK
 3280766976,3280767999,AT
 3280768000,3280769023,FR
-3280769024,3280770047,NL
 3280770048,3280771071,FR
 3280771072,3280772095,PL
 3280772096,3280773119,ES
@@ -79976,7 +78588,7 @@
 3280998656,3280999423,GB
 3280999424,3280999679,HU
 3280999680,3280999935,UA
-3280999936,3281000447,DE
+3280999936,3281000191,DE
 3281000448,3281000703,FR
 3281000704,3281000959,UA
 3281000960,3281001215,SI
@@ -80221,7 +78833,6 @@
 3282746112,3282746367,SE
 3282746368,3282746623,PL
 3282746624,3282746879,SE
-3282746880,3282747135,RO
 3282747136,3282747391,PL
 3282747392,3282763775,RU
 3282763776,3282772991,GB
@@ -80233,8 +78844,8 @@
 3283113472,3283156991,CH
 3283156992,3283173375,DE
 3283173376,3283174399,PL
-3283174400,3283176447,UA
-3283176448,3283177471,GB
+3283174400,3283175423,GB
+3283175424,3283176447,UA
 3283177472,3283178495,BE
 3283178496,3283179519,PL
 3283180544,3283181567,UA
@@ -80297,7 +78908,6 @@
 3283249152,3283249663,UA
 3283249664,3283250175,RO
 3283250176,3283250687,RU
-3283250688,3283251199,RO
 3283251200,3283251711,FR
 3283251712,3283252223,PL
 3283252224,3283252735,BG
@@ -80325,11 +78935,9 @@
 3283488256,3283488511,PL
 3283488768,3283489279,FR
 3283489280,3283489535,DE
-3283489536,3283489791,PL
 3283489792,3283490047,RU
 3283490048,3283490559,UA
 3283490560,3283490815,PL
-3283490816,3283491071,CH
 3283491072,3283491327,TR
 3283491328,3283491583,AT
 3283491584,3283491839,RO
@@ -80340,9 +78948,7 @@
 3283492864,3283493119,DK
 3283493120,3283493375,IL
 3283493376,3283493887,PL
-3283493888,3283494143,DK
-3283494400,3283494655,PL
-3283494656,3283494911,DK
+3283493888,3283494911,DK
 3283494912,3283495167,PL
 3283495168,3283495423,BG
 3283495424,3283495679,TR
@@ -80406,7 +79012,6 @@
 3283636224,3283636735,UA
 3283636736,3283637759,PL
 3283638272,3283638783,PL
-3283638784,3283639295,RU
 3283639296,3283639807,CH
 3283639808,3283640319,DE
 3283640320,3283648511,DK
@@ -80478,7 +79083,6 @@
 3283990016,3283990527,SE
 3283991040,3283991551,RO
 3283991552,3283992063,SE
-3283992064,3283992575,RO
 3283992576,3283993087,IL
 3283993088,3283993599,RO
 3283993600,3283994111,UA
@@ -80537,10 +79141,16 @@
 3284016384,3284016639,CH
 3284016640,3284017151,DK
 3284017152,3284025343,GR
-3284025344,3284030471,GB
+3284025344,3284028287,GB
+3284028288,3284028319,US
+3284028320,3284029183,GB
+3284029184,3284029199,US
+3284029200,3284030471,GB
 3284030472,3284030479,IL
 3284030480,3284030495,FR
-3284030496,3284033535,GB
+3284030496,3284030615,GB
+3284030616,3284030623,SE
+3284030624,3284033535,GB
 3284033536,3284041727,RU
 3284041728,3284041983,DK
 3284041984,3284042239,SI
@@ -80554,7 +79164,7 @@
 3284044032,3284044287,FR
 3284044288,3284044543,DE
 3284044800,3284045055,CZ
-3284045056,3284045311,LT
+3284045056,3284045311,EE
 3284045312,3284045567,DE
 3284045568,3284045823,AT
 3284046080,3284046335,DE
@@ -80891,9 +79501,7 @@
 3285452496,3285452511,GB
 3285452512,3285453439,EU
 3285453440,3285453567,GB
-3285453568,3285457071,EU
-3285457072,3285457079,GB
-3285457080,3285461183,EU
+3285453568,3285461183,EU
 3285461184,3285461215,NL
 3285461216,3285461807,EU
 3285461808,3285461839,NL
@@ -81005,7 +79613,6 @@
 3285773056,3285773311,DE
 3285773312,3285773567,LV
 3285773568,3285773823,KG
-3285773824,3285774079,RU
 3285774080,3285774335,RO
 3285774336,3285774591,CZ
 3285774592,3285774847,RU
@@ -81037,7 +79644,9 @@
 3285913704,3285913707,EU
 3285913708,3285913711,FI
 3285913712,3285913719,GB
-3285913720,3285917695,EU
+3285913720,3285913727,EU
+3285913728,3285913855,GB
+3285913856,3285917695,EU
 3285917696,3285917703,GB
 3285917704,3285917711,EU
 3285917712,3285917807,GB
@@ -81048,7 +79657,10 @@
 3285921792,3285924911,EU
 3285924912,3285924919,CH
 3285924920,3285924927,FI
-3285924928,3285925163,EU
+3285924928,3285924943,DE
+3285924944,3285924959,EU
+3285924960,3285924991,DE
+3285924992,3285925163,EU
 3285925164,3285925171,CH
 3285925172,3285926431,EU
 3285926432,3285926463,CH
@@ -81057,8 +79669,8 @@
 3285926624,3285928303,EU
 3285928304,3285928311,GB
 3285928312,3285931527,EU
-3285931528,3285931535,DE
-3285931536,3285934591,EU
+3285931528,3285931543,DE
+3285931544,3285934591,EU
 3285934592,3285934847,ES
 3285934848,3285935871,EU
 3285935872,3285936127,GB
@@ -81072,7 +79684,9 @@
 3285939840,3285939967,GB
 3285939968,3285941247,EU
 3285941248,3285941503,ES
-3285941504,3285949855,EU
+3285941504,3285949603,EU
+3285949604,3285949607,CH
+3285949608,3285949855,EU
 3285949856,3285949887,ES
 3285949888,3285950207,EU
 3285950208,3285950463,IT
@@ -81089,7 +79703,9 @@
 3285962752,3285963775,DE
 3285963776,3285964799,EU
 3285964800,3285964927,DE
-3285964928,3285975039,EU
+3285964928,3285965055,EU
+3285965056,3285965311,DE
+3285965312,3285975039,EU
 3285975040,3286013695,FR
 3286013696,3286013951,RE
 3286013952,3286106111,FR
@@ -81160,7 +79776,6 @@
 3286355968,3286356991,DE
 3286356992,3286358015,PL
 3286358016,3286359039,GB
-3286359040,3286360063,PT
 3286360064,3286361087,IT
 3286361088,3286362111,UA
 3286362112,3286363135,RU
@@ -81215,9 +79830,15 @@
 3286425344,3286425599,IT
 3286425600,3286433791,KW
 3286433792,3286499327,DE
-3286499328,3286514431,HU
+3286499328,3286502143,HU
+3286502144,3286502399,BG
+3286502400,3286510335,HU
+3286510336,3286510591,BG
+3286510592,3286514431,HU
 3286514432,3286514687,RO
-3286514688,3286564863,HU
+3286514688,3286552575,HU
+3286552576,3286553087,BG
+3286553088,3286564863,HU
 3286564864,3286566655,AE
 3286566656,3286567423,KW
 3286567424,3286630399,AE
@@ -81334,7 +79955,6 @@
 3286929408,3286929663,LV
 3286929664,3286929919,BE
 3286929920,3286930175,SE
-3286930176,3286930431,RU
 3286930432,3286930687,UA
 3286930688,3286930943,DE
 3286930944,3286931199,SE
@@ -81535,7 +80155,7 @@
 3287479296,3287480319,RO
 3287480320,3287481343,AT
 3287481344,3287482367,PL
-3287482368,3287548927,DE
+3287482368,3287548415,DE
 3287548928,3287549439,UA
 3287549440,3287549951,SE
 3287549952,3287550463,UA
@@ -81624,7 +80244,6 @@
 3287675648,3287675903,DE
 3287675904,3287676159,BE
 3287676160,3287676415,DE
-3287676416,3287676671,RU
 3287676672,3287676927,GB
 3287676928,3287677183,ES
 3287677184,3287677439,RU
@@ -81657,7 +80276,6 @@
 3287728128,3287729407,IT
 3287729664,3287729919,DK
 3287729920,3287730175,HU
-3287731200,3287732223,DE
 3287732224,3287734271,IT
 3287734272,3287734527,PL
 3287734528,3287734783,UA
@@ -81735,7 +80353,6 @@
 3287869952,3287870463,UA
 3287870464,3287870975,RU
 3287870976,3287871487,NL
-3287872512,3287873023,GB
 3287873024,3287873535,PL
 3287873536,3287874047,RU
 3287874048,3287874559,FR
@@ -81763,7 +80380,7 @@
 3287954432,3287954687,CH
 3287954688,3287954943,RO
 3287954944,3287955199,PL
-3287955200,3287955711,RU
+3287955456,3287955711,RU
 3287955712,3287955967,DE
 3287955968,3287956223,SI
 3287956224,3287956479,RO
@@ -81921,7 +80538,9 @@
 3288578048,3288580095,JM
 3288580096,3288588287,BB
 3288588288,3288608255,ZA
-3288608256,3288614655,US
+3288608256,3288608264,US
+3288608265,3288608265,DE
+3288608266,3288614655,US
 3288614656,3288616959,ZA
 3288616960,3288617215,ZW
 3288617216,3288661759,ZA
@@ -81969,7 +80588,8 @@
 3289027584,3289027839,MZ
 3289027840,3289041407,ZA
 3289041408,3289041663,NG
-3289041664,3289044991,ZA
+3289041664,3289044735,ZA
+3289044736,3289044991,GH
 3289044992,3289047039,ML
 3289047040,3289048063,ZA
 3289048064,3289048319,UG
@@ -81977,8 +80597,7 @@
 3289048832,3289049087,NG
 3289049088,3289053951,ZA
 3289053952,3289055231,NG
-3289055232,3289063423,ZA
-3289067520,3289071103,ZA
+3289055232,3289071103,ZA
 3289071104,3289071359,SO
 3289071616,3289074431,ZA
 3289074432,3289074687,DZ
@@ -82017,6 +80636,7 @@
 3289169920,3289186303,MA
 3289186304,3289212159,ZA
 3289212160,3289212415,MZ
+3289212416,3289212927,NG
 3289214976,3289215231,NG
 3289215232,3289217279,ZA
 3289217280,3289217535,KE
@@ -82194,6 +80814,7 @@
 3291215616,3291215871,BF
 3291215872,3291216127,KE
 3291216128,3291216383,LS
+3291216384,3291216639,ZA
 3291216640,3291216895,NG
 3291217920,3291230207,ZA
 3291230208,3291234303,GH
@@ -82277,6 +80898,9 @@
 3291546880,3291547135,TZ
 3291547136,3291547391,AO
 3291547392,3291547647,RW
+3291547648,3291547903,BJ
+3291547904,3291548159,MU
+3291548160,3291548415,DJ
 3291742208,3292004351,US
 3292004352,3292266495,SC
 3292397568,3292528639,ZA
@@ -82319,7 +80943,7 @@
 3301474304,3301490687,MA
 3301490688,3301494783,ZA
 3301494784,3301498879,ZM
-3301507328,3301507583,ZW
+3301507328,3301507583,MU
 3301507584,3301507839,GH
 3301507840,3301508095,EG
 3301508608,3301509119,ZA
@@ -82355,6 +80979,7 @@
 3301904384,3301908479,KE
 3301908480,3301912575,ZA
 3301912576,3301916671,MU
+3301916672,3301933055,ZA
 3301949440,3301965823,SN
 3301965824,3302490111,ZA
 3302490112,3302490367,KE
@@ -82390,6 +81015,7 @@
 3302540288,3302540799,UG
 3302540800,3302541311,AO
 3302541312,3302542335,NG
+3302542336,3302542847,ZA
 3302543360,3302544383,NG
 3302544384,3302544639,CM
 3302544640,3302544895,MU
@@ -82464,6 +81090,8 @@
 3302958336,3302958591,SZ
 3302958592,3302958847,DJ
 3302958848,3302959103,GA
+3302959104,3302959359,BJ
+3302985728,3302987775,MU
 3304062976,3304456191,SC
 3304456192,3304521727,NG
 3304521728,3304587263,SC
@@ -82519,7 +81147,9 @@
 3315287040,3315287295,KE
 3315287296,3315287807,MU
 3315287808,3315288319,KE
-3315288320,3315288575,MU
+3315288320,3315288413,MU
+3315288414,3315288414,KE
+3315288415,3315288575,MU
 3315288576,3315288831,KE
 3315288832,3315291135,MU
 3315291136,3315292159,KE
@@ -82549,7 +81179,6 @@
 3315458048,3315459071,SL
 3315459072,3315460095,KE
 3315460096,3315461119,SL
-3315461120,3315462143,TZ
 3315462144,3315463167,ZA
 3315463168,3315464191,SO
 3315464192,3315465215,CD
@@ -82685,7 +81314,9 @@
 3320905728,3320938495,DJ
 3320938496,3320971263,AO
 3320971264,3320979455,GA
-3320979456,3320995839,ZA
+3320979456,3320985599,ZA
+3320985600,3320985607,KE
+3320985608,3320995839,ZA
 3320995840,3321004031,NG
 3321004032,3321008127,GM
 3321008128,3321012223,ZA
@@ -82793,8 +81424,9 @@
 3323038720,3323038975,CA
 3323038976,3323048959,US
 3323048960,3323049727,NL
-3323049728,3323062271,US
-3323062272,3323062527,BR
+3323049728,3323061247,US
+3323061504,3323062015,US
+3323062016,3323062527,BR
 3323062528,3323068415,US
 3323199488,3323201535,US
 3323201536,3323203583,CA
@@ -82808,7 +81440,9 @@
 3323244544,3323244671,CA
 3323244672,3323245319,US
 3323245320,3323245327,CA
-3323245328,3323270420,US
+3323245328,3323245463,US
+3323245464,3323245471,CA
+3323245472,3323270420,US
 3323270421,3323270421,CH
 3323270422,3323331583,US
 3323331584,3323331839,CA
@@ -82873,7 +81507,7 @@
 3323687936,3323687999,US
 3323688000,3323688959,CA
 3323688960,3323689199,US
-3323689200,3323689215,BY
+3323689200,3323689215,CA
 3323689216,3323689471,US
 3323689472,3323690495,CA
 3323690496,3323741439,US
@@ -83028,11 +81662,7 @@
 3325171712,3325190143,US
 3325190144,3325191687,CA
 3325191688,3325191695,US
-3325191696,3325199323,CA
-3325199324,3325199327,BY
-3325199328,3325200911,CA
-3325200912,3325200919,BY
-3325200920,3325202047,CA
+3325191696,3325202047,CA
 3325202048,3325202079,US
 3325202080,3325204479,CA
 3325204480,3325205503,US
@@ -83042,19 +81672,17 @@
 3325206640,3325206655,US
 3325206656,3325207807,CA
 3325207808,3325207935,US
-3325207936,3325211419,CA
+3325207936,3325208119,CA
+3325208120,3325208123,US
+3325208124,3325211419,CA
 3325211420,3325211423,US
 3325211424,3325211647,CA
 3325211648,3325211775,US
-3325211776,3325212483,CA
-3325212484,3325212487,BY
-3325212488,3325212647,CA
+3325211776,3325212647,CA
 3325212648,3325212655,US
 3325212656,3325213687,CA
 3325213688,3325213695,US
-3325213696,3325216271,CA
-3325216272,3325216287,BY
-3325216288,3325216527,CA
+3325213696,3325216527,CA
 3325216528,3325216531,US
 3325216532,3325217939,CA
 3325217940,3325217943,US
@@ -83240,7 +81868,9 @@
 3326713344,3326714111,US
 3326714112,3326716927,CA
 3326716928,3326717951,US
-3326717952,3326726399,CA
+3326717952,3326722047,CA
+3326722048,3326726143,US
+3326726144,3326726399,CA
 3326726400,3326726655,US
 3326726656,3326729215,CA
 3326729216,3326729471,JP
@@ -83249,9 +81879,7 @@
 3326734336,3326737663,CA
 3326737664,3326737919,US
 3326737920,3326738175,CA
-3326738176,3326796863,US
-3326796864,3326796927,GB
-3326796928,3326952191,US
+3326738176,3326952191,US
 3326952192,3326952447,AS
 3326952448,3326953983,US
 3326953984,3326954495,AS
@@ -83339,9 +81967,7 @@
 3328481792,3328482303,CA
 3328482304,3328483071,US
 3328483072,3328483327,CA
-3328483328,3328510064,US
-3328510065,3328510077,AE
-3328510078,3328515071,US
+3328483328,3328515071,US
 3328515072,3328516095,DM
 3328516096,3328617983,US
 3328617984,3328618239,CA
@@ -83360,8 +81986,24 @@
 3328775936,3328788479,US
 3328788480,3328789503,FR
 3328789504,3328790015,AP
-3328790016,3328794623,US
-3328794624,3328802815,CA
+3328790016,3328794879,US
+3328794880,3328795391,CA
+3328795392,3328796159,US
+3328796160,3328796671,CA
+3328796672,3328797695,US
+3328797696,3328797951,CA
+3328797952,3328798207,US
+3328798208,3328798719,CA
+3328798720,3328799487,US
+3328799488,3328799999,CA
+3328800000,3328800255,NL
+3328800256,3328800767,IT
+3328800768,3328801023,NZ
+3328801024,3328801279,SE
+3328801280,3328801791,CZ
+3328801792,3328802047,US
+3328802048,3328802303,DE
+3328802304,3328802815,AU
 3328802816,3328826813,US
 3328826814,3328826814,SG
 3328826815,3329230335,US
@@ -83473,9 +82115,7 @@
 3331563520,3331563775,CH
 3331563776,3331565567,US
 3331565568,3331566079,CA
-3331566080,3331575807,US
-3331575808,3331576831,KY
-3331576832,3331632639,US
+3331566080,3331632639,US
 3331632640,3331632895,CA
 3331632896,3331633407,US
 3331633408,3331633919,CH
@@ -83710,11 +82350,13 @@
 3335252736,3335252991,CA
 3335252992,3335276287,US
 3335276288,3335276799,PR
-3335276800,3335439615,US
+3335276800,3335354179,US
+3335354180,3335354183,CA
+3335354184,3335439615,US
 3335439616,3335439871,CH
 3335439872,3335440383,US
 3335440384,3335441151,CH
-3335441152,3335458815,US
+3335441152,3335456767,US
 3335458816,3335460863,BM
 3335460864,3335475199,US
 3335475200,3335475455,DE
@@ -83736,11 +82378,15 @@
 3336854016,3336854271,CO
 3336854272,3336896767,US
 3336896768,3336897023,VE
-3336897024,3336991231,US
+3336897024,3336990719,US
+3336990720,3336990975,CA
+3336990976,3336991231,US
 3336991232,3336991487,CA
 3336991488,3336993023,US
 3336993024,3336993535,CA
-3336993536,3337030655,US
+3336993536,3336993791,US
+3336993792,3336994047,CA
+3336994048,3337030655,US
 3337030656,3337030911,GB
 3337030912,3337044479,US
 3337044480,3337044735,CA
@@ -83803,7 +82449,9 @@
 3337961728,3337961983,CA
 3337961984,3337963391,US
 3337963392,3337963519,CA
-3337963520,3337964031,US
+3337963520,3337963639,US
+3337963640,3337963647,CA
+3337963648,3337964031,US
 3337964032,3337964543,A2
 3337964544,3337969663,US
 3337969664,3337973759,PR
@@ -83912,8 +82560,7 @@
 3338371072,3338403839,CA
 3338403840,3338424319,US
 3338424320,3338428415,CA
-3338428416,3338429439,US
-3338429440,3338429695,CA
+3338428416,3338429695,US
 3338429696,3338429951,SG
 3338429952,3338430719,US
 3338430720,3338430975,NL
@@ -83981,7 +82628,9 @@
 3339180032,3339181055,CA
 3339181056,3339184127,US
 3339184128,3339186175,CA
-3339186176,3339327999,US
+3339186176,3339261951,US
+3339261952,3339263999,HK
+3339264000,3339327999,US
 3339328512,3339329535,CA
 3339329536,3339337727,US
 3339337984,3339338239,US
@@ -84082,11 +82731,15 @@
 3341216768,3341217791,CA
 3341217792,3341218623,US
 3341218624,3341218655,CA
-3341218656,3341339647,US
+3341218656,3341287423,US
+3341287424,3341339647,CZ
 3341339648,3341339903,AP
-3341339904,3341340159,US
+3341339904,3341340159,CZ
 3341340160,3341340415,AP
-3341340416,3341439200,US
+3341340416,3341408511,CZ
+3341408512,3341408767,US
+3341408768,3341418495,CZ
+3341418496,3341439200,US
 3341439201,3341439201,CA
 3341439202,3341444863,US
 3341444864,3341445631,DE
@@ -84175,7 +82828,8 @@
 3342516224,3342517247,CA
 3342517248,3342526463,US
 3342526464,3342528511,CA
-3342528512,3342552063,US
+3342528512,3342548991,US
+3342551040,3342552063,US
 3342552064,3342553087,CA
 3342553088,3342565375,US
 3342565376,3342567423,CA
@@ -84218,7 +82872,13 @@
 3343355904,3343364095,CA
 3343364096,3343365631,US
 3343365632,3343372543,CA
-3343372800,3343378823,US
+3343372800,3343378511,US
+3343378512,3343378519,GB
+3343378520,3343378535,US
+3343378536,3343378543,GB
+3343378544,3343378575,US
+3343378576,3343378583,GB
+3343378584,3343378823,US
 3343378824,3343378839,SE
 3343378840,3343379079,US
 3343379080,3343379087,SE
@@ -84333,7 +82993,13 @@
 3345321472,3345321727,GB
 3345321728,3345327103,US
 3345327104,3345328127,CA
-3345328128,3345333247,US
+3345328128,3345332487,US
+3345332488,3345332495,RO
+3345332496,3345332607,US
+3345332608,3345332639,RO
+3345332640,3345332655,US
+3345332656,3345332663,RO
+3345332664,3345333247,US
 3345333248,3345334271,MF
 3345334272,3345334527,A1
 3345334528,3345335295,US
@@ -84741,8 +83407,8 @@
 3351475712,3351475967,IS
 3351475968,3351483391,US
 3351483392,3351484415,CA
-3351484416,3351485439,US
-3351485440,3351488511,CA
+3351484416,3351486463,US
+3351486464,3351488511,CA
 3351488512,3351494911,US
 3351494912,3351495679,SG
 3351495680,3351495935,US
@@ -84841,9 +83507,7 @@
 3353861120,3353862143,CA
 3353862144,3353862719,US
 3353862720,3353862751,CA
-3353862752,3353864447,US
-3353864448,3353864703,CA
-3353864704,3353864959,US
+3353862752,3353864959,US
 3353864960,3353865215,CA
 3353865216,3353884927,US
 3353884928,3353885183,GB
@@ -84916,7 +83580,10 @@
 3355372288,3355372543,CA
 3355372544,3355384831,US
 3355384832,3355385855,CA
-3355385856,3355407359,US
+3355385856,3355389439,US
+3355389440,3355389695,GB
+3355389696,3355389951,JP
+3355389952,3355407359,US
 3355407360,3355408383,PR
 3355408384,3355412479,US
 3355412480,3355412607,BE
@@ -84957,7 +83624,7 @@
 3355467264,3355467519,US
 3355467520,3355467775,MX
 3355467776,3355468799,AR
-3355469312,3355469567,BR
+3355468800,3355469567,BR
 3355469568,3355470591,MX
 3355470592,3355470847,PE
 3355470848,3355471103,CL
@@ -85171,7 +83838,9 @@
 3356076288,3356078079,BR
 3356078080,3356078335,EC
 3356078336,3356079359,CL
+3356079616,3356080127,MX
 3356080128,3356080383,BR
+3356080384,3356080639,MX
 3356080896,3356082431,NI
 3356082432,3356082687,CL
 3356082688,3356082943,AR
@@ -85341,8 +84010,8 @@
 3356329984,3356332031,GF
 3356332032,3356334079,CU
 3356334080,3356336127,BO
-3356336128,3356337151,SV
-3356337152,3356337663,HN
+3356336128,3356336895,SV
+3356336896,3356337663,HN
 3356337664,3356337919,SV
 3356337920,3356338175,HN
 3356338176,3356339967,SV
@@ -85376,9 +84045,13 @@
 3356390400,3356390655,AR
 3356390656,3356391167,CL
 3356391168,3356391423,PA
-3356393472,3356420863,CL
+3356393472,3356419839,CL
+3356419840,3356419967,CO
+3356419968,3356420863,CL
 3356420864,3356420991,CO
-3356420992,3356421887,CL
+3356420992,3356421119,CL
+3356421120,3356421247,CO
+3356421248,3356421887,CL
 3356421888,3356422143,CO
 3356422144,3356425471,CL
 3356425472,3356425599,CO
@@ -85391,7 +84064,9 @@
 3356499968,3356508159,MX
 3356508160,3356508671,AR
 3356508672,3356509183,CR
-3356509184,3356510207,VE
+3356509184,3356509439,VE
+3356509440,3356509503,US
+3356509504,3356510207,VE
 3356510208,3356511999,AR
 3356512000,3356512255,CO
 3356512256,3356514303,AR
@@ -85634,7 +84309,8 @@
 3357712384,3357713407,BR
 3357713408,3357715199,MX
 3357715200,3357715455,CO
-3357715456,3357726719,MX
+3357715456,3357726463,MX
+3357726464,3357726719,AR
 3357726720,3357727743,BR
 3357727744,3357728767,MX
 3357728768,3357736959,BR
@@ -85680,7 +84356,8 @@
 3358133760,3358142719,AR
 3358142720,3358142975,US
 3358142976,3358143231,CO
-3358143232,3358143487,AR
+3358143232,3358143295,VE
+3358143296,3358143487,AR
 3358143488,3358143999,US
 3358144000,3358144127,CL
 3358144128,3358144255,AR
@@ -85703,8 +84380,8 @@
 3358151680,3358151807,PE
 3358151808,3358151935,AR
 3358151936,3358152191,PE
-3358152192,3358152559,AR
-3358152560,3358152575,PE
+3358152192,3358152543,AR
+3358152544,3358152575,PE
 3358152576,3358152703,AR
 3358152704,3358152959,US
 3358152960,3358153215,EC
@@ -85736,7 +84413,9 @@
 3358326784,3358392319,VE
 3358392320,3358457855,AR
 3358457856,3358523391,PA
-3358523392,3358525951,VE
+3358523392,3358524159,VE
+3358524160,3358524415,AR
+3358524416,3358525951,VE
 3358525952,3358526463,AR
 3358526464,3358529535,VE
 3358529536,3358530303,AR
@@ -85754,7 +84433,10 @@
 3358539520,3358539775,AR
 3358539776,3358543871,VE
 3358543872,3358544127,MX
-3358544128,3358548223,VE
+3358544128,3358544383,AR
+3358544384,3358545407,VE
+3358545408,3358545663,AR
+3358545664,3358548223,VE
 3358548224,3358548479,AR
 3358548480,3358549759,VE
 3358549760,3358550015,AR
@@ -85789,15 +84471,9 @@
 3358565184,3358565247,AR
 3358565248,3358565311,VE
 3358565312,3358565343,AR
-3358565344,3358565567,VE
-3358565568,3358565599,AR
-3358565600,3358565791,VE
-3358565792,3358565855,AR
-3358565856,3358565951,VE
-3358565952,3358566015,AR
-3358566016,3358566047,VE
-3358566048,3358566111,AR
-3358566112,3358566847,VE
+3358565344,3358565375,VE
+3358565376,3358566399,AR
+3358566400,3358566847,VE
 3358566848,3358566879,AR
 3358566880,3358566911,VE
 3358566912,3358566975,AR
@@ -85932,7 +84608,9 @@
 3359899648,3359916031,CL
 3359916032,3359932415,AR
 3359932416,3359948799,MX
-3359948800,3359989759,AR
+3359948800,3359989247,AR
+3359989248,3359989503,US
+3359989504,3359989759,AR
 3359989760,3359997951,CO
 3359997952,3360006143,AR
 3360006144,3360014335,EC
@@ -86008,7 +84686,9 @@
 3360765952,3360767999,CO
 3360768000,3360772351,AR
 3360772352,3360772479,BO
-3360772480,3360780399,AR
+3360772480,3360780303,AR
+3360780304,3360780319,BR
+3360780320,3360780399,AR
 3360780400,3360780415,BR
 3360780416,3360781839,AR
 3360781840,3360781847,DO
@@ -86016,7 +84696,9 @@
 3360781944,3360781947,MX
 3360781948,3360782167,AR
 3360782168,3360782175,MX
-3360782176,3360788479,AR
+3360782176,3360782239,AR
+3360782240,3360782247,MX
+3360782248,3360788479,AR
 3360788480,3360790527,CL
 3360790528,3360849919,AR
 3360849920,3360882687,VE
@@ -86029,15 +84711,14 @@
 3361034240,3361036287,EC
 3361036288,3361046527,AR
 3361046528,3361052671,BO
-3361052672,3361054719,AR
+3361052672,3361054463,AR
+3361054464,3361054719,PE
 3361054720,3361058815,NI
 3361058816,3361062911,AR
 3361062912,3361071103,CL
 3361071104,3361072639,CO
 3361072640,3361072767,VE
-3361072768,3361072895,CO
-3361072896,3361073151,VE
-3361073152,3361079295,CO
+3361072768,3361079295,CO
 3361079296,3361144831,CL
 3361144832,3361210367,BO
 3361210368,3361275903,DO
@@ -86077,7 +84758,9 @@
 3362258944,3362324479,CL
 3362324480,3362324735,AR
 3362324736,3362324991,US
-3362324992,3362327039,AR
+3362324992,3362326015,AR
+3362326016,3362326271,US
+3362326272,3362327039,AR
 3362327040,3362327551,US
 3362327552,3362328063,AR
 3362328064,3362328575,US
@@ -86092,8 +84775,8 @@
 3362342400,3362343423,AR
 3362343424,3362343679,US
 3362343680,3362344447,AR
-3362344448,3362346751,US
-3362346752,3362348799,AR
+3362344448,3362346495,US
+3362346496,3362348799,AR
 3362348800,3362349055,US
 3362349056,3362351103,CR
 3362351104,3362353151,AR
@@ -86157,7 +84840,9 @@
 3362689280,3362689311,AR
 3362689312,3362690367,CO
 3362690368,3362690431,AR
-3362690432,3362691071,CO
+3362690432,3362690527,CO
+3362690528,3362690559,AR
+3362690560,3362691071,CO
 3362691072,3362692095,PA
 3362692096,3362692287,AR
 3362692288,3362692351,CO
@@ -86296,17 +84981,31 @@
 3380748288,3380761087,MX
 3380761088,3380761599,VE
 3380761600,3380764671,BR
-3380764672,3380811775,MX
+3380764672,3380808191,MX
+3380808192,3380808703,CR
+3380808704,3380811775,MX
 3380811776,3380813823,BR
 3380813824,3380815103,MX
 3380815104,3380815359,CR
 3380815360,3380815871,CL
 3380815872,3380816127,MX
 3380816128,3380816383,BO
+3380816384,3380816639,SV
+3380816640,3380816895,CW
 3380816896,3380817151,MX
-3380817920,3380822527,MX
+3380817152,3380817407,BO
+3380817408,3380817663,CO
+3380817664,3380817919,AR
+3380817920,3380818175,MX
+3380818176,3380818431,PA
+3380818432,3380818687,DO
+3380818688,3380818943,PY
+3380818944,3380822527,MX
+3380822528,3380822783,NI
 3380823040,3380824063,BR
 3380824064,3380824319,MX
+3380824320,3380824575,GT
+3380824576,3380825087,AR
 3380825088,3380825343,MX
 3380825344,3380825599,HT
 3380826112,3380828159,BR
@@ -86317,6 +85016,7 @@
 3380831232,3380831743,MX
 3380832256,3380836607,MX
 3380836608,3380836863,PE
+3380836864,3380837375,SV
 3380837376,3380840447,MX
 3380840448,3380843519,BR
 3380843520,3380844543,PA
@@ -86528,8 +85228,8 @@
 3387572224,3387572539,AR
 3387572540,3387572543,CO
 3387572544,3387573375,AR
-3387573376,3387573759,CO
-3387573760,3387574015,AR
+3387573376,3387573887,CO
+3387573888,3387574015,AR
 3387574016,3387574143,CO
 3387574144,3387574783,AR
 3387574784,3387575039,CO
@@ -86537,8 +85237,8 @@
 3387575296,3387575423,CO
 3387575424,3387575551,AR
 3387575552,3387575567,CO
-3387575568,3387575807,AR
-3387575808,3387576063,CO
+3387575568,3387575679,AR
+3387575680,3387576063,CO
 3387576064,3387576319,AR
 3387576320,3387578367,EC
 3387578368,3387584511,AR
@@ -86664,7 +85364,7 @@
 3389211392,3389211647,AU
 3389211648,3389212671,TH
 3389213184,3389213439,AU
-3389213440,3389214207,IN
+3389213952,3389214207,IN
 3389214208,3389214463,SG
 3389214464,3389214719,AU
 3389214720,3389218815,NZ
@@ -86776,7 +85476,6 @@
 3389420032,3389420287,CN
 3389420288,3389420543,AU
 3389420544,3389421055,NZ
-3389421056,3389421311,AU
 3389421312,3389421567,JP
 3389421568,3389422591,KI
 3389422592,3389431807,AU
@@ -87051,7 +85750,6 @@
 3390339328,3390339839,NZ
 3390339840,3390340351,JP
 3390340352,3390340607,CN
-3390340608,3390340863,IN
 3390340864,3390341119,CN
 3390341120,3390375935,KR
 3390375936,3390377983,AU
@@ -87146,7 +85844,9 @@
 3391620864,3391621119,CN
 3391621120,3391622911,HK
 3391622912,3391623167,CN
-3391623168,3391653631,HK
+3391623168,3391627263,HK
+3391627264,3391651839,IN
+3391651840,3391653631,HK
 3391653632,3391654143,CN
 3391654144,3391654911,HK
 3391654912,3391655167,CN
@@ -87424,8 +86124,7 @@
 3392499712,3392503807,JP
 3392503808,3392507903,HK
 3392512000,3392516095,BD
-3392516096,3392520191,NZ
-3392520192,3392524287,AU
+3392516096,3392524287,AU
 3392524288,3392528383,JP
 3392528384,3392536575,ID
 3392536576,3392602111,IN
@@ -87689,7 +86388,7 @@
 3393620992,3393621247,JP
 3393621248,3393622015,AU
 3393622016,3393626111,PK
-3393626112,3393630207,CN
+3393626112,3393630207,HK
 3393630208,3393634303,JP
 3393634304,3393638399,CN
 3393638400,3393650687,JP
@@ -87840,7 +86539,9 @@
 3394207744,3394215935,JP
 3394215936,3394220031,AU
 3394220032,3394226943,SG
-3394226944,3394227199,AP
+3394226944,3394226947,AP
+3394226948,3394226948,SG
+3394226949,3394227199,AP
 3394227200,3394230271,SG
 3394230272,3394230527,AU
 3394230528,3394232319,SG
@@ -88357,19 +87058,27 @@
 3397812224,3397816319,CN
 3397816320,3397832703,IN
 3397836800,3397844991,AU
-3397844992,3397857791,JP
-3397857792,3397858047,AU
-3397858048,3397862143,JP
-3397862144,3397862399,PH
+3397844992,3397845247,JP
+3397845248,3397845503,AU
+3397845504,3397846015,JP
+3397846016,3397846271,AU
+3397846272,3397857791,JP
+3397857792,3397858559,AU
+3397858560,3397861887,JP
+3397861888,3397862399,PH
 3397862400,3397869823,JP
 3397869824,3397870079,AU
-3397870080,3397878527,JP
+3397870080,3397871871,JP
+3397871872,3397872127,AU
+3397872128,3397878527,JP
 3397878528,3397878783,TW
 3397878784,3397881855,JP
 3397881856,3397882111,HK
 3397882112,3397887999,JP
 3397888000,3397889023,IN
-3397889024,3397910527,JP
+3397889024,3397895423,JP
+3397895424,3397895679,AU
+3397895680,3397910527,JP
 3397910528,3397914111,SG
 3397914112,3397914367,AP
 3397914368,3397918719,SG
@@ -88491,7 +87200,8 @@
 3398642944,3398643199,AP
 3398643200,3398643455,AU
 3398643456,3398647807,AP
-3398647808,3398668287,AU
+3398647808,3398655999,IN
+3398656000,3398668287,AU
 3398668288,3398672383,CN
 3398672384,3398680575,PK
 3398680576,3398684671,ID
@@ -88667,7 +87377,7 @@
 3399827456,3399835647,AU
 3399835648,3399839743,AP
 3399839744,3399841791,JP
-3399841792,3399852031,TW
+3399843840,3399852031,TW
 3399852032,3399856127,JP
 3399856128,3399860223,CN
 3399860224,3399864319,PG
@@ -88772,7 +87482,6 @@
 3400269824,3400270847,CN
 3400270848,3400271359,VN
 3400271360,3400271615,AU
-3400271616,3400271871,IN
 3400271872,3400273919,AU
 3400273920,3400275967,TH
 3400275968,3400278015,JP
@@ -88841,7 +87550,9 @@
 3400630272,3400646655,IN
 3400646656,3400647935,SG
 3400647936,3400648191,AU
-3400648192,3400648815,SG
+3400648192,3400648677,SG
+3400648678,3400648678,HK
+3400648679,3400648815,SG
 3400648816,3400648831,HK
 3400648832,3400649943,SG
 3400649944,3400649951,HK
@@ -89245,7 +87956,9 @@
 3406512384,3406512639,IN
 3406512640,3406513663,AU
 3406513664,3406513919,CN
-3406513920,3406514687,AU
+3406513920,3406514175,AU
+3406514176,3406514431,IN
+3406514432,3406514687,AU
 3406514688,3406514943,TH
 3406514944,3406515199,AU
 3406515200,3406516223,CN
@@ -89355,7 +88068,8 @@
 3406696960,3406697215,IN
 3406697216,3406698495,AU
 3406698496,3406699519,CN
-3406699520,3406700799,AU
+3406699520,3406700543,AU
+3406700544,3406700799,IN
 3406700800,3406701055,CN
 3406701056,3406706687,AU
 3406706688,3406706943,CN
@@ -89503,7 +88217,8 @@
 3406962688,3406963967,AU
 3406963968,3406964223,CN
 3406964224,3406966783,AU
-3406966784,3406967551,CN
+3406966784,3406967295,CN
+3406967296,3406967551,HK
 3406967552,3406967807,IN
 3406967808,3406968063,CN
 3406968064,3406972927,AU
@@ -89550,7 +88265,7 @@
 3407026432,3407027711,AU
 3407027712,3407027967,CN
 3407027968,3407028223,AU
-3407028224,3407030271,CN
+3407028224,3407030271,HK
 3407030272,3407030527,AU
 3407030528,3407030783,CN
 3407030784,3407031295,AU
@@ -89624,7 +88339,8 @@
 3407117056,3407117823,AU
 3407117824,3407118335,CN
 3407118336,3407120127,AU
-3407120128,3407122431,CN
+3407120128,3407120383,CN
+3407120384,3407122431,HK
 3407122432,3407123967,AU
 3407123968,3407124223,CN
 3407124224,3407124479,AU
@@ -89703,7 +88419,7 @@
 3407259392,3407260159,AU
 3407260160,3407260415,CN
 3407260416,3407261695,AU
-3407261696,3407263743,CN
+3407261696,3407263743,HK
 3407263744,3407266303,AU
 3407266304,3407266559,CN
 3407266560,3407268863,AU
@@ -89820,7 +88536,7 @@
 3407418880,3407425023,AU
 3407425024,3407425279,CN
 3407425280,3407425535,AU
-3407425536,3407427583,CN
+3407425536,3407427583,HK
 3407427584,3407429631,AU
 3407429632,3407430143,CN
 3407430144,3407436543,AU
@@ -89829,7 +88545,9 @@
 3407438592,3407439103,CN
 3407439104,3407440383,AU
 3407440384,3407440639,CN
-3407440640,3407446783,AU
+3407440640,3407440895,AU
+3407440896,3407441151,IN
+3407441152,3407446783,AU
 3407446784,3407447039,CN
 3407447040,3407447807,AU
 3407447808,3407448063,CN
@@ -90246,7 +88964,8 @@
 3407928832,3407938559,AU
 3407938560,3407938815,CN
 3407938816,3407939327,AU
-3407939328,3407941631,CN
+3407939328,3407939583,CN
+3407939584,3407941631,HK
 3407941632,3407942911,AU
 3407942912,3407943167,CN
 3407943168,3407944191,AU
@@ -90349,7 +89068,7 @@
 3408044800,3408050943,AU
 3408050944,3408051199,CN
 3408051200,3408052223,AU
-3408052224,3408054271,CN
+3408052224,3408054271,HK
 3408054272,3408055295,AU
 3408055296,3408056319,CN
 3408056320,3408062463,AU
@@ -90419,7 +89138,7 @@
 3409455360,3409456639,AU
 3409456640,3409456895,CN
 3409456896,3409457151,AU
-3409457152,3409459199,CN
+3409457152,3409459199,HK
 3409459200,3409462271,AU
 3409462272,3409462783,CN
 3409462784,3409465855,AU
@@ -90542,7 +89261,11 @@
 3409888000,3409888255,HK
 3409888256,3409888511,AU
 3409888512,3409888767,CN
-3409888768,3409896447,AU
+3409888768,3409891327,AU
+3409891328,3409891839,GB
+3409891840,3409892351,AU
+3409892352,3409892863,US
+3409892864,3409896447,AU
 3409896448,3409897471,CN
 3409897472,3409897983,AU
 3409897984,3409898239,CN
@@ -90615,12 +89338,13 @@
 3411050496,3411050751,PK
 3411051008,3411051263,PK
 3411051264,3411051519,SG
-3411051520,3411058687,CN
+3411051520,3411052543,CN
+3411052544,3411054591,HK
+3411054592,3411058687,CN
 3411058688,3411062783,AU
 3411062784,3411064831,HK
 3411064832,3411065087,BD
-3411065088,3411083263,HK
-3411083264,3411085311,CN
+3411065088,3411085311,HK
 3411085312,3411086335,KR
 3411086336,3411087359,JP
 3411087360,3411091455,CN
@@ -90638,8 +89362,7 @@
 3411148800,3411149311,CN
 3411149312,3411149823,MV
 3411149824,3411150847,IN
-3411150848,3411152895,HK
-3411152896,3411154943,CN
+3411150848,3411154943,HK
 3411154944,3411156991,JP
 3411156992,3411161087,PH
 3411161088,3411165183,PK
@@ -90721,8 +89444,7 @@
 3411607552,3411608575,CN
 3411608576,3411608831,IN
 3411608832,3411609087,AU
-3411609088,3411609599,HK
-3411609600,3411611647,CN
+3411609088,3411611647,HK
 3411611648,3411615743,ID
 3411615744,3411623935,JP
 3411623936,3411640319,AU
@@ -90781,12 +89503,7 @@
 3411860224,3411861503,JP
 3411861504,3411869695,AU
 3411869696,3411943423,CN
-3411943424,3411946495,NZ
-3411946496,3411947007,AU
-3411947008,3411948031,NZ
-3411948032,3411948543,AU
-3411948544,3411950591,NZ
-3411950592,3411951615,AU
+3411943424,3411951615,NZ
 3411951616,3411967999,LK
 3411968000,3411984383,AU
 3411984384,3412000767,IN
@@ -90805,7 +89522,8 @@
 3412253696,3412254719,JP
 3412254720,3412262911,NR
 3412262912,3412264959,JP
-3412264960,3412271103,CN
+3412264960,3412267007,HK
+3412267008,3412271103,CN
 3412271104,3412273151,NZ
 3412273152,3412275199,IN
 3412275200,3412279295,PK
@@ -90832,7 +89550,8 @@
 3412327936,3412328191,HK
 3412328192,3412328447,WS
 3412328448,3412336639,AU
-3412336640,3412342783,CN
+3412336640,3412340735,CN
+3412340736,3412342783,HK
 3412342784,3412343039,AU
 3412343040,3412343295,HK
 3412343552,3412343807,AU
@@ -90996,7 +89715,9 @@
 3413597696,3413597951,TW
 3413597952,3413602303,AU
 3413602304,3413602559,ID
-3413602560,3413639167,CN
+3413602560,3413604351,CN
+3413604352,3413606399,HK
+3413606400,3413639167,CN
 3413639168,3413704703,SG
 3413704704,3413737471,MY
 3413737472,3413753855,TH
@@ -91027,7 +89748,9 @@
 3414024192,3414024447,AU
 3414024448,3414040063,SG
 3414040064,3414040319,AP
-3414040320,3414050303,SG
+3414040320,3414048767,SG
+3414048768,3414049023,AP
+3414049024,3414050303,SG
 3414050304,3414050559,US
 3414050560,3414067199,SG
 3414067200,3414067455,AP
@@ -91040,7 +89763,7 @@
 3414188032,3414196223,CN
 3414196224,3414204415,AU
 3414204416,3414220799,KR
-3414220800,3414222847,CN
+3414220800,3414222847,HK
 3414222848,3414223871,AU
 3414223872,3414224895,KR
 3414224896,3414226943,VN
@@ -91048,7 +89771,7 @@
 3414227968,3414230015,PK
 3414230016,3414230527,PH
 3414230528,3414231039,KR
-3414231040,3414233087,CN
+3414231040,3414233087,HK
 3414233088,3414245375,AU
 3414245376,3414253567,HK
 3414253568,3414261759,JP
@@ -91203,7 +89926,7 @@
 3416274944,3416276991,ID
 3416276992,3416285183,HK
 3416285184,3416287231,VN
-3416287232,3416289279,CN
+3416287232,3416289279,HK
 3416289280,3416293375,NZ
 3416293376,3416293631,ID
 3416293632,3416293887,CN
@@ -91373,7 +90096,6 @@
 3417227264,3417243647,JP
 3417243648,3417244671,PH
 3417244672,3417245695,IN
-3417245696,3417247743,BT
 3417247744,3417251839,JP
 3417251840,3417260031,KR
 3417260032,3417264127,PK
@@ -91556,24 +90278,26 @@
 3418512336,3418513407,JP
 3418513408,3418517503,IN
 3418517504,3418519551,MN
-3418519552,3418521599,CN
-3418521600,3418554367,HK
+3418519552,3418554367,HK
 3418554368,3418570751,VN
 3418570752,3418578943,CN
 3418578944,3418583039,TH
-3418583040,3418585087,CN
+3418583040,3418585087,HK
 3418585088,3418586111,SG
 3418586112,3418586367,AU
 3418586368,3418586879,SG
 3418586880,3418587135,AU
-3418587136,3418623999,CN
+3418587136,3418621951,CN
+3418621952,3418623999,HK
 3418624000,3418626047,JP
 3418628096,3418636287,AU
 3418636288,3418642943,JP
 3418642944,3418643199,ID
 3418643200,3418643455,JP
 3418643456,3418644479,AU
-3418644480,3418649343,JP
+3418644480,3418644735,JP
+3418644736,3418644863,AU
+3418644864,3418649343,JP
 3418649344,3418649599,AP
 3418649600,3418650807,JP
 3418650808,3418650808,HK
@@ -91710,8 +90434,7 @@
 3419906048,3419914239,PK
 3419914240,3419922431,KR
 3419922432,3419924479,JP
-3419924480,3419926527,CN
-3419926528,3419930623,HK
+3419924480,3419930623,HK
 3419930624,3419971583,JP
 3419971584,3419979775,KR
 3419979776,3419996159,JP
@@ -91757,7 +90480,7 @@
 3420375808,3420377087,HK
 3420377088,3420389375,JP
 3420389376,3420393471,US
-3420393472,3420395519,CN
+3420393472,3420395519,HK
 3420395520,3420397567,JP
 3420397568,3420401663,KH
 3420401664,3420411903,JP
@@ -91785,7 +90508,9 @@
 3422850560,3422850815,GB
 3422850816,3422955519,US
 3422955520,3422956799,FR
-3422956800,3423092735,US
+3422956800,3423076351,US
+3423076352,3423077375,CA
+3423077376,3423092735,US
 3423092736,3423093759,VI
 3423093760,3423094783,US
 3423094784,3423095807,CA
@@ -91967,9 +90692,7 @@
 3427487744,3427487999,GB
 3427488000,3427618303,US
 3427618304,3427618559,CA
-3427618560,3427647999,US
-3427648000,3427648511,CA
-3427648512,3427651071,US
+3427618560,3427651071,US
 3427651072,3427651327,CA
 3427651328,3427729407,US
 3427729408,3427729663,CA
@@ -92162,8 +90885,8 @@
 3428589568,3428591871,US
 3428591872,3428592127,CA
 3428592128,3428592383,US
-3428592384,3428594175,CA
-3428594176,3428594687,US
+3428592384,3428593919,CA
+3428593920,3428594687,US
 3428594688,3428595199,CA
 3428595200,3428596223,US
 3428596224,3428596735,CA
@@ -92402,9 +91125,9 @@
 3432493824,3432495103,DE
 3432495104,3432517119,US
 3432517120,3432517631,MU
-3432517632,3432571647,US
-3432571648,3432571903,CA
-3432571904,3432585215,US
+3432517632,3432570879,US
+3432570880,3432572927,HK
+3432572928,3432585215,US
 3432585216,3432585727,MX
 3432585728,3432611839,US
 3432612864,3432613631,US
@@ -92669,7 +91392,9 @@
 3448398336,3448399103,CA
 3448399104,3448399359,US
 3448399360,3448399871,CA
-3448399872,3448500479,US
+3448399872,3448444143,US
+3448444144,3448444159,SG
+3448444160,3448500479,US
 3448500480,3448500735,SG
 3448500736,3448559103,US
 3448559104,3448559359,GB
@@ -93381,8 +92106,8 @@
 3456892928,3456958463,CA
 3456958464,3457551871,US
 3457551872,3457552127,CA
-3457552128,3457553151,US
-3457553152,3457553663,CA
+3457552128,3457553407,US
+3457553408,3457553663,CA
 3457553664,3457554175,US
 3457554176,3457554431,CA
 3457554432,3457555711,US
@@ -93425,7 +92150,8 @@
 3458820096,3458820351,CA
 3458820352,3458820863,US
 3458820864,3458821119,JM
-3458821120,3458821631,US
+3458821120,3458821887,US
+3458821888,3458822143,CA
 3458822144,3459055615,US
 3459055616,3459121151,CA
 3459121152,3459186687,US
@@ -93555,8 +92281,7 @@
 3459512320,3459513855,CA
 3459513856,3459592191,US
 3459592192,3459596287,CA
-3459596288,3459614719,US
-3459616768,3459617791,US
+3459596288,3459617791,US
 3459617792,3459617999,AP
 3459618000,3459618000,ID
 3459618001,3459618047,AP
@@ -93745,7 +92470,9 @@
 3461513728,3461513983,BF
 3461513984,3461514495,US
 3461514496,3461514751,QA
-3461514752,3461516287,US
+3461514752,3461515775,US
+3461515776,3461516031,CA
+3461516032,3461516287,US
 3461516288,3461516543,IL
 3461516544,3461554175,US
 3461554176,3461556223,CA
@@ -93837,7 +92564,9 @@
 3462634752,3462635007,SG
 3462635008,3462635263,US
 3462635264,3462635519,SG
-3462635520,3463004159,US
+3462635520,3462661375,US
+3462661376,3462661631,SG
+3462661632,3463004159,US
 3463004160,3463006207,CO
 3463006208,3463032319,US
 3463032320,3463032831,PR
@@ -93949,8 +92678,8 @@
 3465962496,3465962751,CA
 3465962752,3466067967,US
 3466067968,3466068223,CA
-3466068224,3466069071,US
-3466069072,3466069087,CA
+3466068224,3466069055,US
+3466069056,3466069087,CA
 3466069088,3466069343,US
 3466069344,3466069375,CA
 3466069376,3466069447,US
@@ -94178,11 +92907,11 @@
 3470610432,3470614527,AR
 3470614528,3470646591,US
 3470646592,3470646599,CN
-3470646600,3470651391,US
+3470646600,3470646831,US
+3470646832,3470646847,IL
+3470646848,3470651391,US
 3470651392,3470655487,CA
-3470655488,3470660647,US
-3470660648,3470660655,IE
-3470660656,3470671871,US
+3470655488,3470671871,US
 3470671872,3470680063,CA
 3470680064,3470744063,US
 3470744064,3470744575,CA
@@ -94326,7 +93055,13 @@
 3478192128,3478257663,CA
 3478257664,3478274823,US
 3478274824,3478274831,GB
-3478274832,3478288671,US
+3478274832,3478275983,US
+3478275984,3478275999,GB
+3478276000,3478286591,US
+3478286592,3478286847,GB
+3478286848,3478288607,US
+3478288608,3478288615,GB
+3478288616,3478288671,US
 3478288672,3478288703,GB
 3478288704,3478372351,US
 3478372352,3478380543,MX
@@ -94621,8 +93356,13 @@
 3484327936,3484419583,US
 3484419584,3484419839,A2
 3484419840,3484437503,US
-3484437504,3484442623,GB
-3484442624,3484450815,US
+3484437504,3484438527,GB
+3484438528,3484438783,ZM
+3484438784,3484439039,US
+3484439040,3484439295,GB
+3484439296,3484439551,US
+3484439552,3484439807,ZM
+3484439808,3484450815,US
 3484450816,3484451839,CA
 3484451840,3484452095,US
 3484452096,3484453631,CA
@@ -94982,7 +93722,9 @@
 3488940032,3488956415,CA
 3488956416,3488989183,US
 3488989184,3489005567,CA
-3489005568,3489136639,US
+3489005568,3489058047,US
+3489058048,3489058063,GB
+3489058064,3489136639,US
 3489136640,3489153535,MX
 3489153536,3489154047,HN
 3489154048,3489155583,MX
@@ -95224,8 +93966,8 @@
 3494198272,3494244351,US
 3494244352,3494246399,CA
 3494246400,3494247423,US
-3494247424,3494250495,CA
-3494251520,3494262783,US
+3494247424,3494252543,CA
+3494252544,3494262783,US
 3494262784,3494264831,CA
 3494264832,3494271999,US
 3494272000,3494273023,KN
@@ -95748,7 +94490,9 @@
 3507038208,3507040255,TW
 3507040256,3507290111,US
 3507290112,3507355647,AR
-3507355648,3507470335,US
+3507355648,3507427583,US
+3507427584,3507427839,CA
+3507427840,3507470335,US
 3507470336,3507486719,CA
 3507486720,3507585023,US
 3507585024,3507598911,CA
@@ -95948,8 +94692,7 @@
 3509520896,3509521151,CA
 3509521152,3509521407,US
 3509521408,3509521663,CA
-3509521664,3509522175,US
-3509522176,3509522431,CA
+3509521664,3509522431,US
 3509522432,3509522687,KW
 3509522688,3509522943,CA
 3509522944,3509524479,US
@@ -96365,7 +95108,9 @@
 3514592256,3514593279,SV
 3514593280,3514596863,US
 3514596864,3514597375,SV
-3514597376,3514732071,US
+3514597376,3514724635,US
+3514724636,3514724636,UA
+3514724637,3514732071,US
 3514732072,3514732075,UA
 3514732076,3514826751,US
 3514826752,3514843135,CA
@@ -96424,7 +95169,9 @@
 3516643084,3516643087,PR
 3516643088,3516899327,US
 3516899328,3516899839,A2
-3516899840,3516900095,NG
+3516899840,3516900031,NG
+3516900032,3516900063,US
+3516900064,3516900095,NG
 3516900096,3516900351,A2
 3516900352,3516900607,NG
 3516900608,3516900863,A2
@@ -96625,7 +95372,9 @@
 3517602560,3517602687,SE
 3517602688,3517602815,US
 3517602816,3517603071,SE
-3517603072,3517603583,US
+3517603072,3517603231,US
+3517603232,3517603327,SE
+3517603328,3517603583,US
 3517603584,3517603647,SE
 3517603648,3517603711,US
 3517603712,3517604095,SE
@@ -96645,7 +95394,9 @@
 3517609744,3517609751,US
 3517609752,3517610495,SE
 3517610496,3517611263,IE
-3517611264,3517612031,SE
+3517611264,3517611311,SE
+3517611312,3517611343,US
+3517611344,3517612031,SE
 3517612032,3517644799,US
 3517644800,3517710335,CA
 3517710336,3517718527,US
@@ -96688,11 +95439,13 @@
 3519351424,3519351455,GB
 3519351456,3519351551,US
 3519351552,3519351807,GB
-3519351808,3519381503,US
+3519351808,3519354909,US
+3519354910,3519354910,BR
+3519354911,3519381503,US
 3519381504,3519397887,CA
 3519397888,3519475711,US
 3519475712,3519476223,BH
-3519476224,3519477759,A2
+3519476224,3519477759,DE
 3519477760,3519578367,US
 3519578368,3519578623,NA
 3519578624,3519578879,US
@@ -96737,9 +95490,7 @@
 3520020480,3520036863,CA
 3520036864,3520356351,US
 3520356352,3520364543,ZA
-3520364544,3520369096,US
-3520369097,3520369097,A1
-3520369098,3520413439,US
+3520364544,3520413439,US
 3520413440,3520413695,CA
 3520413696,3520454655,US
 3520454656,3520462847,CA
@@ -96818,9 +95569,13 @@
 3522123520,3522123775,GB
 3522123776,3522125055,US
 3522125056,3522125311,GB
-3522125312,3522132395,US
+3522125312,3522131858,US
+3522131859,3522131859,DE
+3522131860,3522132395,US
 3522132396,3522132396,BR
-3522132397,3522174975,US
+3522132397,3522133663,US
+3522133664,3522133695,DE
+3522133696,3522174975,US
 3522174976,3522179071,BM
 3522179072,3522195455,US
 3522195456,3522199551,CA
@@ -97155,8 +95910,8 @@
 3557253120,3557261311,RU
 3557261312,3557277695,DE
 3557277696,3557283839,NL
-3557283840,3557284863,PL
-3557284864,3557285887,NL
+3557283840,3557285119,PL
+3557285120,3557285887,NL
 3557285888,3557294079,RU
 3557294080,3557302271,DE
 3557302272,3557310463,UA
@@ -97267,7 +96022,8 @@
 3557998592,3558006783,DE
 3558006784,3558010879,GB
 3558010880,3558012927,FR
-3558012928,3558014975,GB
+3558012928,3558013951,GB
+3558013952,3558014975,IL
 3558014976,3558023167,RU
 3558023168,3558031359,DE
 3558031360,3558039551,GB
@@ -97305,9 +96061,11 @@
 3558203392,3558211583,ES
 3558211584,3558219775,GB
 3558219776,3558227967,ES
-3558227968,3558232063,RU
-3558232064,3558234111,ES
-3558234112,3558234623,RU
+3558227968,3558228479,RU
+3558228480,3558228735,FR
+3558228736,3558232063,RU
+3558232064,3558232575,LB
+3558232576,3558234623,RU
 3558234624,3558234879,UA
 3558234880,3558235647,RU
 3558235648,3558235903,LB
@@ -97433,13 +96191,19 @@
 3559055360,3559063551,AM
 3559063552,3559079935,CH
 3559079936,3559088127,JO
-3559088128,3559090239,GB
+3559088128,3559089527,GB
+3559089528,3559089535,BE
+3559089536,3559089935,GB
+3559089936,3559089951,BE
+3559089952,3559090239,GB
 3559090240,3559090303,BE
 3559090304,3559093311,GB
 3559093312,3559093319,BE
 3559093320,3559093503,GB
 3559093504,3559093759,BE
-3559093760,3559095455,GB
+3559093760,3559094303,GB
+3559094304,3559094319,BE
+3559094320,3559095455,GB
 3559095456,3559095456,BE
 3559095457,3559096063,GB
 3559096064,3559096319,NL
@@ -97466,11 +96230,19 @@
 3559276544,3559284735,GB
 3559284736,3559292927,RU
 3559292928,3559301119,JO
-3559301120,3559309311,GB
+3559301120,3559303103,GB
+3559303104,3559303167,A1
+3559303168,3559303679,GB
+3559303680,3559303871,A1
+3559303872,3559306576,GB
+3559306577,3559306577,AT
+3559306578,3559309311,GB
 3559309312,3559317503,PL
 3559317504,3559325695,FI
 3559325696,3559333887,IT
-3559333888,3559342079,SE
+3559333888,3559336447,SE
+3559336448,3559336703,US
+3559336704,3559342079,SE
 3559342080,3559350271,BG
 3559350272,3559358463,BA
 3559358464,3559366655,FR
@@ -97541,8 +96313,8 @@
 3559899968,3559900031,UA
 3559900032,3559900095,EE
 3559900096,3559900223,UA
-3559900224,3559900287,EE
-3559900288,3559902719,UA
+3559900224,3559900351,EE
+3559900352,3559902719,UA
 3559902720,3559902975,EE
 3559902976,3559903231,UA
 3559903232,3559907327,EE
@@ -97602,8 +96374,8 @@
 3560325120,3560333311,DK
 3560333312,3560341503,RO
 3560341504,3560345855,GB
-3560345856,3560348159,US
-3560348160,3560357887,GB
+3560345856,3560348670,US
+3560348671,3560357887,GB
 3560357888,3560366079,GR
 3560366080,3560374271,CH
 3560374272,3560382463,ES
@@ -97888,7 +96660,8 @@
 3561947136,3561963519,DE
 3561963520,3561971711,BE
 3561971712,3561975807,CZ
-3561975808,3561979903,UA
+3561975808,3561976831,BG
+3561976832,3561979903,UA
 3561979904,3561988095,ES
 3561988096,3562004479,DE
 3562004480,3562012671,NL
@@ -97968,8 +96741,7 @@
 3562504192,3562507071,DE
 3562507072,3562507199,AT
 3562507200,3562512383,DE
-3562512384,3562519551,UA
-3562519552,3562520575,BG
+3562512384,3562520575,UA
 3562528768,3562536959,PL
 3562536960,3562545151,AT
 3562545152,3562553343,GB
@@ -98030,7 +96802,9 @@
 3563011072,3563012095,DE
 3563012096,3563020287,FR
 3563020288,3563028479,DE
-3563028480,3563036671,IR
+3563028480,3563033599,IR
+3563033600,3563034623,DE
+3563034624,3563036671,IR
 3563036672,3563044863,BG
 3563044864,3563053055,ES
 3563053056,3563061247,GB
@@ -98129,9 +96903,7 @@
 3563855872,3563864063,AT
 3563864064,3563872255,GB
 3563872256,3563880447,RU
-3563880448,3563884651,CY
-3563884652,3563884652,TR
-3563884653,3563888639,CY
+3563880448,3563888639,TR
 3563888640,3563896831,DE
 3563896832,3563913215,HU
 3563913216,3563921407,RU
@@ -98215,7 +96987,9 @@
 3564572428,3564572431,ES
 3564572432,3564572527,GB
 3564572528,3564572531,DK
-3564572532,3564576767,GB
+3564572532,3564574847,GB
+3564574848,3564574975,NL
+3564574976,3564576767,GB
 3564584960,3564593151,SA
 3564593152,3564601343,RU
 3564601344,3564609535,EE
@@ -98285,7 +97059,9 @@
 3564883200,3564883455,NL
 3564883456,3564886719,GB
 3564886720,3564886751,NL
-3564886752,3564889633,GB
+3564886752,3564888479,GB
+3564888480,3564888495,NL
+3564888496,3564889633,GB
 3564889634,3564889634,NL
 3564889635,3564892735,GB
 3564892736,3564892751,NL
@@ -98738,8 +97514,7 @@
 3567620352,3567626239,A2
 3567626240,3567626751,TZ
 3567626752,3567627263,A2
-3567627264,3567628287,LU
-3567628288,3567629311,GB
+3567627264,3567629311,LU
 3567629312,3567630335,A2
 3567630336,3567634431,LU
 3567634432,3567635455,GB
@@ -98879,7 +97654,9 @@
 3571655561,3571655561,RO
 3571655562,3571688383,DE
 3571688384,3571689215,ES
-3571689216,3571711999,DE
+3571689216,3571699711,DE
+3571699712,3571700735,GB
+3571700736,3571711999,DE
 3571712000,3571843071,GB
 3571843072,3571974143,ES
 3571974144,3571978239,RU
@@ -98956,9 +97733,9 @@
 3574136832,3574169599,DE
 3574169600,3574174839,GB
 3574174840,3574174847,ES
-3574174848,3574186803,GB
-3574186804,3574186804,ES
-3574186805,3574187007,GB
+3574174848,3574186799,GB
+3574186800,3574186815,ES
+3574186816,3574187007,GB
 3574187008,3574188031,ES
 3574188032,3574190591,GB
 3574190592,3574190847,EU
@@ -99348,7 +98125,9 @@
 3576096768,3576099071,EU
 3576099072,3576100863,GB
 3576100864,3576101375,EU
-3576101376,3576135679,GB
+3576101376,3576134653,GB
+3576134654,3576134654,CH
+3576134655,3576135679,GB
 3576135680,3576168447,DE
 3576168448,3576233983,GB
 3576233984,3576236543,FR
@@ -99390,7 +98169,9 @@
 3576365056,3576430591,TR
 3576430592,3576496127,FR
 3576496128,3576561663,IT
-3576561664,3576627199,NL
+3576561664,3576622100,NL
+3576622101,3576622101,GB
+3576622102,3576627199,NL
 3576627200,3576692735,AT
 3576692736,3576758271,GB
 3576758272,3576823807,BE
@@ -99449,9 +98230,7 @@
 3577641472,3577641983,FR
 3577641984,3577650047,EU
 3577650048,3577650063,NL
-3577650064,3577653247,EU
-3577653248,3577655295,IT
-3577655296,3577663487,EU
+3577650064,3577663487,EU
 3577663488,3577664511,SE
 3577664512,3577669631,EU
 3577669632,3577670655,BE
@@ -99499,7 +98278,9 @@
 3579197312,3579197439,US
 3579197440,3579248639,GB
 3579248640,3579346943,RU
-3579346944,3579445247,SE
+3579346944,3579362055,SE
+3579362056,3579362063,NO
+3579362064,3579445247,SE
 3579445248,3579478015,AT
 3579478016,3579527167,FR
 3579527168,3579543551,BA
@@ -99538,8 +98319,7 @@
 3580199936,3580200447,EE
 3580200448,3580201983,SE
 3580201984,3580203007,LT
-3580203008,3580203519,SE
-3580203520,3580204543,RU
+3580203008,3580204543,SE
 3580204544,3580205055,NL
 3580205056,3580206079,SE
 3580206080,3580207103,HR
@@ -99575,7 +98355,7 @@
 3580268544,3580272639,LV
 3580272640,3580276735,SE
 3580276736,3580280831,NL
-3580280832,3580329983,RU
+3580280832,3580329983,SE
 3580329984,3580338175,NL
 3580338176,3580338687,SE
 3580338688,3580339199,HR
@@ -99623,7 +98403,8 @@
 3580727296,3580731391,RU
 3580735488,3580739583,RO
 3580739584,3580743679,RU
-3580743680,3580751871,UA
+3580743680,3580747775,RO
+3580747776,3580751871,UA
 3580751872,3580755967,IR
 3580755968,3580772351,RU
 3580772352,3580780543,LV
@@ -99728,9 +98509,7 @@
 3582313872,3582320639,JE
 3582320640,3582328831,CH
 3582328832,3582337023,HU
-3582337024,3582343167,ES
-3582343168,3582343423,PT
-3582343424,3582345215,ES
+3582337024,3582345215,PT
 3582345216,3582353407,IT
 3582353408,3582361599,SE
 3582361600,3582377983,PL
@@ -100221,9 +99000,7 @@
 3585900544,3585906687,NO
 3585906688,3585907711,CZ
 3585907712,3585908735,NO
-3585908736,3585913855,FR
-3585913856,3585914367,GP
-3585914368,3585916671,FR
+3585908736,3585916671,GP
 3585916672,3585916927,MQ
 3585916928,3585925119,IT
 3585925120,3585933311,CH
@@ -100273,9 +99050,7 @@
 3586277376,3586293759,TR
 3586293760,3586310143,ES
 3586310144,3586326527,CZ
-3586326528,3586339839,IR
-3586339840,3586340863,RU
-3586340864,3586342911,IR
+3586326528,3586342911,IR
 3586342912,3586359295,ES
 3586359296,3586375679,PL
 3586375680,3586392063,CZ
@@ -100319,7 +99094,9 @@
 3586677656,3586679599,FR
 3586679600,3586679615,IT
 3586679616,3586680319,FR
-3586680320,3586680575,ES
+3586680320,3586680511,ES
+3586680512,3586680519,GB
+3586680520,3586680575,ES
 3586680576,3586681615,FR
 3586681616,3586681631,CZ
 3586681632,3586682239,FR
@@ -100402,8 +99179,11 @@
 3587242672,3587242679,DE
 3587242680,3587244031,GB
 3587244032,3587260415,IT
-3587260416,3587282943,DE
-3587282944,3587284991,PT
+3587260416,3587278591,DE
+3587278592,3587279359,US
+3587279360,3587279615,DE
+3587279616,3587280383,US
+3587280384,3587284991,DE
 3587284992,3587285216,EU
 3587285217,3587285217,US
 3587285218,3587285523,EU
@@ -100609,7 +99389,10 @@
 3589583104,3589583871,GB
 3589583872,3589584127,NL
 3589584128,3589586943,GB
-3589586944,3589603327,RS
+3589586944,3589587199,DE
+3589587200,3589599231,RS
+3589599232,3589601279,SE
+3589601280,3589603327,RS
 3589603328,3589668863,FR
 3589668864,3589677055,RU
 3589677056,3589685247,FR
@@ -100722,7 +99505,9 @@
 3624255488,3624257535,ZA
 3624257536,3624271871,US
 3624271872,3624272383,SY
-3624272384,3624272639,US
+3624272384,3624272447,US
+3624272448,3624272451,CA
+3624272452,3624272639,US
 3624272640,3624272895,DZ
 3624272896,3624281087,US
 3624281088,3624281343,HT
@@ -100747,7 +99532,9 @@
 3624298496,3624299519,PH
 3624299520,3624300031,US
 3624300032,3624300287,LY
-3624300288,3624302847,US
+3624300288,3624302335,US
+3624302336,3624302591,CA
+3624302592,3624302847,US
 3624302848,3624303103,MY
 3624303104,3624303871,US
 3624303872,3624304127,CA
@@ -100848,7 +99635,9 @@
 3626270720,3626287103,CA
 3626287104,3626332159,US
 3626332160,3626334207,CA
-3626334208,3626334463,US
+3626334208,3626334429,US
+3626334430,3626334430,CA
+3626334431,3626334463,US
 3626334464,3626336255,CA
 3626336256,3626508287,US
 3626508288,3626512383,CA
@@ -101053,24 +99842,16 @@
 3630073856,3630074111,CA
 3630074112,3630074879,US
 3630074880,3630075135,CA
-3630075136,3630075311,US
-3630075312,3630075327,CA
-3630075328,3630075391,US
-3630075392,3630075647,CA
-3630075648,3630076927,US
-3630076928,3630077439,CA
-3630077440,3630078463,US
+3630075136,3630076927,US
+3630076928,3630077183,CA
+3630077184,3630078463,US
 3630078464,3630078719,CA
-3630078720,3630078975,US
-3630078976,3630079039,CA
-3630079040,3630079407,US
-3630079408,3630079423,CA
-3630079424,3630080575,US
-3630080576,3630080639,CA
-3630080640,3630081151,US
-3630081152,3630081791,CA
-3630081792,3630082047,US
-3630082048,3630082559,CA
+3630078720,3630081151,US
+3630081152,3630081279,CA
+3630081280,3630081535,US
+3630081536,3630081791,CA
+3630081792,3630082303,US
+3630082304,3630082559,CA
 3630082560,3630082815,US
 3630082816,3630083071,CA
 3630083072,3630083583,US
@@ -101124,31 +99905,29 @@
 3630151680,3630152191,CA
 3630152192,3630152703,US
 3630152704,3630153215,CA
-3630153216,3630155775,US
-3630155776,3630158335,CA
-3630158336,3630159103,US
-3630159104,3630159359,CA
-3630159360,3630159615,US
+3630153216,3630156287,US
+3630156288,3630156543,CA
+3630156544,3630157311,US
+3630157312,3630157567,CA
+3630157568,3630158079,US
+3630158080,3630158335,CA
+3630158336,3630159615,US
 3630159616,3630159871,CA
 3630159872,3630160127,US
 3630160128,3630160383,CA
-3630160384,3630160639,US
-3630160640,3630160895,CA
-3630160896,3630161151,US
-3630161152,3630161919,CA
-3630161920,3630162431,US
-3630162432,3630162943,CA
-3630162944,3630163199,US
+3630160384,3630161151,US
+3630161152,3630161407,CA
+3630161408,3630162431,US
+3630162432,3630162687,CA
+3630162688,3630163199,US
 3630163200,3630163455,CA
 3630163456,3630163711,US
-3630163712,3630164735,CA
-3630164736,3630164991,US
-3630164992,3630166527,CA
-3630166528,3630167007,US
-3630167008,3630167023,CA
-3630167024,3630168319,US
-3630168320,3630169087,CA
-3630169088,3630169855,US
+3630163712,3630163967,CA
+3630163968,3630164991,US
+3630164992,3630165247,CA
+3630165248,3630165503,US
+3630165504,3630166015,CA
+3630166016,3630169855,US
 3630169856,3630170111,CA
 3630170112,3630309375,US
 3630309376,3630317567,CA
@@ -101196,8 +99975,8 @@
 3631667200,3631667455,US
 3631667456,3631668223,CA
 3631668224,3631668479,US
-3631668480,3631668991,CA
-3631668992,3631669247,US
+3631668480,3631668735,CA
+3631668736,3631669247,US
 3631669248,3631669807,A2
 3631669808,3631669823,EC
 3631669824,3631670527,A2
@@ -101296,7 +100075,9 @@
 3633552640,3633552895,A2
 3633552896,3633757439,US
 3633757440,3633757695,IN
-3633757696,3633815807,US
+3633757696,3633757951,US
+3633757952,3633758207,PH
+3633758208,3633815807,US
 3633815808,3633816063,CA
 3633816064,3633817087,US
 3633817088,3633817343,CA
@@ -101325,7 +100106,8 @@
 3634094080,3634098175,SE
 3634098176,3634511871,US
 3634511872,3634515967,CA
-3634515968,3634552831,US
+3634515968,3634524159,US
+3634528256,3634552831,US
 3634552832,3634556927,CA
 3634556928,3634741247,US
 3634741248,3634749439,CA
@@ -101488,7 +100270,9 @@
 3635965952,3635966975,US
 3635966976,3635967999,PY
 3635968000,3635970047,SV
-3635970048,3636019199,US
+3635970048,3636014553,US
+3636014554,3636014554,EU
+3636014555,3636019199,US
 3636019200,3636027391,CA
 3636027392,3636027647,US
 3636027648,3636029439,SG
@@ -101532,7 +100316,9 @@
 3636158208,3636158215,CA
 3636158216,3636158463,US
 3636158464,3636158719,CA
-3636158720,3636158975,US
+3636158720,3636158871,US
+3636158872,3636158879,CA
+3636158880,3636158975,US
 3636158976,3636159743,CA
 3636159744,3636160511,US
 3636160512,3636160767,CA
@@ -101542,9 +100328,7 @@
 3636163584,3636164095,CA
 3636164096,3636164327,US
 3636164328,3636164335,CA
-3636164336,3636165119,US
-3636165120,3636165375,CA
-3636165376,3636166143,US
+3636164336,3636166143,US
 3636166144,3636166655,CA
 3636166656,3636206079,US
 3636206080,3636206335,AU
@@ -101605,7 +100389,9 @@
 3638247936,3638248703,GB
 3638248704,3638249215,US
 3638249216,3638249471,GB
-3638249472,3638304767,US
+3638249472,3638250559,US
+3638250560,3638250623,GB
+3638250624,3638304767,US
 3638304768,3638312959,CA
 3638312960,3638349823,US
 3638349824,3638350079,AU
@@ -101615,7 +100401,9 @@
 3638399744,3638399999,CH
 3638400000,3638401087,US
 3638401088,3638401119,CA
-3638401120,3638509567,US
+3638401120,3638500125,US
+3638500126,3638500126,CA
+3638500127,3638509567,US
 3638509568,3638526719,CA
 3638526720,3638526975,US
 3638526976,3638534143,CA
@@ -101670,7 +100458,8 @@
 3639402240,3639402495,GH
 3639402496,3639513239,US
 3639513240,3639513243,AE
-3639513244,3639533567,US
+3639513244,3639525375,US
+3639529472,3639533567,US
 3639533568,3639537663,CA
 3639537664,3639550207,US
 3639550208,3639550215,AR
@@ -101680,7 +100469,9 @@
 3639550248,3639550311,US
 3639550312,3639550319,AU
 3639550320,3639554559,US
-3639554560,3639554815,GB
+3639554560,3639554748,GB
+3639554749,3639554749,US
+3639554750,3639554815,GB
 3639554816,3639555839,US
 3639555840,3639555847,AR
 3639555848,3639555855,BR
@@ -101839,7 +100630,10 @@
 3641483264,3641491455,IT
 3641491456,3641493503,UA
 3641493504,3641494015,NL
-3641494016,3641499647,UA
+3641494016,3641494527,BG
+3641494528,3641495551,UA
+3641495552,3641496063,NL
+3641496064,3641499647,UA
 3641499648,3641503743,SA
 3641503744,3641507839,RU
 3641507840,3641516031,NO
@@ -101927,7 +100721,6 @@
 3641835520,3641839615,IT
 3641839616,3641843711,GB
 3641843712,3641847807,ES
-3641847808,3641851903,IT
 3641851904,3641855999,NL
 3641856000,3641860095,GB
 3641860096,3641868287,IT
@@ -102099,7 +100892,9 @@
 3642554199,3642554199,RU
 3642554200,3642554367,UA
 3642554368,3642554623,LT
-3642554624,3642556415,UA
+3642554624,3642554720,UA
+3642554721,3642554721,LV
+3642554722,3642556415,UA
 3642556416,3642560511,CZ
 3642560512,3642561535,KG
 3642561536,3642561791,US
@@ -102236,17 +101031,14 @@
 3645169664,3645173759,CH
 3645173760,3645177855,GB
 3645177856,3645181951,GR
-3645181952,3645183375,FR
-3645183376,3645183383,SA
-3645183384,3645185759,FR
+3645181952,3645185759,FR
 3645185760,3645185775,GB
 3645185776,3645186047,FR
 3645186048,3645190143,GB
 3645190144,3645194239,FI
 3645194240,3645202431,DE
 3645202432,3645206527,CZ
-3645206528,3645208575,LV
-3645208576,3645210623,LT
+3645206528,3645210623,LV
 3645210624,3645214719,RU
 3645214720,3645218815,NL
 3645218816,3645222911,DE
@@ -102280,7 +101072,9 @@
 3645329408,3645333503,CH
 3645333504,3645334271,EU
 3645334272,3645335039,DE
-3645335040,3645337599,EU
+3645335040,3645335687,EU
+3645335688,3645335691,DE
+3645335692,3645337599,EU
 3645337600,3645341695,FR
 3645341696,3645345791,RU
 3645345792,3645349887,FI
@@ -102348,7 +101142,7 @@
 3645616128,3645620223,AT
 3645620224,3645624319,BA
 3645624320,3645628415,CZ
-3645628416,3645636607,ES
+3645628416,3645636607,PT
 3645636608,3645640703,AM
 3645640704,3645644799,NL
 3645644800,3645648895,RU
@@ -102417,6 +101211,7 @@
 3645767680,3645771775,IE
 3645771776,3645779967,SE
 3645779968,3645784063,PS
+3645784064,3645788159,DJ
 3645788160,3645792255,GB
 3645792256,3645796351,TR
 3645796352,3645800447,CH
@@ -102517,12 +101312,16 @@
 3647987656,3647987695,DE
 3647987696,3647987711,ES
 3647987712,3647988735,IT
-3647988736,3647989759,BE
-3647989760,3647995903,DE
+3647988736,3647989063,DE
+3647989064,3647989071,BE
+3647989072,3647989247,DE
+3647989248,3647989503,BE
+3647989504,3647995903,DE
 3647995904,3648004095,RU
 3648004096,3648007167,GB
 3648007168,3648007679,US
-3648007680,3648008191,GB
+3648007680,3648007935,RU
+3648007936,3648008191,GB
 3648008192,3648016383,FR
 3648016384,3648020479,GB
 3648020480,3648024575,IT
@@ -102531,7 +101330,9 @@
 3648032768,3648033023,IE
 3648033024,3648034887,EU
 3648034888,3648034895,IE
-3648034896,3648036863,EU
+3648034896,3648036095,EU
+3648036096,3648036351,IE
+3648036352,3648036863,EU
 3648036864,3648040959,CZ
 3648040960,3648045055,BE
 3648045056,3648049151,FI
@@ -102552,15 +101353,16 @@
 3648080896,3648081023,ZM
 3648081024,3648081055,GA
 3648081056,3648081151,ZM
-3648081152,3648082239,BE
+3648081152,3648081407,BE
+3648081408,3648081663,CG
+3648081664,3648082239,BE
 3648082240,3648082311,NE
 3648082312,3648082431,BE
 3648082432,3648082479,ZM
 3648082480,3648084223,BE
 3648084224,3648084479,CD
 3648084480,3648084991,BE
-3648084992,3648085759,GB
-3648085760,3648086015,ZM
+3648084992,3648086015,GB
 3648086016,3648090111,AT
 3648090112,3648094207,RU
 3648094208,3648102399,PL
@@ -102614,8 +101416,7 @@
 3648282624,3648286719,PL
 3648286720,3648290815,DE
 3648290816,3648299007,RU
-3648299008,3648301055,FI
-3648301056,3648303103,CZ
+3648299008,3648303103,FI
 3648303104,3648307199,AT
 3648307200,3648311295,TR
 3648311296,3648323583,DK
@@ -102640,7 +101441,9 @@
 3648397312,3648405503,NO
 3648405504,3648413695,RU
 3648413696,3648417791,SK
-3648417792,3648425983,GB
+3648417792,3648419903,GB
+3648419904,3648419935,BE
+3648419936,3648425983,GB
 3648425984,3648430079,IT
 3648430080,3648434175,NL
 3648434176,3648438271,RU
@@ -102735,7 +101538,7 @@
 3650225408,3650225663,BR
 3650225664,3650226175,TR
 3650226176,3650226431,RS
-3650226432,3650226687,AT
+3650226432,3650226687,SG
 3650226688,3650227455,IN
 3650227456,3650227711,PL
 3650227712,3650227967,PT
@@ -102861,7 +101664,9 @@
 3650611836,3650611836,RU
 3650611837,3650611866,LB
 3650611867,3650611867,RU
-3650611868,3650611947,LB
+3650611868,3650611920,LB
+3650611921,3650611921,RU
+3650611922,3650611947,LB
 3650611948,3650611948,RU
 3650611949,3650611967,LB
 3650611968,3650613247,RU
@@ -102876,7 +101681,12 @@
 3650920448,3650920457,FR
 3650920458,3650920458,GB
 3650920459,3650920703,FR
-3650920704,3650920959,LB
+3650920704,3650920895,LB
+3650920896,3650920896,US
+3650920897,3650920897,GR
+3650920898,3650920898,GB
+3650920899,3650920927,GR
+3650920928,3650920959,LB
 3650920960,3650922799,GB
 3650922800,3650922815,FR
 3650922816,3650926591,GB
@@ -102892,7 +101702,9 @@
 3650939600,3650939607,FR
 3650939608,3650939615,TR
 3650939616,3650940927,GB
-3650940928,3650941183,NL
+3650940928,3650941177,NL
+3650941178,3650941178,GB
+3650941179,3650941183,NL
 3650941184,3650945023,GB
 3650945024,3651010559,DK
 3651010560,3651076095,GB
@@ -103051,8 +101863,8 @@
 3652014080,3652018175,SA
 3652018176,3652022271,IE
 3652022272,3652026367,ES
-3652026368,3652032511,DE
-3652032512,3652033791,NL
+3652026368,3652032767,DE
+3652032768,3652033791,NL
 3652033792,3652034559,DE
 3652034560,3652046847,PL
 3652046848,3652050943,IE
@@ -103104,7 +101916,9 @@
 3653238784,3653369855,CH
 3653369856,3653373951,IT
 3653373952,3653378047,NL
-3653378048,3653382143,DE
+3653378048,3653378674,DE
+3653378675,3653378675,EU
+3653378676,3653382143,DE
 3653382144,3653386239,CH
 3653386240,3653390335,DE
 3653390336,3653394431,FR
@@ -103119,7 +101933,9 @@
 3653410816,3653414911,CZ
 3653414912,3653419007,IT
 3653419008,3653423103,IL
-3653423104,3653427199,GB
+3653423104,3653426687,GB
+3653426688,3653426815,A1
+3653426816,3653427199,GB
 3653427200,3653431295,DE
 3653431296,3653435391,RU
 3653435392,3653439487,DE
@@ -103129,9 +101945,7 @@
 3653451776,3653464063,RU
 3653464064,3653468159,NL
 3653468160,3653472255,GR
-3653472256,3653473023,NL
 3653473024,3653473279,US
-3653473280,3653476351,NL
 3653476352,3653480447,CZ
 3653480448,3653484543,DK
 3653484544,3653488639,TR
@@ -103344,7 +102158,9 @@
 3680403456,3680436223,JP
 3680436224,3680501759,MY
 3680501760,3682554623,JP
-3682554624,3682554879,AP
+3682554624,3682554770,AP
+3682554771,3682554771,JP
+3682554772,3682554879,AP
 3682554880,3682598911,JP
 3682598912,3684696063,CN
 3684696064,3688366079,JP
@@ -103536,7 +102352,9 @@
 3743121408,3743125503,MY
 3743125504,3743129599,ID
 3743129600,3743130623,HK
-3743130624,3743133695,SG
+3743130624,3743130879,SG
+3743130880,3743131135,HK
+3743131136,3743133695,SG
 3743133696,3743134719,AU
 3743134720,3743135743,JP
 3743135744,3743136767,CN
diff --git a/installer/resources/geoipv6.dat.gz b/installer/resources/geoipv6.dat.gz
index e3444aa2848596ed63405e195def448928decfc9..7dcea2b10538f32338edaaaebc1cbcef28546820 100644
Binary files a/installer/resources/geoipv6.dat.gz and b/installer/resources/geoipv6.dat.gz differ
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index c06e3b761f00caa48171d0afcb12e2cb61250cfa..98dfd46f094ae75e006d147c3900344f7e29d451 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -143,6 +143,11 @@ if [ ! -n $LANG ]; then
         done
 fi
 
+# Mac OSX 10.10 requires the parameter bellow to run without a icon in the Dock.
+if [ "`uname -s`" = "Darwin" ]; then
+    export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+fi
+
 # When installing on On Mac OSX platforms, the following domain will be used to
 #  prefix the plist file name.
 PLIST_DOMAIN=org.tanukisoftware.wrapper
diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po
index 7428e2f1254852b32aa94219c9d2b87402421860..81921f7f7ca87f27761f1637b9944a1d5417d146 100644
--- a/installer/resources/locale/po/messages_en.po
+++ b/installer/resources/locale/po/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P startup script\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-23 13:45+0000\n"
+"POT-Creation-Date: 2015-02-18 20:15+0000\n"
 "PO-Revision-Date: 2012-12-21 23:34+0000\n"
 "Last-Translator: kytv <killyourtv@mail.i2p>\n"
 "Language-Team: English \n"
@@ -18,180 +18,180 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../i2prouter:216
+#: ../i2prouter:221
 msgid "Failed to load the wrapper"
 msgstr ""
 
-#: ../i2prouter:938 ../i2prouter:962 ../i2prouter:1036 ../i2prouter:1064
-#: ../i2prouter:1085
+#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069
+#: ../i2prouter:1090
 #, sh-format
 msgid "$APP_LONG_NAME is already running."
 msgstr ""
 
-#: ../i2prouter:949
+#: ../i2prouter:954
 #, sh-format
 msgid "Running $APP_LONG_NAME"
 msgstr ""
 
-#: ../i2prouter:969
+#: ../i2prouter:974
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME"
 msgstr ""
 
-#: ../i2prouter:1016
+#: ../i2prouter:1021
 #, sh-format
 msgid "WARNING: $APP_LONG_NAME may have failed to start."
 msgstr ""
 
-#: ../i2prouter:1030 ../i2prouter:1058 ../i2prouter:1264 ../i2prouter:1553
+#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558
 msgid "Must be root to perform this action."
 msgstr ""
 
-#: ../i2prouter:1074
+#: ../i2prouter:1079
 #, sh-format
 msgid "Starting $APP_LONG_NAME"
 msgstr ""
 
-#: ../i2prouter:1096
+#: ../i2prouter:1101
 #, sh-format
 msgid "Stopping $APP_LONG_NAME"
 msgstr ""
 
-#: ../i2prouter:1100 ../i2prouter:1168 ../i2prouter:1721
+#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726
 #, sh-format
 msgid "$APP_LONG_NAME was not running."
 msgstr ""
 
-#: ../i2prouter:1113 ../i2prouter:1121 ../i2prouter:1183 ../i2prouter:1191
+#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196
 #, sh-format
 msgid "Unable to stop $APP_LONG_NAME."
 msgstr ""
 
-#: ../i2prouter:1139
+#: ../i2prouter:1144
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME to exit"
 msgstr ""
 
-#: ../i2prouter:1153
+#: ../i2prouter:1158
 #, sh-format
 msgid "Failed to stop $APP_LONG_NAME."
 msgstr ""
 
-#: ../i2prouter:1156
+#: ../i2prouter:1161
 #, sh-format
 msgid "Stopped $APP_LONG_NAME."
 msgstr ""
 
-#: ../i2prouter:1164
+#: ../i2prouter:1169
 #, sh-format
 msgid "Stopping $APP_LONG_NAME gracefully"
 msgstr ""
 
-#: ../i2prouter:1210
+#: ../i2prouter:1215
 #, sh-format
 msgid "$APP_LONG_NAME is not running."
 msgstr ""
 
-#: ../i2prouter:1215
+#: ../i2prouter:1220
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid"
 msgstr ""
 
-#: ../i2prouter:1218
+#: ../i2prouter:1223
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
 msgstr ""
 
-#: ../i2prouter:1271 ../i2prouter:1283 ../i2prouter:1302 ../i2prouter:1319
-#: ../i2prouter:1386 ../i2prouter:1406 ../i2prouter:1420 ../i2prouter:1434
-#: ../i2prouter:1462 ../i2prouter:1500 ../i2prouter:1535
+#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324
+#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439
+#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is already installed."
 msgstr ""
 
-#: ../i2prouter:1274 ../i2prouter:1289 ../i2prouter:1391 ../i2prouter:1423
-#: ../i2prouter:1437 ../i2prouter:1451 ../i2prouter:1465 ../i2prouter:1503
-#: ../i2prouter:1538
+#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428
+#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508
+#: ../i2prouter:1543
 #, sh-format
 msgid "Installing the $APP_LONG_NAME daemon"
 msgstr ""
 
-#: ../i2prouter:1545
+#: ../i2prouter:1550
 #, sh-format
 msgid "Install not currently supported for $DIST_OS"
 msgstr ""
 
-#: ../i2prouter:1561 ../i2prouter:1574 ../i2prouter:1588 ../i2prouter:1597
-#: ../i2prouter:1607 ../i2prouter:1631 ../i2prouter:1644 ../i2prouter:1656
-#: ../i2prouter:1674 ../i2prouter:1687 ../i2prouter:1701
+#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602
+#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661
+#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706
 #, sh-format
 msgid "Removing $APP_LONG_NAME daemon"
 msgstr ""
 
-#: ../i2prouter:1567 ../i2prouter:1582 ../i2prouter:1591 ../i2prouter:1601
-#: ../i2prouter:1612 ../i2prouter:1625 ../i2prouter:1637 ../i2prouter:1650
-#: ../i2prouter:1668 ../i2prouter:1681 ../i2prouter:1695 ../i2prouter:1706
+#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606
+#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655
+#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is not currently installed."
 msgstr ""
 
-#: ../i2prouter:1710
+#: ../i2prouter:1715
 #, sh-format
 msgid "Remove not currently supported for $DIST_OS"
 msgstr ""
 
-#: ../i2prouter:1797
+#: ../i2prouter:1802
 msgid "Commands:"
 msgstr ""
 
-#: ../i2prouter:1798
+#: ../i2prouter:1803
 msgid "Launch in the current console."
 msgstr ""
 
-#: ../i2prouter:1799
+#: ../i2prouter:1804
 msgid "Start in the background as a daemon process."
 msgstr ""
 
-#: ../i2prouter:1800
+#: ../i2prouter:1805
 msgid "Stop if running as a daemon or in another console."
 msgstr ""
 
-#: ../i2prouter:1801
+#: ../i2prouter:1806
 msgid "Stop gracefully, may take up to 11 minutes."
 msgstr ""
 
-#: ../i2prouter:1802
+#: ../i2prouter:1807
 msgid "Stop if running and then start."
 msgstr ""
 
-#: ../i2prouter:1803
+#: ../i2prouter:1808
 msgid "Restart only if already running."
 msgstr ""
 
-#: ../i2prouter:1804
+#: ../i2prouter:1809
 msgid "Query the current status."
 msgstr ""
 
-#: ../i2prouter:1805
+#: ../i2prouter:1810
 msgid "Install to start automatically when system boots."
 msgstr ""
 
-#: ../i2prouter:1806
+#: ../i2prouter:1811
 msgid "Uninstall."
 msgstr ""
 
-#: ../i2prouter:1807
+#: ../i2prouter:1812
 msgid "Request a Java thread dump if running."
 msgstr ""
 
-#: ../i2prouter:1820
+#: ../i2prouter:1825
 msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
-#: ../i2prouter:1825
+#: ../i2prouter:1830
 msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
-#: ../i2prouter:1828
+#: ../i2prouter:1833
 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_id.po b/installer/resources/locale/po/messages_id.po
new file mode 100644
index 0000000000000000000000000000000000000000..877ee8d66e0a5aa71fd5981c525c47151f00e9f8
--- /dev/null
+++ b/installer/resources/locale/po/messages_id.po
@@ -0,0 +1,198 @@
+# I2P
+# Copyright (C) 2012 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Khairul Agasta <khairuldroids@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2014-08-29 06:04+0000\n"
+"Last-Translator: Khairul Agasta <khairuldroids@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../i2prouter:221
+msgid "Failed to load the wrapper"
+msgstr "Gagal memuat wrapper"
+
+#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069
+#: ../i2prouter:1090
+#, sh-format
+msgid "$APP_LONG_NAME is already running."
+msgstr "$APP_LONG_NAME sudah berjalan."
+
+#: ../i2prouter:954
+#, sh-format
+msgid "Running $APP_LONG_NAME"
+msgstr "Menjalankan $APP_LONG_NAME"
+
+#: ../i2prouter:974
+#, sh-format
+msgid "Waiting for $APP_LONG_NAME"
+msgstr "Menunggu $APP_LONG_NAME"
+
+#: ../i2prouter:1021
+#, sh-format
+msgid "WARNING: $APP_LONG_NAME may have failed to start."
+msgstr "PERINGATAN: $APP_LONG_NAME mungkin gagal memulai."
+
+#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558
+msgid "Must be root to perform this action."
+msgstr "Harus sudah root untuk melaksanakan tindakan ini."
+
+#: ../i2prouter:1079
+#, sh-format
+msgid "Starting $APP_LONG_NAME"
+msgstr "Memulai $APP_LONG_NAME"
+
+#: ../i2prouter:1101
+#, sh-format
+msgid "Stopping $APP_LONG_NAME"
+msgstr "Menghentikan $APP_LONG_NAME"
+
+#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726
+#, sh-format
+msgid "$APP_LONG_NAME was not running."
+msgstr "$APP_LONG_NAME tidak berjalan."
+
+#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196
+#, sh-format
+msgid "Unable to stop $APP_LONG_NAME."
+msgstr "Tidak dapat menghentikan $APP_LONG_NAME."
+
+#: ../i2prouter:1144
+#, sh-format
+msgid "Waiting for $APP_LONG_NAME to exit"
+msgstr "Menunggu $APP_LONG_NAME untuk mengakhiri"
+
+#: ../i2prouter:1158
+#, sh-format
+msgid "Failed to stop $APP_LONG_NAME."
+msgstr "Gagal menghentikan $APP_LONG_NAME."
+
+#: ../i2prouter:1161
+#, sh-format
+msgid "Stopped $APP_LONG_NAME."
+msgstr "$APP_LONG_NAME dihentikan."
+
+#: ../i2prouter:1169
+#, sh-format
+msgid "Stopping $APP_LONG_NAME gracefully"
+msgstr "Menghentikan $APP_LONG_NAME dengan halus"
+
+#: ../i2prouter:1215
+#, sh-format
+msgid "$APP_LONG_NAME is not running."
+msgstr "$APP_LONG_NAME tidak berjalan."
+
+#: ../i2prouter:1220
+#, sh-format
+msgid "$APP_LONG_NAME is running: PID:$pid"
+msgstr "$APP_LONG_NAME sedang berjalan: PID:$pid"
+
+#: ../i2prouter:1223
+#, sh-format
+msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
+msgstr "$APP_LONG_NAME sudah berjalan: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
+
+#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324
+#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439
+#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540
+#, sh-format
+msgid "The $APP_LONG_NAME daemon is already installed."
+msgstr "Daemon $APP_LONG_NAME sudah terpasang."
+
+#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428
+#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508
+#: ../i2prouter:1543
+#, sh-format
+msgid "Installing the $APP_LONG_NAME daemon"
+msgstr "Memasang daemon $APP_LONG_NAME"
+
+#: ../i2prouter:1550
+#, sh-format
+msgid "Install not currently supported for $DIST_OS"
+msgstr "Memasang saat ini tidak didukung untuk $DIST_OS"
+
+#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602
+#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661
+#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706
+#, sh-format
+msgid "Removing $APP_LONG_NAME daemon"
+msgstr "Menghapus daemon $APP_LONG_NAME"
+
+#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606
+#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655
+#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711
+#, sh-format
+msgid "The $APP_LONG_NAME daemon is not currently installed."
+msgstr "Daemon $APP_LONG_NAME saat ini belum dipasang"
+
+#: ../i2prouter:1715
+#, sh-format
+msgid "Remove not currently supported for $DIST_OS"
+msgstr "Menghapus saat ini tidak didukung untuk $DIST_OS"
+
+#: ../i2prouter:1802
+msgid "Commands:"
+msgstr "Perintah:"
+
+#: ../i2prouter:1803
+msgid "Launch in the current console."
+msgstr "Luncurkan dalam konsol saat ini."
+
+#: ../i2prouter:1804
+msgid "Start in the background as a daemon process."
+msgstr "Mulai di latar sebagai proses daemon."
+
+#: ../i2prouter:1805
+msgid "Stop if running as a daemon or in another console."
+msgstr "Hentikan jika berjalan sebagai daemon atau pada konsol lain."
+
+#: ../i2prouter:1806
+msgid "Stop gracefully, may take up to 11 minutes."
+msgstr "Menghentikan dengan halus,  bisa memakan waktu hingga 11 menit."
+
+#: ../i2prouter:1807
+msgid "Stop if running and then start."
+msgstr "Hentikan jika berjalan dan kemudian memulainya."
+
+#: ../i2prouter:1808
+msgid "Restart only if already running."
+msgstr "Memulai ulang hanya jika sudah berjalan."
+
+#: ../i2prouter:1809
+msgid "Query the current status."
+msgstr "Menanyakan status saat ini."
+
+#: ../i2prouter:1810
+msgid "Install to start automatically when system boots."
+msgstr "Pasang untuk memulai secara otomatis ketika sistem boot."
+
+#: ../i2prouter:1811
+msgid "Uninstall."
+msgstr "Copot."
+
+#: ../i2prouter:1812
+msgid "Request a Java thread dump if running."
+msgstr "Meminta thread buangan Java jika berjalan."
+
+#: ../i2prouter:1825
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Silahkan mengedit i2prouter dan setel variabel RUN_AS_USER"
+
+#: ../i2prouter:1830
+msgid "Running I2P as the root user is *not* recommended."
+msgstr "Menjalankan I2P sebagai pengguna root adalah *tidak* direkomendasikan."
+
+#: ../i2prouter:1833
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr "Untuk menjalankan sebagai root, edit i2prouter dan setel ALLOW_ROOT=true."
diff --git a/installer/resources/locale/po/messages_nl.po b/installer/resources/locale/po/messages_nl.po
new file mode 100644
index 0000000000000000000000000000000000000000..1b56d3ff6871ddf0f7b6c84ed9dc0b5b303a1228
--- /dev/null
+++ b/installer/resources/locale/po/messages_nl.po
@@ -0,0 +1,198 @@
+# I2P
+# Copyright (C) 2012 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Nathan Follens, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-06 18:28+0000\n"
+"PO-Revision-Date: 2015-01-18 10:33+0000\n"
+"Last-Translator: Nathan Follens\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../i2prouter:221
+msgid "Failed to load the wrapper"
+msgstr "Laden van wrapper mislukt"
+
+#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069
+#: ../i2prouter:1090
+#, sh-format
+msgid "$APP_LONG_NAME is already running."
+msgstr "$APP_LONG_NAME draait al."
+
+#: ../i2prouter:954
+#, sh-format
+msgid "Running $APP_LONG_NAME"
+msgstr "$APP_LONG_NAME draaien"
+
+#: ../i2prouter:974
+#, sh-format
+msgid "Waiting for $APP_LONG_NAME"
+msgstr "Wachten op $APP_LONG_NAME"
+
+#: ../i2prouter:1021
+#, sh-format
+msgid "WARNING: $APP_LONG_NAME may have failed to start."
+msgstr "WAARSCHUWING: $APP_LONG_NAME is misschien niet gestart."
+
+#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558
+msgid "Must be root to perform this action."
+msgstr "Root vereist om deze handeling uit te voeren."
+
+#: ../i2prouter:1079
+#, sh-format
+msgid "Starting $APP_LONG_NAME"
+msgstr "$APP_LONG_NAME starten"
+
+#: ../i2prouter:1101
+#, sh-format
+msgid "Stopping $APP_LONG_NAME"
+msgstr "$APP_LONG_NAME stoppen"
+
+#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726
+#, sh-format
+msgid "$APP_LONG_NAME was not running."
+msgstr "$APP_LONG_NAME draaide niet."
+
+#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196
+#, sh-format
+msgid "Unable to stop $APP_LONG_NAME."
+msgstr "Kon $APP_LONG_NAME niet stoppen."
+
+#: ../i2prouter:1144
+#, sh-format
+msgid "Waiting for $APP_LONG_NAME to exit"
+msgstr "Wachten op $APP_LONG_NAME om af te sluiten"
+
+#: ../i2prouter:1158
+#, sh-format
+msgid "Failed to stop $APP_LONG_NAME."
+msgstr "Stoppen van $APP_LONG_NAME mislukt."
+
+#: ../i2prouter:1161
+#, sh-format
+msgid "Stopped $APP_LONG_NAME."
+msgstr "$APP_LONG_NAME gestopt."
+
+#: ../i2prouter:1169
+#, sh-format
+msgid "Stopping $APP_LONG_NAME gracefully"
+msgstr "$APP_LONG_NAME sierlijk stoppen"
+
+#: ../i2prouter:1215
+#, sh-format
+msgid "$APP_LONG_NAME is not running."
+msgstr "$APP_LONG_NAME draait niet."
+
+#: ../i2prouter:1220
+#, sh-format
+msgid "$APP_LONG_NAME is running: PID:$pid"
+msgstr "$APP_LONG_NAME draait: PID:$pid"
+
+#: ../i2prouter:1223
+#, sh-format
+msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
+msgstr "$APP_LONG_NAME draait: PID:$pid, Wrapper: $STATUS, Jave: $JAVASTATUS"
+
+#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324
+#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439
+#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540
+#, sh-format
+msgid "The $APP_LONG_NAME daemon is already installed."
+msgstr "De $APP_LONG_NAME daemon is al geïnstalleerd."
+
+#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428
+#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508
+#: ../i2prouter:1543
+#, sh-format
+msgid "Installing the $APP_LONG_NAME daemon"
+msgstr "Bezig met installeren van de $APP_LONG_NAME daemon"
+
+#: ../i2prouter:1550
+#, sh-format
+msgid "Install not currently supported for $DIST_OS"
+msgstr "Installeren wordt momenteel niet ondersteund voor $DIST_OS"
+
+#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602
+#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661
+#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706
+#, sh-format
+msgid "Removing $APP_LONG_NAME daemon"
+msgstr "Bezig met verwijderen van $APP_LONG_NAME daemon"
+
+#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606
+#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655
+#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711
+#, sh-format
+msgid "The $APP_LONG_NAME daemon is not currently installed."
+msgstr "De $APP_LONG_NAME daemon is momenteel niet geïnstalleerd."
+
+#: ../i2prouter:1715
+#, sh-format
+msgid "Remove not currently supported for $DIST_OS"
+msgstr "Verwijderen wordt momenteel niet ondersteund voor $DIST_OS"
+
+#: ../i2prouter:1802
+msgid "Commands:"
+msgstr "Commando's:"
+
+#: ../i2prouter:1803
+msgid "Launch in the current console."
+msgstr "Starten in de huidige console."
+
+#: ../i2prouter:1804
+msgid "Start in the background as a daemon process."
+msgstr "Starten in de achtergrond als een daemon-proces."
+
+#: ../i2prouter:1805
+msgid "Stop if running as a daemon or in another console."
+msgstr "Stop indien draaiende als een daemon of in een andere console."
+
+#: ../i2prouter:1806
+msgid "Stop gracefully, may take up to 11 minutes."
+msgstr "Sierlijk stoppen, kan tot 11 minuten duren."
+
+#: ../i2prouter:1807
+msgid "Stop if running and then start."
+msgstr "Indien draaiende, stop en start opnieuw."
+
+#: ../i2prouter:1808
+msgid "Restart only if already running."
+msgstr "Herstart enkel indien al draaiend."
+
+#: ../i2prouter:1809
+msgid "Query the current status."
+msgstr "De huidige status opvragen."
+
+#: ../i2prouter:1810
+msgid "Install to start automatically when system boots."
+msgstr "Installeren om automatisch te starten wanneer het systeem opstart."
+
+#: ../i2prouter:1811
+msgid "Uninstall."
+msgstr "Verwijderen."
+
+#: ../i2prouter:1812
+msgid "Request a Java thread dump if running."
+msgstr "Vraag een Java thread dump indien draaiende."
+
+#: ../i2prouter:1825
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Gelieve i2prouter te wijzigen en de variabele RUN_AS_USER in te stellen"
+
+#: ../i2prouter:1830
+msgid "Running I2P as the root user is *not* recommended."
+msgstr "I2P uitvoeren als root is *niet* aanbevolen."
+
+#: ../i2prouter:1833
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr "Om toch als root uit te voeren, wijzig i2prouter en stel ALLOW_ROOT=true in."
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index a58a19223a89c8e70c46428f64e82d90092a1212..21a23d686b736f03dec9f630d146ab425c360872 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -111,10 +111,11 @@ if [ ! `echo $HOST_OS  |grep osx` ]; then
     rm -f *i2p_service_osx.command
     rm -f net.i2p.router.plist.template
     #rm -f I2P\ Router\ Console.webloc
+else
+    # The example apparmor profile is useless on OSX
+    rm -f ./scripts/home.i2p.i2prouter
 fi
 
-# no, let's not start the router from the install script any more
-# ./i2prouter start
 rm -f ./osid
 rm -f ./postinstall.sh
 exit 0
diff --git a/installer/resources/proxy/ahelper-conflict-header.ht b/installer/resources/proxy/ahelper-conflict-header.ht
index 474be3181fa6bf2b7ddce870ba4781026a760494..3222013748d072d933d3880e2e9424b7f5f28d65 100644
--- a/installer/resources/proxy/ahelper-conflict-header.ht
+++ b/installer/resources/proxy/ahelper-conflict-header.ht
@@ -19,7 +19,7 @@ Proxy-Connection: close
 <h3>_("Warning: Destination Key Conflict")</h3>
 <p>
 _("The addresshelper link you followed specifies a different destination key than a host entry in your host database.")
-_("Someone could be trying to impersonate another eepsite, or people have given two eepsites identical names.")
+_("Someone could be trying to impersonate another website, or people have given two websites identical names.")
 </p>
 <p>
 _("You can resolve the conflict by considering which key you trust, and either discarding the addresshelper link, discarding the host entry from your host database, or naming one of them differently.")
diff --git a/installer/resources/proxy/dnf-header.ht b/installer/resources/proxy/dnf-header.ht
index d4c7465c82f63f564b53989f15d347ad56107b17..c723ed73084556082db2903f081c901bcbbd61cd 100644
--- a/installer/resources/proxy/dnf-header.ht
+++ b/installer/resources/proxy/dnf-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,10 +16,10 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable.")
-_("The eepsite is offline, there is network congestion, or your router is not yet well-integrated with peers.")
+_("The website was not reachable.")
+_("The website is offline, there is network congestion, or your router is not yet well-integrated with peers.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")</p>
 <hr>
 <p><b>_("Could not find the following destination:")</b>
diff --git a/installer/resources/proxy/dnfb-header.ht b/installer/resources/proxy/dnfb-header.ht
index 382ea761c532055dbf3b70313869dc07522a5c2e..d98c4ab599d9957c79d6b201265c933099014de9 100644
--- a/installer/resources/proxy/dnfb-header.ht
+++ b/installer/resources/proxy/dnfb-header.ht
@@ -18,7 +18,7 @@ Proxy-Connection: close
 <div class="warning" id="warning">
 <h3>_("Warning: Invalid Destination")</h3>
 <p>
-_("The eepsite destination specified was not valid, or was otherwise unreachable.")
+_("The website destination specified was not valid, or was otherwise unreachable.")
 _("Perhaps you pasted in the wrong Base 64 string or the link you are following is bad.")
 _("The I2P host could also be offline.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")
diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht
index 57421cd1e26cc47f54994375ad6a4808033f8ba5..3fbfe070f019824740acb4848736c3ca2a4be9c4 100644
--- a/installer/resources/proxy/dnfh-header.ht
+++ b/installer/resources/proxy/dnfh-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unknown")</title>
+<title>_("Website Unknown")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,15 +16,15 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Not Found in Addressbook")</h3>
+<h3>_("Website Not Found in Addressbook")</h3>
 <p>
-_("The eepsite was not found in your router's addressbook.")
+_("The website was not found in your router's addressbook.")
 _("Check the link or find a Base 32 or Base 64 address.")
 _("If you have the Base 64 address, {0}add it to your addressbook{1}.", "<a href=\"http://127.0.0.1:7657/susidns/addressbook.jsp?book=router\">", "</a>")
 _("Otherwise, find a Base 32 or address helper link, or use a jump service link below.")
 </p>
 <p>
-_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "<a href=\"http://www.i2p2.i2p/faq.html#subscriptions\">", "</a>", "<a href=\"http://127.0.0.1:7657/susidns/config.jsp\">", "</a>")
+_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "<a href=\"http://i2p-projekt.i2p/faq.html#subscriptions\">", "</a>", "<a href=\"http://127.0.0.1:7657/susidns/config.jsp\">", "</a>")
 </p><hr>
 <p>
 <b>_("Could not find the following destination:")</b>
diff --git a/installer/resources/proxy/dnfp-header.ht b/installer/resources/proxy/dnfp-header.ht
index f625775a71d0c132980e78a7e85396e491a2b92f..4c80f587934131c6802b946ffdce1d1c94a52ed5 100644
--- a/installer/resources/proxy/dnfp-header.ht
+++ b/installer/resources/proxy/dnfp-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Outproxy Not Found")</title>
+<title>_("Outproxy Not Found")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Outproxy Not Found")</h3>
+<h3>_("Outproxy Not Found")</h3>
 <p>
 _("The HTTP Outproxy was not found.")
 _("It is offline, there is network congestion, or your router is not yet well-integrated with peers.")
diff --git a/installer/resources/proxy/enc-header.ht b/installer/resources/proxy/enc-header.ht
index e5c271e234dbf44b87728fdfeff6192292711818..117ed6ad1c90f8a260eedd66e19f29aff9712688 100644
--- a/installer/resources/proxy/enc-header.ht
+++ b/installer/resources/proxy/enc-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,9 +16,9 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
+_("The website was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
 <hr>
 <p><b>_("Could not connect to the following destination:")</b>
 </p>
diff --git a/installer/resources/proxy/encp-header.ht b/installer/resources/proxy/encp-header.ht
index 9d53fb70760894f79a2e1d830e20f2c10fc44bce..e32aad38b88820fddabe6dac40fc61833a3f0225 100644
--- a/installer/resources/proxy/encp-header.ht
+++ b/installer/resources/proxy/encp-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Outproxy Unreachable")</title>
+<title>_("Outproxy Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Outproxy Unreachable")</h3>
+<h3>_("Outproxy Unreachable")</h3>
 <p>
 _("The HTTP outproxy was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
 _("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "<a href=\"javascript:parent.window.location.reload()\">", "</a>", "<a href=\"http://127.0.0.1:7657/i2ptunnel/index.jsp\">", "</a>")
diff --git a/installer/resources/proxy/nols-header.ht b/installer/resources/proxy/nols-header.ht
index 5cd67460fe4397a29e6dc6b3005bd304ab7a7e60..8c817a3fbd7eeea4650ead574ee4cc99b0043cf0 100644
--- a/installer/resources/proxy/nols-header.ht
+++ b/installer/resources/proxy/nols-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,10 +16,10 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable, because its lease set was not found.")
-_("The eepsite is probably down, but there could also be network congestion.")
+_("The website was not reachable, because its lease set was not found.")
+_("The website is probably down, but there could also be network congestion.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")</p>
 <hr>
 <p><b>_("Could not find the following destination:")</b>
diff --git a/installer/resources/proxy/nolsp-header.ht b/installer/resources/proxy/nolsp-header.ht
index bed468f44a26efd0d75d18971ad78146498c939e..6d162123f8338cdc677484ed50be16fd8f1a9245 100644
--- a/installer/resources/proxy/nolsp-header.ht
+++ b/installer/resources/proxy/nolsp-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Outproxy Not Found")</title>
+<title>_("Outproxy Not Found")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Outproxy Not Found")</h3>
+<h3>_("Outproxy Not Found")</h3>
 <p>
 _("The HTTP outproxy was not reachable, because its lease set was not found.")
 _("The outproxy is probably down, but there could also be network congestion.")
diff --git a/installer/resources/proxy/reset-header.ht b/installer/resources/proxy/reset-header.ht
new file mode 100644
index 0000000000000000000000000000000000000000..23743ed3d40ec34cf8227b3145eef38f05484e35
--- /dev/null
+++ b/installer/resources/proxy/reset-header.ht
@@ -0,0 +1,26 @@
+HTTP/1.1 403 Connection Reset
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+<title>_("Connection Reset")</title>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
+<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<div class="logo">
+ <a href="http://127.0.0.1:7657/" title="_("Router Console")"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="_("I2P Router Console")" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
+</div>
+<div class="warning" id="warning">
+<h3>_("Connection Reset")</h3>
+<p>
+_("The connection to the website was reset while the page was loading.")
+_("The website could be temporarily unavailable, too busy, or it has blocked your access.")
+_("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")</p>
+<hr>
+<p><b>_("Could not find the following destination:")</b>
+</p>
diff --git a/installer/resources/proxy/resetp-header.ht b/installer/resources/proxy/resetp-header.ht
new file mode 100644
index 0000000000000000000000000000000000000000..1f1e53dc69b75c94409b8c68c2ea9a15811b2cb3
--- /dev/null
+++ b/installer/resources/proxy/resetp-header.ht
@@ -0,0 +1,26 @@
+HTTP/1.1 403 Connection Reset
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+<title>_("Connection Reset")</title>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
+<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<div class="logo">
+ <a href="http://127.0.0.1:7657/" title="_("Router Console")"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="_("I2P Router Console")" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
+</div>
+<div class="warning" id="warning">
+<h3>_("Connection Reset")</h3>
+<p>
+_("The connection to the proxy was reset.")
+_("The proxy could be temporarily unavailable, too busy, or it has blocked your access.")
+_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "<a href=\"javascript:parent.window.location.reload()\">", "</a>", "<a href=\"http://127.0.0.1:7657/i2ptunnel/index.jsp\">", "</a>")
+_("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "<a href=\"http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0\">", "</a>")
+</p>
+<hr><p><b>_("Could not find the following destination:")</b></p>
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index 351ce8911e3bf746ff091f3a525dbabc41d1b535..8fd39f406bfb450ca5d32ff640b975df10529dc6 100644
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@@ -7,7 +7,7 @@
 <h3>Services on I2P</h3>
 <ul class="links">
 
-<li class="tidylist"><b>Invisible Internet &amp; Public Web Browsing</b><br>On I2P you can access anonymous websites (eepsites) and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (outproxy). <a href="https://geti2p.net/en/about/browser-config" target="_blank">Configure your browser</a> to use the HTTP proxy at <code>127.0.0.1 port 4444</code>, then browse to an eepsite or a normal, unencrypted <code>http://</code> address. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy  Tunnel Editor</a>. In the "Sites of Interest" section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</li>
+<li class="tidylist"><b>Invisible Internet &amp; Public Web Browsing</b><br>On I2P you can access hidden service websites ("eepsites") and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (outproxy). <a href="https://geti2p.net/en/about/browser-config" target="_blank">Configure your browser</a> to use the HTTP proxy at <code>127.0.0.1 port 4444</code>, then browse to a hidden service website or a normal, unencrypted <code>http://</code> address. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy  Tunnel Editor</a>. In the "Sites of Interest" section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</li>
 
 <li class="tidylist"><b>Anonymous E-Mail</b><br>Postman's I2P-based mail system can be accessed either via <a href="/webmail">I2P's built-in mail client</a>
   (susimail) or using any mail client that supports smtp and pop3.
@@ -35,18 +35,18 @@
 <h3>Anonymous Encrypted Web Hosting on I2P</h3>
 <ul class="links">
 
-<li class="tidylist"><b>Ready to Roll!</b><br>I2P comes with a built-in, ready-to-go web server for hosting your own anonymous website (eepsite) on the I2P network: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content,
+<li class="tidylist"><b>Ready to Roll!</b><br>I2P comes with a built-in, ready-to-go web server for hosting your own hidden service website ("eepsite") on the I2P network: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content,
   simply place your files in the <code>eepsite/docroot/</code> directory (or place 
   any standard JSP/Servlet .war files under <code>eepsite/webapps</code>, 
   or standard CGI scripts under <code>eepsite/cgi-bin</code>) and they'll show 
   up. You can also run any alternative web server platform over I2P and replace the built-in server, or run it on another tunnel.</li>
 <li class="tidylist"><b>Start Your Tunnel</b><br>  
   After starting up, your pre-configured <a href="/i2ptunnel/" target="_blank">I2P Webserver Tunnel</a>,  
-  your eepsite will be visible (but not discoverable) to others. Detailed instructions for starting 
-  your eepsite, registering an .i2p domain and promoting your site to others are accessible via your own I2P webserver on <a href="http://127.0.0.1:7658/help/" target="_blank">http://127.0.0.1:7658/help/</a>.</li></ul>
+  your website will be visible (but not discoverable) to others. Detailed instructions for starting 
+  your website, registering an .i2p domain and promoting your site to others are accessible via your own I2P webserver on <a href="http://127.0.0.1:7658/help/" target="_blank">http://127.0.0.1:7658/help/</a>.</li></ul>
     
 <a name="eepsites"></a>    
-    <h3>I2P-Hosted Sites of Interest</h3>
+    <h3>I2P-Hidden Services of Interest</h3>
     <ul class="links">
       <li class="tidylist"><b>Invisible Internet Project (I2P) Official Website</b><br><a href="http://i2p-projekt.i2p" target="_blank">i2p-projekt.i2p</a>: Secure and
         anonymous connections to <a href="https://geti2p.net/en/" target="_blank">geti2p.net</a>. If you want to know more about how I2P works or how you can participate, this is your first port of call!</li>
@@ -57,10 +57,10 @@
         archive  with  source code (where permissible), information about I2P, including a <a href="http://echelon.i2p/I2Pguide/index.html" target="_blank">beginner's guide</a> and pre-release developer builds of I2P for the adventurous to try.</li>
         <li class="tidylist"><b>Ugha's Wiki</b><br><a href="http://ugha.i2p/" target="_blank">ugha.i2p</a>: An open wiki that anyone can edit with plenty of information  about I2P, help for beginners, additional links into the network, and more.</li>
         <li class="tidylist"><b>The Planet (on I2P)</b><br><a href="http://planet.i2p/" target="_blank">planet.i2p</a>: An RSS aggregator site that takes news and events from around I2P and publishes them all in one place. A good site to visit to see the community at work!</li>
-        <li class="tidylist"><b>Eepsite Search Engine</b><br><a href="http://eepsites.i2p/" target="_blank">eepsites.i2p</a>: An 
-        anonymously-hosted eepsite search engine.</li>
+        <li class="tidylist"><b>Website Search Engine</b><br><a href="http://eepsites.i2p/" target="_blank">eepsites.i2p</a>: An 
+        anonymously-hosted hidden service search engine.</li>
       <li class="tidylist"><b>I2P Network Health</b><br><a href="http://stats.i2p/cgi-bin/dashboard.cgi" target="_blank">stats.i2p</a>: Check out various aspects of network performance with this I2P network monitoring site run by zzz.</li> 
-      <li class="tidylist"><b>Discover I2P</b><br>There are many more eepsites - just follow the links from the ones you see, 
+      <li class="tidylist"><b>Discover I2P</b><br>There are many more hidden services - just follow the links from the ones you see, 
       bookmark your favourites, and visit them often!<br></li>     
     </ul>
 
@@ -80,7 +80,7 @@
    </li>
   
 <li class="tidylist"><b>Check Your Proxy Setttings</b><br>If 
-  you cannot see any eepsites at all (not even <a href="http://i2p-projekt.i2p/" target="_blank">i2p-projekt.i2p</a>), 
+  you cannot see any websites at all (not even <a href="http://i2p-projekt.i2p/" target="_blank">i2p-projekt.i2p</a>), 
   make sure your browser's proxy is set to access http traffic (<i>not</i> https, <i>not</i> socks) via <code>127.0.0.1 port 4444</code>. If you need some help, there's <a href="https://geti2p.net/en/about/browser-config" target="_blank">a guide</a> to configuring your browser for I2P use.
   </li>
 
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index 949a7abd7c0d03d26ada1c6ad9ce1c1b4d274175..27d79c8eb9919607121c92da8331db533e4dd0c4 100644
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -22,6 +22,9 @@ CP=
 for jars in `ls ${I2P}/lib/*.jar`; do CP=${CP}:${jars}; done
 JAVA=java
 
+if [ "`uname -s`" = "Darwin" ]; then
+    export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+fi
 JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
 nohup ${JAVA} -cp "${CP}" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 &
 echo $! > "${I2PTEMP}/router.pid"
diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java
index b0ff1ffd5e377646cb311902998bcd74fefea4ab..cb977a8648b2ea6e39bd73634b80106168e56002 100644
--- a/router/java/src/net/i2p/data/router/RouterInfo.java
+++ b/router/java/src/net/i2p/data/router/RouterInfo.java
@@ -38,6 +38,7 @@ import net.i2p.data.Hash;
 import net.i2p.data.KeysAndCert;
 import net.i2p.data.Signature;
 import net.i2p.data.SimpleDataStructure;
+import net.i2p.router.Router;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.OrderedProperties;
@@ -84,9 +85,17 @@ public class RouterInfo extends DatabaseEntry {
     public static final String PROP_CAPABILITIES = "caps";
     public static final char CAPABILITY_HIDDEN = 'H';
 
-    // Public string of chars which serve as bandwidth capacity markers
-    // NOTE: individual chars defined in Router.java
-    public static final String BW_CAPABILITY_CHARS = "KLMNO";
+    /** Public string of chars which serve as bandwidth capacity markers
+     * NOTE: individual chars defined in Router.java
+     */
+    public static final String BW_CAPABILITY_CHARS = "" +
+        Router.CAPABILITY_BW12 +
+        Router.CAPABILITY_BW32 +
+        Router.CAPABILITY_BW64 +
+        Router.CAPABILITY_BW128 +
+        Router.CAPABILITY_BW256 +
+        Router.CAPABILITY_BW512 +
+        Router.CAPABILITY_BW_UNLIMITED;
     
     public RouterInfo() {
         _addresses = new ArrayList<RouterAddress>(2);
@@ -277,6 +286,8 @@ public class RouterInfo extends DatabaseEntry {
      * Configure a set of options or statistics that the router can expose.
      * Makes a copy.
      *
+     * Warning, clears all capabilities, must be called BEFORE addCapability().
+     *
      * @param options if null, clears current options
      * @throws IllegalStateException if RouterInfo is already signed
      */
@@ -372,6 +383,9 @@ public class RouterInfo extends DatabaseEntry {
      */
     public int getNetworkId() {
         String id = _options.getProperty(PROP_NETWORK_ID);
+        // shortcut
+        if ("2".equals(id))
+            return 2;
         if (id != null) {
             try {
                 return Integer.parseInt(id);
@@ -421,6 +435,8 @@ public class RouterInfo extends DatabaseEntry {
     }
 
     /**
+     * Warning, must be called AFTER setOptions().
+     *
      * @throws IllegalStateException if RouterInfo is already signed
      */
     public void addCapability(char cap) {
@@ -429,13 +445,14 @@ public class RouterInfo extends DatabaseEntry {
 
             String caps = _options.getProperty(PROP_CAPABILITIES);
             if (caps == null)
-                _options.setProperty(PROP_CAPABILITIES, ""+cap);
+                _options.setProperty(PROP_CAPABILITIES, String.valueOf(cap));
             else if (caps.indexOf(cap) == -1)
                 _options.setProperty(PROP_CAPABILITIES, caps + cap);
     }
 
     /**
      * @throws IllegalStateException if RouterInfo is already signed
+     * @deprecated unused
      */
     public void delCapability(char cap) {
         if (_signature != null)
diff --git a/router/java/src/net/i2p/router/Banlist.java b/router/java/src/net/i2p/router/Banlist.java
index 57f31b2da4c2f802ed1918606eaffaaffc1e52ac..180e9366f7ec4a5b89159da998e035297673f19e 100644
--- a/router/java/src/net/i2p/router/Banlist.java
+++ b/router/java/src/net/i2p/router/Banlist.java
@@ -135,11 +135,35 @@ public class Banlist {
     }
 
     private boolean banlistRouter(Hash peer, String reason, String reasonCode, String transport, boolean forever) {
+        long expireOn;
+        if (forever) {
+            expireOn = _context.clock().now() + BANLIST_DURATION_FOREVER;
+        } else if (transport != null) {
+            expireOn = _context.clock().now() + BANLIST_DURATION_PARTIAL;
+        } else {
+            long period = BANLIST_DURATION_MS + _context.random().nextLong(BANLIST_DURATION_MS / 4);
+            if (period > BANLIST_DURATION_MAX)
+                period = BANLIST_DURATION_MAX;
+            expireOn = _context.clock().now() + period;
+        }
+        return banlistRouter(peer, reason, reasonCode, transport, expireOn);
+    }
+
+    /**
+     *  So that we may specify an expiration
+     *
+     *  @param reason may be null
+     *  @param reasonCode may be null
+     *  @param expireOn absolute time, not a duration
+     *  @param transport may be null
+     *  @since 0.9.18
+     */
+    public boolean banlistRouter(Hash peer, String reason, String reasonCode, String transport, long expireOn) {
         if (peer == null) {
             _log.error("wtf, why did we try to banlist null?", new Exception("banfaced"));
             return false;
         }
-        if (_context.routerHash().equals(peer)) {
+        if (peer.equals(_context.routerHash())) {
             _log.error("wtf, why did we try to banlist ourselves?", new Exception("banfaced"));
             return false;
         }
@@ -149,22 +173,7 @@ public class Banlist {
                ((transport != null) ? " on transport " + transport : ""), new Exception("Banlist cause: " + reason));
         
         Entry e = new Entry();
-        if (forever) {
-            e.expireOn = _context.clock().now() + BANLIST_DURATION_FOREVER;
-        } else if (transport != null) {
-            e.expireOn = _context.clock().now() + BANLIST_DURATION_PARTIAL;
-        } else {
-            long period = BANLIST_DURATION_MS + _context.random().nextLong(BANLIST_DURATION_MS / 4);
-            //PeerProfile prof = _context.profileOrganizer().getProfile(peer);
-            //if (prof != null) {
-            //    period = BANLIST_DURATION_MS << prof.incrementBanlists();
-            //    period += _context.random().nextLong(period);
-            //}
-       
-            if (period > BANLIST_DURATION_MAX)
-                period = BANLIST_DURATION_MAX;
-            e.expireOn = _context.clock().now() + period;
-        }
+        e.expireOn = expireOn;
         e.cause = reason;
         e.causeCode = reasonCode;
         e.transports = null;
@@ -279,7 +288,7 @@ public class Banlist {
     
     public boolean isBanlistedForever(Hash peer) {
         Entry entry = _entries.get(peer);
-        return entry != null && entry.expireOn > _context.clock().now() + BANLIST_DURATION_MAX;
+        return entry != null && entry.expireOn > _context.clock().now() + 2*24*60*60*1000L;
     }
 
     /** @deprecated moved to router console */
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index a6fe1d20930f03e7c577ee90363a870a999c9ff8..4e931f6656374fd9232e54f7a9bfe57bb31a2426 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -76,6 +76,7 @@ public class Blocklist {
     private final Object _lock = new Object();
     private Entry _wrapSave;
     private final Set<Hash> _inProcess = new HashSet<Hash>(4);
+    // temp
     private Map<Hash, String> _peerBlocklist = new HashMap<Hash, String>(4);
 
     /**
@@ -83,8 +84,8 @@ public class Blocklist {
      *  Note that it's impossible to prevent clogging up
      *  the tables by a determined attacker, esp. on IPv6
      */
-    private static final int MAX_IPV4_SINGLES = 256;
-    private static final int MAX_IPV6_SINGLES = 512;
+    private static final int MAX_IPV4_SINGLES = 8192;
+    private static final int MAX_IPV6_SINGLES = 4096;
 
     private final Set<Integer> _singleIPBlocklist = new ConcurrentHashSet<Integer>(4);
     private final Map<BigInteger, Object> _singleIPv6Blocklist = new LHMCache<BigInteger, Object>(MAX_IPV6_SINGLES);
@@ -102,39 +103,95 @@ public class Blocklist {
         _log = new Log(Blocklist.class);
     }
     
-    static final String PROP_BLOCKLIST_ENABLED = "router.blocklist.enable";
-    static final String PROP_BLOCKLIST_DETAIL = "router.blocklist.detail";
-    static final String PROP_BLOCKLIST_FILE = "router.blocklist.file";
-    static final String BLOCKLIST_FILE_DEFAULT = "blocklist.txt";
+    private static final String PROP_BLOCKLIST_ENABLED = "router.blocklist.enable";
+    private static final String PROP_BLOCKLIST_DETAIL = "router.blocklist.detail";
+    private static final String PROP_BLOCKLIST_FILE = "router.blocklist.file";
+    private static final String BLOCKLIST_FILE_DEFAULT = "blocklist.txt";
 
+    /**
+     *  Loads the following files in-order:
+     *  $I2P/blocklist.txt
+     *  ~/.i2p/blocklist.txt
+     *  File if specified with router.blocklist.file
+     */
     public void startup() {
         if (! _context.getBooleanPropertyDefaultTrue(PROP_BLOCKLIST_ENABLED))
             return;
-        String file = _context.getProperty(PROP_BLOCKLIST_FILE, BLOCKLIST_FILE_DEFAULT);
-        // Maybe someday we'll read in multiple files and merge them
-        // StringTokenizer tok = new StringTokenizer(file, " ,\r\n");
-        // while (tok.hasMoreTokens())
-        //    readBlocklistFile(tok.nextToken());
-        Job job = new ReadinJob(file);
-        job.getTiming().setStartAfter(_context.clock().now() + 2*60*1000);
+        List<File> files = new ArrayList<File>(3);
+
+        // install dir
+        File blFile = new File(_context.getBaseDir(), BLOCKLIST_FILE_DEFAULT);
+        files.add(blFile);
+        // config dir
+        if (!_context.getConfigDir().equals(_context.getBaseDir())) {
+            blFile = new File(_context.getConfigDir(), BLOCKLIST_FILE_DEFAULT);
+            files.add(blFile);
+        }
+        // user specified
+        String file = _context.getProperty(PROP_BLOCKLIST_FILE);
+        if (file != null && !file.equals(BLOCKLIST_FILE_DEFAULT)) {
+            blFile = new File(file);
+            if (!blFile.isAbsolute())
+                 blFile = new File(_context.getConfigDir(), file);
+            files.add(blFile);
+        }
+        Job job = new ReadinJob(files);
+        job.getTiming().setStartAfter(_context.clock().now() + 30*1000);
         _context.jobQueue().addJob(job);
     }
 
     private class ReadinJob extends JobImpl {
-        private final String _file;
-        public ReadinJob (String f) {
+        private final List<File> _files;
+
+        /**
+         *  @param files not necessarily existing, but avoid dups
+         */
+        public ReadinJob (List<File> files) {
             super(_context);
-            _file = f;
+            _files = files;
         }
+
         public String getName() { return "Read Blocklist"; }
+
         public void runJob() {
+            allocate(_files);
+            if (_blocklist == null)
+                return;
+            int ccount = process();
+            if (_blocklist == null)
+                return;
+            if (ccount <= 0) {
+                disable();
+                return;
+            }
+            merge(ccount);
+            if (_log.shouldLog(Log.WARN)) {
+                if (_blocklistSize <= 0)
+                    return;
+                FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb();
+                int count = 0;
+                for (RouterInfo ri : fndf.getKnownRouterData()) {
+                    Hash peer = ri.getIdentity().getHash();
+                    if (isBlocklisted(peer))
+                        count++;
+                }
+                if (count > 0)
+                    _log.warn("Blocklisted " + count + " routers in the netDb");
+            }
+            _peerBlocklist = null;
+        }
+
+        private int process() {
+            int count = 0;
             synchronized (_lock) {
                 try {
-                    readBlocklistFile(_file);
+                    for (File f : _files) {
+                        count = readBlocklistFile(f, count);
+                    }
                 } catch (OutOfMemoryError oom) {
                     _log.log(Log.CRIT, "OOM processing the blocklist");
                     disable();
-                    return;
+                    return 0;
                 }
             }
             for (Hash peer : _peerBlocklist.keySet()) {
@@ -146,20 +203,8 @@ public class Blocklist {
                     reason = _x("Banned by router hash");
                 _context.banlist().banlistRouterForever(peer, reason, comment);
             }
-            _peerBlocklist = null;
-
-            if (_blocklistSize <= 0)
-                return;
-            FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb();
-            int count = 0;
-            for (Iterator<RouterInfo> iter = fndf.getKnownRouterData().iterator(); iter.hasNext(); ) {
-                RouterInfo ri = iter.next();
-                Hash peer = ri.getIdentity().getHash();
-                if (isBlocklisted(peer))
-                    count++;
-            }
-            if (count > 0 && _log.shouldLog(Log.WARN))
-                _log.warn("Blocklisted " + count + " routers in the netDb.");
+            _peerBlocklist.clear();
+            return count;
         }
     }
 
@@ -171,6 +216,23 @@ public class Blocklist {
         }
     }
 
+    /**
+     *  @return success
+     *  @since 0.9.18 split out from readBlocklistFile()
+     */
+    private void allocate(List<File> files) {
+        int maxSize = 0;
+        for (File f : files) {
+            maxSize += getSize(f);
+        }
+        try {
+            _blocklist = new long[maxSize + files.size()];  // extra for wrapsave
+        } catch (OutOfMemoryError oom) {
+            _log.log(Log.CRIT, "OOM creating the blocklist");
+            disable();
+        }
+    }
+
    /**
     * Read in and parse the blocklist.
     * The blocklist need not be sorted, and may contain overlapping entries.
@@ -192,34 +254,31 @@ public class Blocklist {
     *   http://www.bluetack.co.uk/forums/index.php?autocom=faq&CODE=02&qid=17
     *   http://blocklist.googlepages.com/
     *   http://www.cymru.com/Documents/bogon-list.html
+    *
+    *
+    * Must call allocate() before and merge() after.
+    *
+    *  @param count current number of entries
+    *  @return new number of entries
     */
-    private void readBlocklistFile(String file) {
-        File BLFile = new File(file);
-        if (!BLFile.isAbsolute())
-            BLFile = new File(_context.getConfigDir(), file);
-        if (BLFile == null || (!BLFile.exists()) || BLFile.length() <= 0) {
+    private int readBlocklistFile(File blFile, int count) {
+        if (blFile == null || (!blFile.exists()) || blFile.length() <= 0) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("Blocklist file not found: " + file);
-            return;
+                _log.warn("Blocklist file not found: " + blFile);
+            return count;
         }
+
         long start = _context.clock().now();
-        int maxSize = getSize(BLFile);
-        try {
-            _blocklist = new long[maxSize + 1];  // extra for wrapsave
-        } catch (OutOfMemoryError oom) {
-            _log.log(Log.CRIT, "OOM creating the blocklist");
-            return;
-        }
-        int count = 0;
+        int oldcount = count;
         int badcount = 0;
         int peercount = 0;
         long ipcount = 0;
         BufferedReader br = null;
         try {
             br = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(BLFile), "UTF-8"));
+                    new FileInputStream(blFile), "UTF-8"));
             String buf = null;
-            while ((buf = br.readLine()) != null && count < maxSize) {
+            while ((buf = br.readLine()) != null) {
                 Entry e = parse(buf, true);
                 if (e == null) {
                     badcount++;
@@ -237,23 +296,40 @@ public class Blocklist {
                 ipcount += 1 + toInt(ip2) - toInt(ip1); // includes dups, oh well
             }
         } catch (IOException ioe) {
-            _blocklist = null;
             if (_log.shouldLog(Log.ERROR))
-                _log.error("Error reading the BLFile", ioe);
-            return;
+                _log.error("Error reading the blocklist file", ioe);
+            return count;
         } catch (OutOfMemoryError oom) {
             _blocklist = null;
             _log.log(Log.CRIT, "OOM reading the blocklist");
-            return;
+            return count;
         } finally {
             if (br != null) try { br.close(); } catch (IOException ioe) {}
         }
 
         if (_wrapSave != null) {
+            // the extra record generated in parse() by a line that
+            // wrapped around 128.0.0.0
             store(_wrapSave.ip1, _wrapSave.ip2, count++);
             ipcount += 1 + toInt(_wrapSave.ip2) - toInt(_wrapSave.ip1);
+            _wrapSave = null;
+        }
+        if (_log.shouldLog(Log.INFO)) {
+            _log.info("Stats for " + blFile);
+            _log.info("Removed " + badcount + " bad entries and comment lines");
+            _log.info("Read " + (count - oldcount) + " valid entries from the blocklist " + blFile);
+            _log.info("Blocking " + ipcount + " IPs and " + peercount + " hashes");
+            _log.info("Blocklist processing finished, time: " + (_context.clock().now() - start));
         }
+        return count;
+    }
 
+    /**
+     *  @param count valid entries in _blocklist
+     *  @since 0.9.18 split out from readBlocklistFile()
+     */
+    private void merge(int count) {
+        long start = _context.clock().now();
         // This is a standard signed sort, so the entries will be ordered
         // 128.0.0.0 ... 255.255.255.255 0.0.0.0 .... 127.255.255.255
         // But that's ok.
@@ -273,15 +349,17 @@ public class Blocklist {
         }
         _blocklistSize = count - removed;
         if (_log.shouldLog(Log.INFO)) {
-            _log.info("Removed " + badcount + " bad entries and comment lines");
-            _log.info("Read " + count + " valid entries from the blocklist " + BLFile);
+            _log.info("Merged Stats");
+            _log.info("Read " + count + " total entries from the blocklists");
             _log.info("Merged " + removed + " overlapping entries");
             _log.info("Result is " + _blocklistSize + " entries");
-            _log.info("Blocking " + ipcount + " IPs and " + peercount + " hashes");
             _log.info("Blocklist processing finished, time: " + (_context.clock().now() - start));
         }
     }
 
+    /**
+     *  The result of parsing one line
+     */
     private static class Entry {
         final String comment;
         final byte ip1[];
@@ -296,6 +374,9 @@ public class Blocklist {
         }
     }
 
+    /**
+     *  Parse one line, returning a temp data structure with the result
+     */
     private Entry parse(String buf, boolean shouldLog) {
         byte[] ip1;
         byte[] ip2;
@@ -401,19 +482,21 @@ public class Blocklist {
      * so we can size our array.
      * This is i/o inefficient, but memory-efficient, which is what we want.
      */
-    private int getSize(File BLFile) {
-        if ( (!BLFile.exists()) || (BLFile.length() <= 0) ) return 0;
+    private int getSize(File blFile) {
+        if ( (!blFile.exists()) || (blFile.length() <= 0) ) return 0;
         int lines = 0;
         BufferedReader br = null;
         try {
             br = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(BLFile), "ISO-8859-1"));
-            while (br.readLine() != null) {
-                lines++;
+                    new FileInputStream(blFile), "ISO-8859-1"));
+            String s;
+            while ((s = br.readLine()) != null) {
+                if (s.length() > 0 && !s.startsWith("#"))
+                    lines++;
             }
         } catch (IOException ioe) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("Error reading the BLFile", ioe);
+                _log.warn("Error reading the blocklist file", ioe);
             return 0;
         } finally {
             if (br != null) try { br.close(); } catch (IOException ioe) {}
@@ -666,7 +749,7 @@ public class Blocklist {
 
     private void store(int ip1, int ip2, int idx) {
         long entry = ((long) ip1) << 32;
-        entry |= ip2;
+        entry |= ((long)ip2) & 0xffffffff;
         _blocklist[idx] = entry;
     }
 
@@ -752,16 +835,29 @@ public class Blocklist {
      * Additional jobs can wait.
      * Although could this clog up the job queue runners? Yes.
      * So we also stagger these jobs.
-     *(Map.Entry) 
+     *
      */
     private synchronized void banlistForever(Hash peer, List<byte[]> ips) {
-        String file = _context.getProperty(PROP_BLOCKLIST_FILE, BLOCKLIST_FILE_DEFAULT);
-        File BLFile = new File(file);
-        if (!BLFile.isAbsolute())
-            BLFile = new File(_context.getConfigDir(), file);
-        if (BLFile == null || (!BLFile.exists()) || BLFile.length() <= 0) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Blocklist file not found: " + file);
+        // This only checks one file for now, pick the best one
+        // user specified
+        File blFile = null;
+        String file = _context.getProperty(PROP_BLOCKLIST_FILE);
+        if (file != null) {
+            blFile = new File(file);
+            if (!blFile.isAbsolute())
+                 blFile = new File(_context.getConfigDir(), file);
+            if (!blFile.exists())
+                blFile = null;
+        }
+        // install dir
+        if (blFile == null)
+            blFile = new File(_context.getBaseDir(), BLOCKLIST_FILE_DEFAULT);
+
+        if ((!blFile.exists()) || blFile.length() <= 0) {
+            // just ban it and be done
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Banlisting " + peer);
+            _context.banlist().banlistRouterForever(peer, "Banned");
             return;
         }
 
@@ -772,7 +868,7 @@ public class Blocklist {
             BufferedReader br = null;
             try {
                 br = new BufferedReader(new InputStreamReader(
-                        new FileInputStream(BLFile), "UTF-8"));
+                        new FileInputStream(blFile), "UTF-8"));
                 String buf = null;
                 // assume the file is unsorted, so go through the whole thing
                 while ((buf = br.readLine()) != null) {
@@ -798,7 +894,7 @@ public class Blocklist {
                 }
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))
-                    _log.warn("Error reading the BLFile", ioe);
+                    _log.warn("Error reading the blocklist file", ioe);
             } finally {
                 if (br != null) try { br.close(); } catch (IOException ioe) {}
             }
@@ -867,7 +963,7 @@ public class Blocklist {
             int max = Math.min(_blocklistSize, MAX_DISPLAY);
             int displayed = 0;
             // first 0 - 127
-            for (int i = 0; i < max; i++) {
+            for (int i = 0; i < _blocklistSize && displayed < max; i++) {
                  int from = getFrom(_blocklist[i]);
                  if (from < 0)
                      continue;
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 5acde519617096f700b65d0166648d4d472900ce..e179e426feba8d15285848c3dc1db2ccc0a1fbb9 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -25,6 +25,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import net.i2p.data.DataHelper;
+import net.i2p.router.message.HandleGarlicMessageJob;
 import net.i2p.router.networkdb.kademlia.HandleFloodfillDatabaseLookupMessageJob;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
@@ -50,7 +51,7 @@ public class JobQueue {
     /** SortedSet of jobs that are scheduled for running in the future, earliest first */
     private final Set<Job> _timedJobs;
     /** job name to JobStat for that job */
-    private final Map<String, JobStats> _jobStats;
+    private final ConcurrentHashMap<String, JobStats> _jobStats;
     private final QueuePumper _pumper;
     /** will we allow the # job runners to grow beyond 1? */
     private volatile boolean _allowParallelOperation;
@@ -112,7 +113,9 @@ public class JobQueue {
     
     /** max ready and waiting jobs before we start dropping 'em */
     private int _maxWaitingJobs = DEFAULT_MAX_WAITING_JOBS;
-    private final static int DEFAULT_MAX_WAITING_JOBS = 100;
+    private final static int DEFAULT_MAX_WAITING_JOBS = 25;
+    private final static long MIN_LAG_TO_DROP = 500;
+
     /** @deprecated unimplemented */
     private final static String PROP_MAX_WAITING_JOBS = "router.maxWaitingJobs";
 
@@ -122,6 +125,9 @@ public class JobQueue {
      */
     private final Object _runnerLock = new Object();
     
+    /** 
+     *  Does not start the pumper. Caller MUST call startup.
+     */
     public JobQueue(RouterContext context) {
         _context = context;
         _log = context.logManager().getLog(JobQueue.class);
@@ -140,16 +146,12 @@ public class JobQueue {
         _context.statManager().createRateStat("jobQueue.jobWait", "How long does a job sit on the job queue?", "JobQueue", new long[] { 60*60*1000l, 24*60*60*1000l });
         //_context.statManager().createRateStat("jobQueue.jobRunnerInactive", "How long are runners inactive?", "JobQueue", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
 
-        _alive = true;
         _readyJobs = new LinkedBlockingQueue<Job>();
         _timedJobs = new TreeSet<Job>(new JobComparator());
         _jobLock = new Object();
         _queueRunners = new ConcurrentHashMap<Integer,JobQueueRunner>(RUNNERS);
         _jobStats = new ConcurrentHashMap<String,JobStats>();
         _pumper = new QueuePumper();
-        I2PThread pumperThread = new I2PThread(_pumper, "Job Queue Pumper", true);
-        //pumperThread.setPriority(I2PThread.NORM_PRIORITY+1);
-        pumperThread.start();
     }
     
     /**
@@ -213,8 +215,18 @@ public class JobQueue {
         _context.statManager().addRateData("jobQueue.readyJobs", numReady);
         if (dropped) {
             _context.statManager().addRateData("jobQueue.droppedJobs", 1);
-            _log.logAlways(Log.WARN, "Dropping job due to overload!  # ready jobs: " 
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Dropping job due to overload!  # ready jobs: " 
                           + numReady + ": job = " + job);
+            String key = job.getName();
+            JobStats stats = _jobStats.get(key);
+            if (stats == null) {
+                stats = new JobStats(key);
+                JobStats old = _jobStats.putIfAbsent(key, stats);
+                if (old != null)
+                    stats = old;
+            }
+            stats.jobDropped();
         }
     }
     
@@ -286,13 +298,26 @@ public class JobQueue {
             // we don't really *need* to answer DB lookup messages
             // This is pretty lame, there's actually a ton of different jobs we
             // could drop, but is it worth making a list?
-            if (cls == HandleFloodfillDatabaseLookupMessageJob.class) {
-                 JobTiming jt = job.getTiming();
-                 if (jt != null) {
-                     long lag =  _context.clock().now() - jt.getStartAfter();
-                     if (lag > 2*1000L)
-                         return true;
-                }
+            //
+            // Garlic added in 0.9.19, floodfills were getting overloaded
+            // with encrypted lookups
+            //
+            // Obviously we can only drop one-shot jobs, not those that requeue
+            //
+            if (cls == HandleFloodfillDatabaseLookupMessageJob.class ||
+                cls == HandleGarlicMessageJob.class) {
+                // this tail drops based on the lag at the tail, which
+                // makes no sense...
+                //JobTiming jt = job.getTiming();
+                //if (jt != null) {
+                //    long lag =  _context.clock().now() - jt.getStartAfter();
+                //    if (lag >= MIN_LAG_TO_DROP)
+                //        return true;
+                //}
+
+                // this tail drops based on the lag at the head
+                if (getMaxLag() >= MIN_LAG_TO_DROP)
+                    return true;
             }
         }
         return false;
@@ -303,6 +328,17 @@ public class JobQueue {
         runQueue(_context.getProperty(PROP_MAX_RUNNERS, RUNNERS));
     }
     
+    /** 
+     *  Start the pumper.
+     *  @since 0.9.19
+     */
+    public void startup() {
+        _alive = true;
+        I2PThread pumperThread = new I2PThread(_pumper, "Job Queue Pumper", true);
+        //pumperThread.setPriority(I2PThread.NORM_PRIORITY+1);
+        pumperThread.start();
+    }
+
     /** @deprecated do you really want to do this? */
     public void restart() {
         synchronized (_jobLock) {
@@ -604,10 +640,9 @@ public class JobQueue {
         JobStats stats = _jobStats.get(key);
         if (stats == null) {
             stats = new JobStats(key);
-            _jobStats.put(key, stats);
-            // yes, if two runners finish the same job at the same time, this could
-            // create an extra object.  but, who cares, its pushed out of the map
-            // immediately anyway.
+            JobStats old = _jobStats.putIfAbsent(key, stats);
+            if (old != null)
+                stats = old;
         }
         stats.jobRan(duration, lag);
 
diff --git a/router/java/src/net/i2p/router/JobStats.java b/router/java/src/net/i2p/router/JobStats.java
index 8e6b222d1c28e5c24756088b99dbd10d6f882f81..9d0a987a8c05f21ef74f204b3800c8f5e6568520 100644
--- a/router/java/src/net/i2p/router/JobStats.java
+++ b/router/java/src/net/i2p/router/JobStats.java
@@ -12,10 +12,11 @@ import net.i2p.data.DataHelper;
 public class JobStats {
     private final String _job;
     private final AtomicLong _numRuns = new AtomicLong();
-    private volatile long _totalTime;
+    private final AtomicLong _numDropped = new AtomicLong();
+    private final AtomicLong _totalTime = new AtomicLong();
     private volatile long _maxTime;
     private volatile long _minTime;
-    private volatile long _totalPendingTime;
+    private final AtomicLong _totalPendingTime = new AtomicLong();
     private volatile long _maxPendingTime;
     private volatile long _minPendingTime;
     
@@ -29,43 +30,55 @@ public class JobStats {
     
     public void jobRan(long runTime, long lag) {
         _numRuns.incrementAndGet();
-        _totalTime += runTime;
+        _totalTime.addAndGet(runTime);
         if ( (_maxTime < 0) || (runTime > _maxTime) )
             _maxTime = runTime;
         if ( (_minTime < 0) || (runTime < _minTime) )
             _minTime = runTime;
-        _totalPendingTime += lag;
+        _totalPendingTime.addAndGet(lag);
         if ( (_maxPendingTime < 0) || (lag > _maxPendingTime) )
             _maxPendingTime = lag;
         if ( (_minPendingTime < 0) || (lag < _minPendingTime) )
             _minPendingTime = lag;
     }
     
+    /** @since 0.9.19 */
+    public void jobDropped() {
+        _numDropped.incrementAndGet();
+    }
+
+    /** @since 0.9.19 */
+    public long getDropped() { return _numDropped.get(); }
+
     public String getName() { return _job; }
     public long getRuns() { return _numRuns.get(); }
-    public long getTotalTime() { return _totalTime; }
+    public long getTotalTime() { return _totalTime.get(); }
     public long getMaxTime() { return _maxTime; }
     public long getMinTime() { return _minTime; }
-    public long getAvgTime() { 
+
+    public double getAvgTime() { 
         long numRuns = _numRuns.get();
         if (numRuns > 0) 
-            return _totalTime / numRuns; 
+            return _totalTime.get() / (double) numRuns; 
         else 
             return 0; 
     }
-    public long getTotalPendingTime() { return _totalPendingTime; }
+    public long getTotalPendingTime() { return _totalPendingTime.get(); }
     public long getMaxPendingTime() { return _maxPendingTime; }
     public long getMinPendingTime() { return _minPendingTime; }
-    public long getAvgPendingTime() { 
+
+    public double getAvgPendingTime() { 
         long numRuns = _numRuns.get();
         if (numRuns > 0) 
-            return _totalPendingTime / numRuns; 
+            return _totalPendingTime.get() / (double) numRuns; 
         else 
             return 0; 
     }
     
+/****
     @Override
     public int hashCode() { return _job.hashCode(); }
+
     @Override
     public boolean equals(Object obj) {
         if ( (obj != null) && (obj instanceof JobStats) ) {
@@ -90,4 +103,5 @@ public class JobStats {
         buf.append(getMaxPendingTime()).append("ms/").append(getMinPendingTime()).append("ms avg/max/min)");
         return buf.toString();
     }
+****/
 }
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index ab8e7c38b8f0bb8e67d3a504c7a22e41839a5291..4916d8d725d08f0f3497eaf0cc3e06540826b9d1 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -64,6 +64,8 @@ import net.i2p.util.Translate;
 /**
  * Main driver for the router.
  *
+ * For embedded use, instantiate and then call runRouter().
+ *
  */
 public class Router implements RouterClock.ClockShiftListener {
     private Log _log;
@@ -72,22 +74,21 @@ public class Router implements RouterClock.ClockShiftListener {
     /** full path */
     private String _configFilename;
     private RouterInfo _routerInfo;
+    /** not for external use */
     public final Object routerInfoFileLock = new Object();
     private final Object _configFileLock = new Object();
     private long _started;
     private boolean _higherVersionSeen;
-    //private SessionKeyPersistenceHelper _sessionKeyPersistenceHelper;
     private boolean _killVMOnEnd;
-    private volatile boolean _isAlive;
     private int _gracefulExitCode;
     private I2PThread.OOMEventListener _oomListener;
     private ShutdownHook _shutdownHook;
-    /** non-cancellable shutdown has begun */
-    private volatile boolean _shutdownInProgress;
     private I2PThread _gracefulShutdownDetector;
     private RouterWatchdog _watchdog;
     private Thread _watchdogThread;
     private final EventLog _eventLog;
+    private final Object _stateLock = new Object();
+    private State _state = State.UNINITIALIZED;
     
     public final static String PROP_CONFIG_FILE = "router.configLocation";
     
@@ -105,29 +106,42 @@ public class Router implements RouterClock.ClockShiftListener {
     /** this does not put an 'H' in your routerInfo **/
     public final static String PROP_HIDDEN_HIDDEN = "router.isHidden";
     public final static String PROP_DYNAMIC_KEYS = "router.dynamicKeys";
-    public final static String PROP_SHUTDOWN_IN_PROGRESS = "__shutdownInProgress";
+    /** deprecated, use gracefulShutdownInProgress() */
+    private final static String PROP_SHUTDOWN_IN_PROGRESS = "__shutdownInProgress";
     private static final String PROP_IB_RANDOM_KEY = TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + TunnelPoolSettings.PROP_RANDOM_KEY;
     private static final String PROP_OB_RANDOM_KEY = TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY + TunnelPoolSettings.PROP_RANDOM_KEY;
-    public final static String DNS_CACHE_TIME = "" + (5*60);
+    private final static String DNS_CACHE_TIME = "" + (5*60);
     private static final String EVENTLOG = "eventlog.txt";
     private static final String PROP_JBIGI = "jbigi.loadedResource";
         
     private static final String originalTimeZoneID;
     static {
-        // grumble about sun's java caching DNS entries *forever* by default
-        // so lets just keep 'em for a short time
-        System.setProperty("sun.net.inetaddr.ttl", DNS_CACHE_TIME);
-        System.setProperty("sun.net.inetaddr.negative.ttl", DNS_CACHE_TIME);
-        System.setProperty("networkaddress.cache.ttl", DNS_CACHE_TIME);
-        System.setProperty("networkaddress.cache.negative.ttl", DNS_CACHE_TIME);
-        System.setProperty("http.agent", "I2P");
-        // (no need for keepalive)
-        System.setProperty("http.keepAlive", "false");
+        //
+        // If embedding I2P you may wish to disable one or more of the following
+        // via the associated System property. Since 0.9.19.
+        //
+        if (System.getProperty("I2P_DISABLE_DNS_CACHE_OVERRIDE") == null) {
+            // grumble about sun's java caching DNS entries *forever* by default
+            // so lets just keep 'em for a short time
+            System.setProperty("sun.net.inetaddr.ttl", DNS_CACHE_TIME);
+            System.setProperty("sun.net.inetaddr.negative.ttl", DNS_CACHE_TIME);
+            System.setProperty("networkaddress.cache.ttl", DNS_CACHE_TIME);
+            System.setProperty("networkaddress.cache.negative.ttl", DNS_CACHE_TIME);
+        }
+        if (System.getProperty("I2P_DISABLE_HTTP_AGENT_OVERRIDE") == null) {
+            System.setProperty("http.agent", "I2P");
+        }
+        if (System.getProperty("I2P_DISABLE_HTTP_KEEPALIVE_OVERRIDE") == null) {
+            // (no need for keepalive)
+            System.setProperty("http.keepAlive", "false");
+        }
         // Save it for LogManager
         originalTimeZoneID = TimeZone.getDefault().getID();
-        System.setProperty("user.timezone", "GMT");
-        // just in case, lets make it explicit...
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+        if (System.getProperty("I2P_DISABLE_TIMEZONE_OVERRIDE") == null) {
+            System.setProperty("user.timezone", "GMT");
+            // just in case, lets make it explicit...
+            TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+        }
         // https://www.kb.cert.org/vuls/id/402580
         // http://docs.codehaus.org/display/JETTY/SystemProperties
         // Fixed in Jetty 5.1.15 but we are running 5.1.12
@@ -141,6 +155,9 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Instantiation only. Starts no threads. Does not install updates.
      *  RouterContext is created but not initialized.
      *  You must call runRouter() after any constructor to start things up.
+     *
+     *  Config file name is "router.config" unless router.configLocation set in system properties.
+     *  @throws IllegalStateException since 0.9.19 if another router with this config is running
      */
     public Router() { this(null, null); }
 
@@ -148,6 +165,11 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Instantiation only. Starts no threads. Does not install updates.
      *  RouterContext is created but not initialized.
      *  You must call runRouter() after any constructor to start things up.
+     *
+     *  Config file name is "router.config" unless router.configLocation set in envProps or system properties.
+     *
+     *  @param envProps may be null
+     *  @throws IllegalStateException since 0.9.19 if another router with this config is running
      */
     public Router(Properties envProps) { this(null, envProps); }
 
@@ -155,6 +177,9 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Instantiation only. Starts no threads. Does not install updates.
      *  RouterContext is created but not initialized.
      *  You must call runRouter() after any constructor to start things up.
+     *
+     *  @param configFilename may be null
+     *  @throws IllegalStateException since 0.9.19 if another router with this config is running
      */
     public Router(String configFilename) { this(configFilename, null); }
 
@@ -162,6 +187,30 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Instantiation only. Starts no threads. Does not install updates.
      *  RouterContext is created but not initialized.
      *  You must call runRouter() after any constructor to start things up.
+     *
+     *  If configFilename is non-null, configuration is read in from there.
+     *  Else if envProps is non-null, configuration is read in from the
+     *  location given in the router.configLocation property.
+     *  Else it's read in from the System property router.configLocation.
+     *  Else from the file "router.config".
+     *
+     *  The most important properties are i2p.dir.base (the install directory, may be read-only)
+     *  and i2p.dir.config (the user's configuration/data directory).
+     *
+     *  i2p.dir.base defaults to user.dir (CWD) but should almost always be set.
+     *
+     *  i2p.dir.config default depends on OS, user name (to detect if running as a service or not),
+     *  and auto-detection of whether there appears to be previous data files in the base dir.
+     *  See WorkingDir for details.
+     *  If the config dir does not exist, it will be created, and files migrated from the base dir,
+     *  in this constructor.
+     *  If files in an existing config dir indicate that another router is already running
+     *  with this directory, the constructor will delay for several seconds to be sure,
+     *  and then call System.exit(-1).
+     *
+     *  @param configFilename may be null
+     *  @param envProps may be null
+     *  @throws IllegalStateException since 0.9.19 if another router with this config is running
      */
     public Router(String configFilename, Properties envProps) {
         _killVMOnEnd = true;
@@ -273,7 +322,13 @@ public class Router implements RouterClock.ClockShiftListener {
                 System.err.println("       Please make sure to shut down old instances before starting up");
                 System.err.println("       a new one.  If you are positive that no other instance is running,");
                 System.err.println("       please delete the file " + getPingFile().getAbsolutePath());
-                System.exit(-1);
+                //System.exit(-1);
+                // throw exception instead, for embedded
+                throw new IllegalStateException(
+                                   "ERROR: There appears to be another router already running!" +
+                                   " Please make sure to shut down old instances before starting up" +
+                                   " a new one.  If you are positive that no other instance is running," +
+                                   " please delete the file " + getPingFile().getAbsolutePath());
             }
         }
 
@@ -287,6 +342,7 @@ public class Router implements RouterClock.ClockShiftListener {
             _config.put("router.previousVersion", RouterVersion.VERSION);
             saveConfig();
         }
+        changeState(State.INITIALIZED);
         // *********  Start no threads before here ********* //
     }
 
@@ -294,6 +350,9 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Initializes the RouterContext.
      *  Starts some threads. Does not install updates.
      *  All this was in the constructor.
+     *
+     *  Could block for 10 seconds or forever if waiting for entropy
+     *
      *  @since 0.8.12
      */
     private void startupStuff() {
@@ -308,6 +367,11 @@ public class Router implements RouterClock.ClockShiftListener {
         // Both of these as of 0.7.9
         System.setProperty("router.version", RouterVersion.VERSION);
 
+        // crypto init may block for 10 seconds waiting for entropy
+        // we want to do this before context.initAll()
+        // which will fire up several things that could block on the PRNG init
+        warmupCrypto();
+
         // NOW we start all the activity
         _context.initAll();
 
@@ -329,7 +393,6 @@ public class Router implements RouterClock.ClockShiftListener {
         _higherVersionSeen = false;
         _log = _context.logManager().getLog(Router.class);
         _log.info("New router created with config file " + _configFilename);
-        //_sessionKeyPersistenceHelper = new SessionKeyPersistenceHelper(_context);
         _oomListener = new OOMListener(_context);
 
         _shutdownHook = new ShutdownHook(_context);
@@ -344,7 +407,10 @@ public class Router implements RouterClock.ClockShiftListener {
         
     }
     
-    /** @since 0.8.8 */
+    /**
+     *  Not for external use.
+     *  @since 0.8.8
+     */
     public static final void clearCaches() {
         ByteCache.clearAll();
         SimpleByteCache.clearAll();
@@ -359,6 +425,7 @@ public class Router implements RouterClock.ClockShiftListener {
     /**
      * Configure the router to kill the JVM when the router shuts down, as well
      * as whether to explicitly halt the JVM during the hard fail process.
+     *
      * Defaults to true. Set to false for embedded before calling runRouter()
      */
     public void setKillVMOnEnd(boolean shouldDie) { _killVMOnEnd = shouldDie; }
@@ -413,12 +480,14 @@ public class Router implements RouterClock.ClockShiftListener {
     }
     
     /**
-     *  Warning, may be null if called very early
+     *  Our current router info.
+     *  Warning, may be null if called very early.
      */
     public RouterInfo getRouterInfo() { return _routerInfo; }
 
     /**
-     *  Caller must ensure info is valid - no validation done here
+     *  Caller must ensure info is valid - no validation done here.
+     *  Not for external use.
      */
     public void setRouterInfo(RouterInfo info) { 
         _routerInfo = info; 
@@ -442,6 +511,9 @@ public class Router implements RouterClock.ClockShiftListener {
      */
     public void setHigherVersionSeen(boolean seen) { _higherVersionSeen = seen; }
     
+    /**
+     *  Used only by routerconsole.. to be deprecated?
+     */
     public long getWhenStarted() { return _started; }
 
     /** wall clock uptime */
@@ -450,6 +522,12 @@ public class Router implements RouterClock.ClockShiftListener {
         return Math.max(1, _context.clock().now() - _context.clock().getOffset() - _started);
     }
     
+    /**
+     *  Non-null, but take care when accessing context items before runRouter() is called
+     *  as the context will not be initialized.
+     *
+     *  @return non-null
+     */
     public RouterContext getContext() { return _context; }
     
     /**
@@ -459,11 +537,18 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Standard standalone installation uses main() instead, which
      *  checks for updates and then calls this.
      *
+     *  This may take quite a while, especially if NTP fails
+     *  or the system lacks entropy
+     *
      *  @since public as of 0.9 for Android and other embedded uses
+     *  @throws IllegalStateException if called more than once
      */
     public synchronized void runRouter() {
-        if (_isAlive)
-            throw new IllegalStateException();
+        synchronized(_stateLock) {
+            if (_state != State.INITIALIZED)
+                throw new IllegalStateException();
+            changeState(State.STARTING_1);
+        }
         String last = _config.get("router.previousFullVersion");
         if (last != null) {
             _eventLog.addEvent(EventLog.UPDATED, "from " + last + " to " + RouterVersion.FULL_VERSION);
@@ -471,7 +556,7 @@ public class Router implements RouterClock.ClockShiftListener {
         }
         _eventLog.addEvent(EventLog.STARTED, RouterVersion.FULL_VERSION);
         startupStuff();
-        _isAlive = true;
+        changeState(State.STARTING_2);
         _started = _context.clock().now();
         try {
             Runtime.getRuntime().addShutdownHook(_shutdownHook);
@@ -493,8 +578,6 @@ public class Router implements RouterClock.ClockShiftListener {
         //_context.jobQueue().addJob(new CoalesceStatsJob(_context));
         _context.simpleScheduler().addPeriodicEvent(new CoalesceStatsEvent(_context), COALESCE_TIME);
         _context.jobQueue().addJob(new UpdateRoutingKeyModifierJob(_context));
-        warmupCrypto();
-        //_sessionKeyPersistenceHelper.startup();
         //_context.adminManager().startup();
         _context.blocklist().startup();
 
@@ -518,6 +601,7 @@ public class Router implements RouterClock.ClockShiftListener {
         if (_log.shouldLog(Log.INFO))
             _log.info("Waited " + waited + "ms to initialize");
 
+        changeState(State.STARTING_3);
         _context.jobQueue().addJob(new StartupJob(_context));
     }
     
@@ -526,7 +610,8 @@ public class Router implements RouterClock.ClockShiftListener {
      * It does not clear the config first, so settings not found in
      * the file will remain in the config.
      *
-     * This is synchronized with saveConfig()
+     * This is synchronized with saveConfig().
+     * Not for external use.
      */
     public void readConfig() {
         synchronized(_configFileLock) {
@@ -573,15 +658,156 @@ public class Router implements RouterClock.ClockShiftListener {
         }
         return props;
     }
+
+    ////////// begin state management
     
-    public boolean isAlive() { return _isAlive; }
+    /**
+     *  Startup / shutdown states
+     *
+     *  @since 0.9.18
+     */
+    private enum State {
+        UNINITIALIZED,
+        /** constructor complete */
+        INITIALIZED,
+        /** runRouter() called */
+        STARTING_1,
+        /** startupStuff() complete, most of the time here is NTP */
+        STARTING_2,
+        /** NTP done, Job queue started, StartupJob queued, runRouter() returned */
+        STARTING_3,
+        /** RIs loaded. From STARTING_3 */
+        NETDB_READY,
+        /** Non-zero-hop expl. tunnels built. From STARTING_3 */
+        EXPL_TUNNELS_READY,
+        /** from NETDB_READY or EXPL_TUNNELS_READY */
+        RUNNING,
+        /**
+         *  A "soft" restart, primarily of the comm system, after
+         *  a port change or large step-change in system time.
+         *  Does not stop the whole JVM, so it is safe even in the absence
+         *  of the wrapper.
+         *  This is not a graceful restart - all peer connections are dropped immediately.
+         */
+        RESTARTING,
+        /** cancellable shutdown has begun */
+        GRACEFUL_SHUTDOWN,
+        /** In shutdown(). Non-cancellable shutdown has begun */
+        FINAL_SHUTDOWN_1,
+        /** In shutdown2(). Killing everything */
+        FINAL_SHUTDOWN_2,
+        /** In finalShutdown(). Final cleanup */
+        FINAL_SHUTDOWN_3,
+        /** all done */
+        STOPPED
+    }
     
+    /**
+     *  @since 0.9.18
+     */
+    private void changeState(State state) {
+        State oldState;
+        synchronized(_stateLock) {
+            oldState = _state;
+            _state = state;
+        }
+        if (_log != null && state != State.STOPPED && _log.shouldLog(Log.WARN))
+            _log.warn("Router state change from " + oldState + " to " + state /* , new Exception() */ );
+    }
+
+    /**
+     *  True during the initial start, but false during a soft restart.
+     */
+    public boolean isAlive() {
+        synchronized(_stateLock) {
+            return _state == State.RUNNING ||
+                   _state == State.GRACEFUL_SHUTDOWN ||
+                   _state == State.STARTING_1 ||
+                   _state == State.STARTING_2 ||
+                   _state == State.STARTING_3 ||
+                   _state == State.NETDB_READY ||
+                   _state == State.EXPL_TUNNELS_READY;
+        }
+    }
+
+    /**
+     *  Only for Restarter, after soft restart is complete.
+     *  Not for external use.
+     *  @since 0.8.12
+     */
+    public void setIsAlive() {
+        changeState(State.RUNNING);
+    }
+
+    /**
+     *  Only for NetDB, after RIs are loaded.
+     *  Not for external use.
+     *  @since 0.9.18
+     */
+    public void setNetDbReady() {
+        synchronized(_stateLock) {
+            if (_state == State.STARTING_3)
+                changeState(State.NETDB_READY);
+            else if (_state == State.EXPL_TUNNELS_READY)
+                changeState(State.RUNNING);
+        }
+    }
+
+    /**
+     *  Only for Tunnel Building, after we have non-zero-hop expl. tunnels.
+     *  Not for external use.
+     *  @since 0.9.18
+     */
+    public void setExplTunnelsReady() {
+        synchronized(_stateLock) {
+            if (_state == State.STARTING_3)
+                changeState(State.EXPL_TUNNELS_READY);
+            else if (_state == State.NETDB_READY)
+                changeState(State.RUNNING);
+        }
+    }
+
+    /**
+     * Is a graceful shutdown in progress? This may be cancelled.
+     * Note that this also returns true if an uncancellable final shutdown is in progress.
+     */
+    public boolean gracefulShutdownInProgress() {
+        synchronized(_stateLock) {
+            return _state == State.GRACEFUL_SHUTDOWN ||
+                   _state == State.FINAL_SHUTDOWN_1 ||
+                   _state == State.FINAL_SHUTDOWN_2 ||
+                   _state == State.FINAL_SHUTDOWN_3 ||
+                   _state == State.STOPPED;
+        }
+    }
+
+    /**
+     * Is a final shutdown in progress? This may not be cancelled.
+     * @since 0.8.12
+     */
+    public boolean isFinalShutdownInProgress() {
+        synchronized(_stateLock) {
+            return _state == State.FINAL_SHUTDOWN_1 ||
+                   _state == State.FINAL_SHUTDOWN_2 ||
+                   _state == State.FINAL_SHUTDOWN_3 ||
+                   _state == State.STOPPED;
+        }
+    }
+
+    ////////// end state management
+
     /**
      * Rebuild and republish our routerInfo since something significant 
      * has changed.
+     * Not for external use.
      */
     public void rebuildRouterInfo() { rebuildRouterInfo(false); }
 
+    /**
+     * Rebuild and republish our routerInfo since something significant 
+     * has changed.
+     * Not for external use.
+     */
     public void rebuildRouterInfo(boolean blockingRebuild) {
         if (_log.shouldLog(Log.INFO))
             _log.info("Rebuilding new routerInfo");
@@ -626,15 +852,30 @@ public class Router implements RouterClock.ClockShiftListener {
     public static final char CAPABILITY_BW64 = 'M';
     public static final char CAPABILITY_BW128 = 'N';
     public static final char CAPABILITY_BW256 = 'O';
+    /** @since 0.9.18 */
+    public static final char CAPABILITY_BW512 = 'P';
+    /** @since 0.9.18 */
+    public static final char CAPABILITY_BW_UNLIMITED = 'X';
+    /** for testing */
     public static final String PROP_FORCE_BWCLASS = "router.forceBandwidthClass";
     
     public static final char CAPABILITY_REACHABLE = 'R';
     public static final char CAPABILITY_UNREACHABLE = 'U';
+    /** for testing */
     public static final String PROP_FORCE_UNREACHABLE = "router.forceUnreachable";
 
     /** @deprecated unused */
     public static final char CAPABILITY_NEW_TUNNEL = 'T';
     
+    /**
+     *  For building our RI. Not for external use.
+     *  This does not publish the ri.
+     *  This does not use anything in the ri (i.e. it can be freshly constructed)
+     *
+     *  TODO just return a string instead of passing in the RI? See PublishLocalRouterInfoJob.
+     *
+     *  @param ri an unpublished ri we are generating.
+     */
     public void addCapabilities(RouterInfo ri) {
         int bwLim = Math.min(_context.bandwidthLimiter().getInboundKBytesPerSecond(),
                              _context.bandwidthLimiter().getOutboundKBytesPerSecond());
@@ -653,7 +894,19 @@ public class Router implements RouterClock.ClockShiftListener {
             ri.addCapability(CAPABILITY_BW64);
         } else if (bwLim <= 128) {
             ri.addCapability(CAPABILITY_BW128);
-        } else { // ok, more than 128KBps... aka "lots"
+        } else if (bwLim <= 256) {
+            ri.addCapability(CAPABILITY_BW256);
+        } else if (bwLim <= 2000) {    // TODO adjust threshold
+            // 512 supported as of 0.9.18;
+            // Add 256 as well for compatibility
+            // TODO uncomment
+            //ri.addCapability(CAPABILITY_BW512);
+            ri.addCapability(CAPABILITY_BW256);
+        } else {
+            // Unlimited supported as of 0.9.18;
+            // Add 256 as well for compatibility
+            // TODO uncomment
+            //ri.addCapability(CAPABILITY_BW_UNLIMITED);
             ri.addCapability(CAPABILITY_BW256);
         }
         
@@ -719,6 +972,9 @@ public class Router implements RouterClock.ClockShiftListener {
         "sessionKeys.dat"     // no longer used
     };
 
+    /**
+     *  Not for external use.
+     */
     public void killKeys() {
         //new Exception("Clearing identity files").printStackTrace();
         for (int i = 0; i < _rebuildFiles.length; i++) {
@@ -747,6 +1003,9 @@ public class Router implements RouterClock.ClockShiftListener {
      * Rebuild a new identity the hard way - delete all of our old identity 
      * files, then reboot the router.
      *
+     *  Calls exit(), never returns.
+     *
+     *  Not for external use.
      */
     public synchronized void rebuildNewIdentity() {
         if (_shutdownHook != null) {
@@ -773,6 +1032,9 @@ public class Router implements RouterClock.ClockShiftListener {
         finalShutdown(EXIT_HARD_RESTART);
     }
     
+    /**
+     *  Could block for 10 seconds or forever
+     */
     private void warmupCrypto() {
         _context.random().nextBoolean();
         // Instantiate to fire up the YK refiller thread
@@ -791,19 +1053,37 @@ public class Router implements RouterClock.ClockShiftListener {
         //_context.inNetMessagePool().registerHandlerJobBuilder(TunnelMessage.MESSAGE_TYPE, new TunnelMessageHandler(_context));
     }
     
+    /** shut down after all tunnels are gone */
     public static final int EXIT_GRACEFUL = 2;
+    /** shut down immediately */
     public static final int EXIT_HARD = 3;
+    /** shut down immediately */
     public static final int EXIT_OOM = 10;
+    /** shut down immediately, and tell the wrapper to restart */
     public static final int EXIT_HARD_RESTART = 4;
+    /** shut down after all tunnels are gone, and tell the wrapper to restart */
     public static final int EXIT_GRACEFUL_RESTART = 5;
     
     /**
-     *  Shutdown with no chance of cancellation
+     *  Shutdown with no chance of cancellation.
+     *  Blocking, will call exit() and not return unless setKillVMOnExit(false) was previously called,
+     *  or a final shutdown is already in progress.
+     *  May take several seconds as it runs all the shutdown hooks.
+     *
+     *  @param exitCode one of the EXIT_* values, non-negative
+     *  @throws IllegalArgumentException if exitCode negative
      */
     public synchronized void shutdown(int exitCode) {
-        if (_shutdownInProgress)
-            return;
-        _shutdownInProgress = true;
+        if (exitCode < 0)
+            throw new IllegalArgumentException();
+        synchronized(_stateLock) {
+            if (_state == State.FINAL_SHUTDOWN_1 ||
+                _state == State.FINAL_SHUTDOWN_2 ||
+                _state == State.FINAL_SHUTDOWN_3 ||
+                _state == State.STOPPED)
+                return;
+            changeState(State.FINAL_SHUTDOWN_1);
+        }
         _context.throttle().setShutdownStatus();
         if (_shutdownHook != null) {
             try {
@@ -817,12 +1097,17 @@ public class Router implements RouterClock.ClockShiftListener {
      *  Cancel the JVM runtime hook before calling this.
      *  Called by the ShutdownHook.
      *  NOT to be called by others, use shutdown().
+     *
+     *  @param exitCode one of the EXIT_* values, non-negative
+     *  @throws IllegalArgumentException if exitCode negative
      */
     public synchronized void shutdown2(int exitCode) {
+        if (exitCode < 0)
+            throw new IllegalArgumentException();
+        changeState(State.FINAL_SHUTDOWN_2);
         // help us shut down esp. after OOM
         int priority = (exitCode == EXIT_OOM) ? Thread.MAX_PRIORITY - 1 : Thread.NORM_PRIORITY + 2;
         Thread.currentThread().setPriority(priority);
-        _shutdownInProgress = true;
         _log.log(Log.CRIT, "Starting final shutdown(" + exitCode + ')');
         // So we can get all the way to the end
         // No, you can't do Thread.currentThread.setDaemon(false)
@@ -832,7 +1117,6 @@ public class Router implements RouterClock.ClockShiftListener {
             } catch (Throwable t) {}
         }
         ((RouterClock) _context.clock()).removeShiftListener(this);
-        _isAlive = false;
         _context.random().saveSeed();
         I2PThread.removeOOMEventListener(_oomListener);
         // Run the shutdown hooks first in case they want to send some goodbye messages
@@ -914,8 +1198,11 @@ public class Router implements RouterClock.ClockShiftListener {
 
     /**
      *  Cancel the JVM runtime hook before calling this.
+     *
+     *  @param exitCode one of the EXIT_* values, non-negative
      */
     private synchronized void finalShutdown(int exitCode) {
+        changeState(State.FINAL_SHUTDOWN_3);
         clearCaches();
         _log.log(Log.CRIT, "Shutdown(" + exitCode + ") complete"  /* , new Exception("Shutdown") */ );
         try { _context.logManager().shutdown(); } catch (Throwable t) { }
@@ -948,9 +1235,12 @@ public class Router implements RouterClock.ClockShiftListener {
         } else if (SystemVersion.isAndroid()) {
             Runtime.getRuntime().gc();
         }
+        changeState(State.STOPPED);
     }
     
     /**
+     * Non-blocking shutdown.
+     *
      * Call this if we want the router to kill itself as soon as we aren't 
      * participating in any more tunnels (etc).  This will not block and doesn't
      * guarantee any particular time frame for shutting down.  To shut the 
@@ -958,17 +1248,35 @@ public class Router implements RouterClock.ClockShiftListener {
      * the graceful shutdown (prior to actual shutdown ;), call 
      * {@link #cancelGracefulShutdown}.
      *
+     * Exit code will be EXIT_GRACEFUL.
+     *
+     * Shutdown delay will be from zero to 11 minutes.
      */
     public void shutdownGracefully() {
         shutdownGracefully(EXIT_GRACEFUL);
     }
+
     /**
+     * Non-blocking shutdown.
+     *
      * Call this with EXIT_HARD or EXIT_HARD_RESTART for a non-blocking,
      * hard, non-graceful shutdown with a brief delay to allow a UI response
+     *
+     * Returns silently if a final shutdown is already in progress.
+     *
+     * @param exitCode one of the EXIT_* values, non-negative
+     * @throws IllegalArgumentException if exitCode negative
      */
     public void shutdownGracefully(int exitCode) {
+        if (exitCode < 0)
+            throw new IllegalArgumentException();
+        synchronized(_stateLock) {
+            if (isFinalShutdownInProgress())
+                return; // too late
+            changeState(State.GRACEFUL_SHUTDOWN);
+        }
         _gracefulExitCode = exitCode;
-        _config.put(PROP_SHUTDOWN_IN_PROGRESS, "true");
+        //_config.put(PROP_SHUTDOWN_IN_PROGRESS, "true");
         _context.throttle().setShutdownStatus();
         synchronized (_gracefulShutdownDetector) {
             _gracefulShutdownDetector.notifyAll();
@@ -978,10 +1286,16 @@ public class Router implements RouterClock.ClockShiftListener {
     /**
      * Cancel any prior request to shut the router down gracefully.
      *
+     * Returns silently if a final shutdown is already in progress.
      */
     public void cancelGracefulShutdown() {
+        synchronized(_stateLock) {
+            if (isFinalShutdownInProgress())
+                return; // too late
+            changeState(State.RUNNING);
+        }
         _gracefulExitCode = -1;
-        _config.remove(PROP_SHUTDOWN_IN_PROGRESS);
+        //_config.remove(PROP_SHUTDOWN_IN_PROGRESS);
         _context.throttle().cancelShutdownStatus();
         synchronized (_gracefulShutdownDetector) {
             _gracefulShutdownDetector.notifyAll();
@@ -990,25 +1304,15 @@ public class Router implements RouterClock.ClockShiftListener {
 
     /**
      * What exit code do we plan on using when we shut down (or -1, if there isn't a graceful shutdown planned)
+     *
+     * @return one of the EXIT_* values or -1
      */
     public int scheduledGracefulExitCode() { return _gracefulExitCode; }
 
     /**
-     * Is a graceful shutdown in progress? This may be cancelled.
-     */
-    public boolean gracefulShutdownInProgress() {
-        return (null != _config.get(PROP_SHUTDOWN_IN_PROGRESS));
-    }
-
-    /**
-     * Is a final shutdown in progress? This may not be cancelled.
-     * @since 0.8.12
+     *  How long until the graceful shutdown will kill us?
+     *  @return -1 if no shutdown in progress.
      */
-    public boolean isFinalShutdownInProgress() {
-        return _shutdownInProgress;
-    }
-
-    /** How long until the graceful shutdown will kill us?  */
     public long getShutdownTimeRemaining() {
         if (_gracefulExitCode <= 0) return -1; // maybe Long.MAX_VALUE would be better?
         if (_gracefulExitCode == EXIT_HARD || _gracefulExitCode == EXIT_HARD_RESTART)
@@ -1045,7 +1349,7 @@ public class Router implements RouterClock.ClockShiftListener {
     }
     
     /**
-     * Updates the current config and then saves it.
+     * Updates the current config with the given key/value and then saves it.
      * Prevents a race in the interval between setConfigSetting() / removeConfigSetting() and saveConfig(),
      * Synchronized with getConfig() / saveConfig()
      *
@@ -1094,10 +1398,12 @@ public class Router implements RouterClock.ClockShiftListener {
      *  @since 0.8.8
      */
     public void clockShift(long delta) {
-        if (gracefulShutdownInProgress() || !_isAlive)
-            return;
         if (delta > -60*1000 && delta < 60*1000)
             return;
+        synchronized(_stateLock) {
+            if (gracefulShutdownInProgress() || !isAlive())
+                return;
+        }
         _eventLog.addEvent(EventLog.CLOCK_SHIFT, Long.toString(delta));
         // update the routing key modifier
         _context.routerKeyGenerator().generateDateBasedModData();
@@ -1119,32 +1425,32 @@ public class Router implements RouterClock.ClockShiftListener {
      *
      *  As of 0.8.8, this returns immediately and does the actual restart in a separate thread.
      *  Poll isAlive() if you need to know when the restart is complete.
+     *
+     *  Not recommended for external use.
      */
     public synchronized void restart() {
-        if (gracefulShutdownInProgress() || !_isAlive)
-            return;
+        synchronized(_stateLock) {
+            if (gracefulShutdownInProgress() || !isAlive())
+                return;
+            changeState(State.RESTARTING);
+        }
         ((RouterClock) _context.clock()).removeShiftListener(this);
-        _isAlive = false;
-        _started = _context.clock().now();
+        // Let's not stop accepting tunnels, etc
+        //_started = _context.clock().now();
         Thread t = new Thread(new Restarter(_context), "Router Restart");
         t.setPriority(Thread.NORM_PRIORITY + 1);
         t.start();
     }    
 
-    /**
-     *  Only for Restarter
-     *  @since 0.8.12
-     */
-    public void setIsAlive() {
-        _isAlive = true;
-    }
-
     /**
      *  Usage: Router [rebuild]
      *  No other options allowed, for now
      *  Instantiates Router(), and either installs updates and exits,
      *  or calls runRouter().
      *
+     *  Not recommended for embedded use.
+     *  Applications bundling I2P should instantiate a Router and call runRouter().
+     *
      *  @param args null ok
      *  @throws IllegalArgumentException
      */
@@ -1174,7 +1480,13 @@ public class Router implements RouterClock.ClockShiftListener {
 
         System.out.println("Starting I2P " + RouterVersion.FULL_VERSION);
         //verifyWrapperConfig();
-        Router r = new Router();
+        Router r;
+        try {
+            r = new Router();
+        } catch (IllegalStateException ise) {
+            System.exit(-1);
+            return;
+        }
         if (rebuild) {
             r.rebuildNewIdentity();
         } else {
@@ -1196,6 +1508,8 @@ public class Router implements RouterClock.ClockShiftListener {
      * Context must be available.
      * Unzip update file found in the router dir OR base dir, to the base dir
      *
+     * If successfull, will call exit() and never return.
+     *
      * If we can't write to the base dir, complain.
      * Note: _log not available here.
      */
@@ -1403,7 +1717,7 @@ public class Router implements RouterClock.ClockShiftListener {
         return f;
     }
     
-    static final long LIVELINESS_DELAY = 60*1000;
+    private static final long LIVELINESS_DELAY = 60*1000;
     
     /** 
      * Check the file "router.ping", but if 
@@ -1462,8 +1776,15 @@ public class Router implements RouterClock.ClockShiftListener {
         return DEFAULT_SHARE_PERCENTAGE / 100.0d;
     }
 
+    /**
+     *  Max of inbound and outbound rate in bytes per second
+     */
     public int get1sRate() { return get1sRate(false); }
 
+    /**
+     *  When outboundOnly is false, outbound rate in bytes per second.
+     *  When true, max of inbound and outbound rate in bytes per second.
+     */
     public int get1sRate(boolean outboundOnly) {
             FIFOBandwidthLimiter bw = _context.bandwidthLimiter();
                 int out = (int)bw.getSendBps();
@@ -1472,13 +1793,23 @@ public class Router implements RouterClock.ClockShiftListener {
                 return (int)Math.max(out, bw.getReceiveBps());
     }
 
+    /**
+     *  Inbound rate in bytes per second
+     */
     public int get1sRateIn() {
             FIFOBandwidthLimiter bw = _context.bandwidthLimiter();
                 return (int) bw.getReceiveBps();
     }
 
+    /**
+     *  Max of inbound and outbound rate in bytes per second
+     */
     public int get15sRate() { return get15sRate(false); }
 
+    /**
+     *  When outboundOnly is false, outbound rate in bytes per second.
+     *  When true, max of inbound and outbound rate in bytes per second.
+     */
     public int get15sRate(boolean outboundOnly) {
             FIFOBandwidthLimiter bw = _context.bandwidthLimiter();
                 int out = (int)bw.getSendBps15s();
@@ -1487,13 +1818,23 @@ public class Router implements RouterClock.ClockShiftListener {
                 return (int)Math.max(out, bw.getReceiveBps15s());
     }
 
+    /**
+     *  Inbound rate in bytes per second
+     */
     public int get15sRateIn() {
             FIFOBandwidthLimiter bw = _context.bandwidthLimiter();
                 return (int) bw.getReceiveBps15s();
     }
 
+    /**
+     *  Max of inbound and outbound rate in bytes per second
+     */
     public int get1mRate() { return get1mRate(false); }
 
+    /**
+     *  When outboundOnly is false, outbound rate in bytes per second.
+     *  When true, max of inbound and outbound rate in bytes per second.
+     */
     public int get1mRate(boolean outboundOnly) {
         int send = 0;
         StatManager mgr = _context.statManager();
@@ -1509,6 +1850,9 @@ public class Router implements RouterClock.ClockShiftListener {
         return Math.max(send, recv);
     }
 
+    /**
+     *  Inbound rate in bytes per second
+     */
     public int get1mRateIn() {
         StatManager mgr = _context.statManager();
         RateStat rs = mgr.getRate("bw.recvRate");
@@ -1518,8 +1862,15 @@ public class Router implements RouterClock.ClockShiftListener {
         return recv;
     }
 
+    /**
+     *  Max of inbound and outbound rate in bytes per second
+     */
     public int get5mRate() { return get5mRate(false); }
 
+    /**
+     *  When outboundOnly is false, outbound rate in bytes per second.
+     *  When true, max of inbound and outbound rate in bytes per second.
+     */
     public int get5mRate(boolean outboundOnly) {
         int send = 0;
         RateStat rs = _context.statManager().getRate("bw.sendRate");
diff --git a/router/java/src/net/i2p/router/RouterClock.java b/router/java/src/net/i2p/router/RouterClock.java
index 051d282cdacc5414caf416fe75e812aac411637f..5bcafc8865fb766b05de0e4d2ef3cf8cef271561 100644
--- a/router/java/src/net/i2p/router/RouterClock.java
+++ b/router/java/src/net/i2p/router/RouterClock.java
@@ -95,15 +95,19 @@ public class RouterClock extends Clock {
         long delta = offsetMs - _offset;
         if (!force) {
             if ((offsetMs > MAX_OFFSET) || (offsetMs < 0 - MAX_OFFSET)) {
-                getLog().error("Maximum offset shift exceeded [" + offsetMs + "], NOT HONORING IT");
+                Log log = getLog();
+                if (log.shouldLog(Log.WARN))
+                    log.warn("Maximum offset shift exceeded [" + offsetMs + "], NOT HONORING IT");
                 return;
             }
             
             // only allow substantial modifications before the first 10 minutes
             if (_alreadyChanged && (System.currentTimeMillis() - _startedOn > 10 * 60 * 1000)) {
                 if ( (delta > MAX_LIVE_OFFSET) || (delta < 0 - MAX_LIVE_OFFSET) ) {
-                    getLog().log(Log.CRIT, "The clock has already been updated, but you want to change it by "
-                                           + delta + " to " + offsetMs + "?  Did something break?");
+                    Log log = getLog();
+                    if (log.shouldLog(Log.WARN))
+                        log.warn("The clock has already been updated, ignoring request to change it by "
+                                           + delta + " to " + offsetMs, new Exception());
                     return;
                 }
             }
@@ -118,7 +122,9 @@ public class RouterClock extends Clock {
             // only listen to a worse stratum if it's been a while
             if (_alreadyChanged && stratum > _lastStratum &&
                 System.currentTimeMillis() - _lastChanged < MIN_DELAY_FOR_WORSE_STRATUM) {
-                getLog().debug("Ignoring update from a stratum " + stratum +
+                Log log = getLog();
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Ignoring update from a stratum " + stratum +
                               " clock, we recently had an update from a stratum " + _lastStratum + " clock");
                 return;
             }
@@ -142,7 +148,9 @@ public class RouterClock extends Clock {
                                        "ms to " + predictedPeerClockSkew + "ms. Bad time server?");
                         return;
                     } else {
-                        getLog().debug("Approving clock offset " + offsetMs + "ms (current " + _offset +
+                        Log log = getLog();
+                        if (log.shouldLog(Log.DEBUG))
+                            log.debug("Approving clock offset " + offsetMs + "ms (current " + _offset +
                                        "ms) since it would decrease peer clock skew from " + currentPeerClockSkew +
                                        "ms to " + predictedPeerClockSkew + "ms.");
                     }
@@ -167,7 +175,9 @@ public class RouterClock extends Clock {
             _context.statManager().addRateData("clock.skew", delta);
             _desiredOffset = offsetMs;
         } else {
-            getLog().log(Log.INFO, "Initializing clock offset to " + offsetMs + "ms, Stratum " + stratum);
+            Log log = getLog();
+            if (log.shouldLog(Log.INFO))
+                log.info("Initializing clock offset to " + offsetMs + "ms, Stratum " + stratum);
             _alreadyChanged = true;
             _offset = offsetMs;
             _desiredOffset = offsetMs;
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index fd5c65775953215c6623473f4d9979c3e6e1a55b..efc0036fae4c6b20015bd6d171070535b24329d7 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -181,6 +181,7 @@ public class RouterContext extends I2PAppContext {
         }
         _clientMessagePool = new ClientMessagePool(this);
         _jobQueue = new JobQueue(this);
+        _jobQueue.startup();
         _inNetMessagePool = new InNetMessagePool(this);
         _outNetMessagePool = new OutNetMessagePool(this);
         _messageHistory = new MessageHistory(this);
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index 275e4d85a4667fd1522ef496b52e07b47c5bf488..3bae2fd964aafc03a077d322bfd5bbe834fc72b4 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -24,11 +24,14 @@ class RouterThrottleImpl implements RouterThrottle {
      * to a job, we're congested.
      *
      */
-    private static int JOB_LAG_LIMIT = 2*1000;
+    private static final long JOB_LAG_LIMIT_NETWORK = 2*1000;
+    private static final long JOB_LAG_LIMIT_NETDB = 2*1000;
+    // TODO reduce
+    private static final long JOB_LAG_LIMIT_TUNNEL = 500;
     private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels";
     private static final int DEFAULT_MAX_TUNNELS = 5000;
     private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle";
-    private static final long DEFAULT_REJECT_STARTUP_TIME = 20*60*1000;
+    private static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000;
     private static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime";
 
     /**
@@ -50,7 +53,7 @@ class RouterThrottleImpl implements RouterThrottle {
         _context.simpleScheduler().addEvent(new ResetStatus(), 5*1000 + _context.getProperty(PROP_REJECT_STARTUP_TIME, DEFAULT_REJECT_STARTUP_TIME));
         _context.statManager().createRateStat("router.throttleNetworkCause", "How lagged the jobQueue was when an I2NP was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
         //_context.statManager().createRateStat("router.throttleNetDbCause", "How lagged the jobQueue was when a networkDb request was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
-        //_context.statManager().createRateStat("router.throttleTunnelCause", "How lagged the jobQueue was when a tunnel request was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
+        _context.statManager().createRateStat("router.throttleTunnelCause", "How lagged the jobQueue was when a tunnel request was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("tunnel.bytesAllocatedAtAccept", "How many bytes had been 'allocated' for participating tunnels when we accepted a request?", "Tunnels", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("router.throttleTunnelProcessingTime1m", "How long it takes to process a message (1 minute average) when we throttle a tunnel?", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("router.throttleTunnelProcessingTime10m", "How long it takes to process a message (10 minute average) when we throttle a tunnel?", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 });
@@ -77,13 +80,21 @@ class RouterThrottleImpl implements RouterThrottle {
         }
     }
 
+    /** 
+     * Should we accept any more data from the network for any sort of message, 
+     * taking into account our current load, or should we simply slow down?  
+     *
+     * FIXME only called by SSU Receiver, not NTCP!
+     * FIXME should put warning on the console
+     * FIXME or should we do this at all? We have Codel queues all over now...
+     */
     public boolean acceptNetworkMessage() {
         //if (true) return true;
         long lag = _context.jobQueue().getMaxLag();
-        if ( (lag > JOB_LAG_LIMIT) && (_context.router().getUptime() > 60*1000) ) {
+        if ( (lag > JOB_LAG_LIMIT_NETWORK) && (_context.router().getUptime() > 60*1000) ) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Throttling network reader, as the job lag is " + lag);
-            _context.statManager().addRateData("router.throttleNetworkCause", lag, lag);
+            _context.statManager().addRateData("router.throttleNetworkCause", lag);
             return false;
         } else {
             return true;
@@ -93,10 +104,10 @@ class RouterThrottleImpl implements RouterThrottle {
     /** @deprecated unused, function moved to netdb */
     public boolean acceptNetDbLookupRequest(Hash key) { 
         long lag = _context.jobQueue().getMaxLag();
-        if (lag > JOB_LAG_LIMIT) {
+        if (lag > JOB_LAG_LIMIT_NETDB) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Refusing netDb request, as the job lag is " + lag);
-            _context.statManager().addRateData("router.throttleNetDbCause", lag, lag);
+            _context.statManager().addRateData("router.throttleNetDbCause", lag);
             return false;
         } else {
             return true;
@@ -104,10 +115,14 @@ class RouterThrottleImpl implements RouterThrottle {
     }
     
     /**
+     *  If we should send a reject, return a nonzero reject code.
+     *  Anything that causes us to drop a request instead of rejecting it
+     *  must go in BuildHandler.handleInboundRequest(), not here.
+     *
      *  @return 0 for accept or nonzero reject code
      */
     public int acceptTunnelRequest() { 
-        if (_context.getProperty(Router.PROP_SHUTDOWN_IN_PROGRESS) != null) {
+        if (_context.router().gracefulShutdownInProgress()) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Refusing tunnel request since we are shutting down ASAP");
             setShutdownStatus();
@@ -121,8 +136,16 @@ class RouterThrottleImpl implements RouterThrottle {
             return TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
         }
 
-        //long lag = _context.jobQueue().getMaxLag();
-        // reject here if lag too high???
+    /**** Moved to BuildHandler
+        long lag = _context.jobQueue().getMaxLag();
+        if (lag > JOB_LAG_LIMIT_TUNNEL) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Refusing tunnel request, as the job lag is " + lag);
+            _context.statManager().addRateData("router.throttleTunnelCause", lag);
+            setTunnelStatus(_x("Rejecting tunnels: High job lag"));
+            return TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
+        } 
+     ****/
         
         RateAverages ra = RateAverages.getTemp();
         
@@ -164,22 +187,29 @@ class RouterThrottleImpl implements RouterThrottle {
         
         int numTunnels = _context.tunnelManager().getParticipatingCount();
         int maxTunnels = _context.getProperty(PROP_MAX_TUNNELS, DEFAULT_MAX_TUNNELS);
+        if (numTunnels >= maxTunnels) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Refusing tunnel request since we are already participating in " 
+                          + numTunnels + " (our max is " + maxTunnels + ")");
+            _context.statManager().addRateData("router.throttleTunnelMaxExceeded", numTunnels);
+            setTunnelStatus(_x("Rejecting tunnels: Limit reached"));
+            return TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
+        }
 
 	// Throttle tunnels if min. throttle level is exceeded and default max participating tunnels (or fewer) is used.
         if ((numTunnels > getMinThrottleTunnels()) && (DEFAULT_MAX_TUNNELS <= maxTunnels)) {
-            double tunnelGrowthFactor = getTunnelGrowthFactor();
             Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(10*60*1000);
             if (avgTunnels != null) {
-                
                 double avg = avgTunnels.getAvgOrLifetimeAvg();
-                
+                double tunnelGrowthFactor = getTunnelGrowthFactor();
                 int min = getMinThrottleTunnels();
                 if (avg < min)
                     avg = min;
+                // if the current tunnel count is higher than 1.3 * the average...
                 if ( (avg > 0) && (avg*tunnelGrowthFactor < numTunnels) ) {
                     // we're accelerating, lets try not to take on too much too fast
                     double probAccept = (avg*tunnelGrowthFactor) / numTunnels;
-                    probAccept = probAccept * probAccept; // square the decelerator for tunnel counts
+                    probAccept *= probAccept; // square the decelerator for tunnel counts
                     int v = _context.random().nextInt(100);
                     if (v < probAccept*100) {
                         // ok
@@ -193,7 +223,12 @@ class RouterThrottleImpl implements RouterThrottle {
                         _context.statManager().addRateData("router.throttleTunnelProbTooFast", (long)(numTunnels-avg));
                         // hard to do {0} from here
                         //setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of tunnels: High number of requests");
-                        setTunnelStatus(_x("Rejecting most tunnels: High number of requests"));
+                        if (probAccept <= 0.5)
+                            setTunnelStatus(_x("Rejecting most tunnels: High number of requests"));
+                        else if (probAccept <= 0.9)
+                            setTunnelStatus(_x("Accepting most tunnels"));
+                        else
+                            setTunnelStatus(_x("Accepting tunnels"));
                         return TunnelHistory.TUNNEL_REJECT_PROBABALISTIC_REJECT;
                     }
                 } else {
@@ -239,15 +274,6 @@ class RouterThrottleImpl implements RouterThrottle {
             }
         }
         
-        if (numTunnels >= maxTunnels) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Refusing tunnel request since we are already participating in " 
-                          + numTunnels + " (our max is " + maxTunnels + ")");
-            _context.statManager().addRateData("router.throttleTunnelMaxExceeded", numTunnels);
-            setTunnelStatus(_x("Rejecting tunnels: Limit reached"));
-            return TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
-        }
-
         // ok, we're not hosed, but can we handle the bandwidth requirements 
         // of another tunnel?
         rs = _context.statManager().getRate("tunnel.participatingMessageCount");
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 895e8eb464be3ab9a6a5d0345dcc893f337f4947..25340f779d31df7c3f3df56d3d62b65ed0ca042b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index 65e119d8127fa1993bc36ae7ba8fa2bf26d492ec..709abe81bfd855b6016bc00c25ea85bb86fc27e1 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -151,8 +151,11 @@ public class StatisticsManager implements Service {
         // So that we will still get build requests
         stats.setProperty("stat_uptime", "90m");
         if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
-            stats.setProperty("netdb.knownRouters", ""+_context.netDb().getKnownRouters());
-            stats.setProperty("netdb.knownLeaseSets", ""+_context.netDb().getKnownLeaseSets());
+            stats.setProperty("netdb.knownRouters", String.valueOf(_context.netDb().getKnownRouters()));
+            int ls = _context.router().getUptime() > 30*60*1000 ?
+                     _context.netDb().getKnownLeaseSets() :
+                     30 + _context.random().nextInt(40);   // so it isn't obvious we restarted
+            stats.setProperty("netdb.knownLeaseSets", String.valueOf(ls));
         }
 
         return stats;
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index fd718e4799166d34e94c4a7442275bfafe8181ee..329cf5eaedf15b05c4d464b41c2a6901de435e33 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -237,9 +237,12 @@ public class TunnelPoolSettings {
     public Properties getUnknownOptions() { return _unknownOptions; }
     
     /**
+     *  Defaults in props are NOT honored.
+     *  In-JVM client side must promote defaults to the primary map.
+     *
      *  @param prefix non-null
      */
-    public void readFromProperties(String prefix, Map<Object, Object> props) {
+    public void readFromProperties(String prefix, Properties props) {
         for (Map.Entry<Object, Object> e : props.entrySet()) {
             String name = (String) e.getKey();
             String value = (String) e.getValue();
diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
index 9befe3c0f917045440049b345bcf397b1e5cce74..fbfa0a560d873698ebf39f8dd3edce36ee6b28f3 100644
--- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
@@ -383,9 +383,7 @@ class ClientConnectionRunner {
     void disconnectClient(String reason, int logLevel) {
         if (_log.shouldLog(logLevel))
             _log.log(logLevel, "Disconnecting the client - " 
-                     + reason
-                     + " config: "
-                     + _config);
+                     + reason);
         DisconnectMessage msg = new DisconnectMessage();
         if (reason.length() > 255)
             reason = reason.substring(0, 255);
diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index 382552ce68728ac2c8c69cf24cdd1c24e2d5dbf2..e20039b6ecce28ed7b53a1ef35f2cceb300b5eda 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -12,6 +12,7 @@ import java.util.Properties;
 
 import net.i2p.CoreVersion;
 import net.i2p.crypto.SigType;
+import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.Payload;
@@ -161,6 +162,11 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
         _runner.disconnected();
     }
     
+    /**
+     *  Defaults in GetDateMessage options are NOT honored.
+     *  Defaults are not serialized out-of-JVM, and the router does not recognize defaults in-JVM.
+     *  Client side must promote defaults to the primary map.
+     */
     private void handleGetDate(GetDateMessage message) {
         // sent by clients >= 0.8.7
         String clientVersion = message.getVersion();
@@ -192,6 +198,9 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
      * sending the DisconnectMessage... but right now the client will send _us_ a
      * DisconnectMessage in return, and not wait around for our DisconnectMessage.
      * So keep it simple.
+     *
+     * Defaults in SessionConfig options are, in general, NOT honored.
+     * In-JVM client side must promote defaults to the primary map.
      */
     private void handleCreateSession(CreateSessionMessage message) {
         SessionConfig in = message.getSessionConfig();
@@ -205,6 +214,15 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
             if (stype == null || !stype.isAvailable()) {
                 _log.error("Client requested unsupported signature type " + itype);
                 _runner.disconnectClient("Unsupported signature type " + itype);
+            } else if (in.tooOld()) {
+                long skew = _context.clock().now() - in.getCreationDate().getTime();
+                String msg = "Create session message client clock skew? ";
+                if (skew >= 0)
+                    msg += DataHelper.formatDuration(skew) + " in the past";
+                else
+                    msg += DataHelper.formatDuration(0 - skew) + " in the future";
+                _log.error(msg);
+                _runner.disconnectClient(msg);
             } else {
                 _log.error("Signature verification failed on a create session message");
                 _runner.disconnectClient("Invalid signature on CreateSessionMessage");
@@ -306,6 +324,13 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
      *
      */
     private void handleSendMessage(SendMessageMessage message) {
+        SessionConfig cfg = _runner.getConfig();
+        if (cfg == null) {
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("SendMessage w/o session");
+            _runner.disconnectClient("SendMessage w/o session");
+            return;
+        }
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("handleSendMessage called");
         long beforeDistribute = _context.clock().now();
@@ -370,7 +395,14 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
             _runner.disconnectClient("Invalid CreateLeaseSetMessage");
             return;
         }
-        Destination dest = _runner.getConfig().getDestination();
+        SessionConfig cfg = _runner.getConfig();
+        if (cfg == null) {
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("CreateLeaseSet w/o session");
+            _runner.disconnectClient("CreateLeaseSet w/o session");
+            return;
+        }
+        Destination dest = cfg.getDestination();
         Destination ndest = message.getLeaseSet().getDestination();
         if (!dest.equals(ndest)) {
             if (_log.shouldLog(Log.ERROR))
@@ -445,21 +477,31 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
      *
      * Note that this does NOT update the few options handled in
      * ClientConnectionRunner.sessionEstablished(). Those can't be changed later.
+     *
+     * Defaults in SessionConfig options are, in general, NOT honored.
+     * In-JVM client side must promote defaults to the primary map.
      */
     private void handleReconfigureSession(ReconfigureSessionMessage message) {
+        SessionConfig cfg = _runner.getConfig();
+        if (cfg == null) {
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("ReconfigureSession w/o session");
+            _runner.disconnectClient("ReconfigureSession w/o session");
+            return;
+        }
         if (_log.shouldLog(Log.INFO))
-            _log.info("Updating options - old: " + _runner.getConfig() + " new: " + message.getSessionConfig());
-        if (!message.getSessionConfig().getDestination().equals(_runner.getConfig().getDestination())) {
+            _log.info("Updating options - old: " + cfg + " new: " + message.getSessionConfig());
+        if (!message.getSessionConfig().getDestination().equals(cfg.getDestination())) {
             _log.error("Dest mismatch");
             sendStatusMessage(SessionStatusMessage.STATUS_INVALID);
             _runner.stopRunning();
             return;
         }
-        _runner.getConfig().getOptions().putAll(message.getSessionConfig().getOptions());
+        cfg.getOptions().putAll(message.getSessionConfig().getOptions());
         Hash dest = _runner.getDestHash();
         ClientTunnelSettings settings = new ClientTunnelSettings(dest);
         Properties props = new Properties();
-        props.putAll(_runner.getConfig().getOptions());
+        props.putAll(cfg.getOptions());
         settings.readFromProperties(props);
         _context.tunnelManager().setInboundSettings(dest,
                                                     settings.getInboundSettings());
diff --git a/router/java/src/net/i2p/router/client/LeaseRequestState.java b/router/java/src/net/i2p/router/client/LeaseRequestState.java
index 67968df3b945df7c0bbb0de84569d160b5a12d30..03bc2e4fa7fba35a4a7aeed85955e8eea909b38b 100644
--- a/router/java/src/net/i2p/router/client/LeaseRequestState.java
+++ b/router/java/src/net/i2p/router/client/LeaseRequestState.java
@@ -29,7 +29,7 @@ class LeaseRequestState {
     private boolean _successful;
 
     /**
-     *  @param expiration absolute time
+     *  @param expiration absolute time, when the request expires (not when the LS expires)
      */
     public LeaseRequestState(Job onGranted, Job onFailed, long expiration, LeaseSet requested) {
         _onGranted = onGranted;
diff --git a/router/java/src/net/i2p/router/client/package.html b/router/java/src/net/i2p/router/client/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..a5194356b6910528b7fbf3c816027a18f9b46627
--- /dev/null
+++ b/router/java/src/net/i2p/router/client/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+Implements the router side of the I2CP interface,
+which is the API for applications to send and receive data through the router.
+The client side of the interface is implemented in net.i2p.client.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
index 9a22ec6e842d1bce895df7898bfd2faccadf6ef4..8b99e8302ed5c69336fd708f37d5204e4bd0fabe 100644
--- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
+++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
@@ -30,8 +30,10 @@ import net.i2p.util.Log;
  * It is not the handler for garlic messages received down a tunnel,
  * as InNetMessagePool short circuits tunnel messages,
  * and those garlic messages are handled in InboundMessageDistributor.
+ *
+ * Public for JobQueue as these jobs may be dropped.
  */
-class HandleGarlicMessageJob extends JobImpl implements GarlicMessageReceiver.CloveReceiver {
+public class HandleGarlicMessageJob extends JobImpl implements GarlicMessageReceiver.CloveReceiver {
     private final Log _log;
     private final GarlicMessage _message;
     //private RouterIdentity _from;
diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
index d9f7a0a516324d478c1feb055ec285344c951207..8a517a806f1a7296e50f2f0f94105e5ea0ec971b 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
@@ -727,8 +727,10 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
      * Anonymity issues?
      */
     private TunnelInfo selectOutboundTunnel() {
-        Hash gw = _lease.getGateway();
-        return getContext().tunnelManager().selectOutboundTunnel(_from.calculateHash(), gw);
+        // hurts reliability? let's try picking at random again
+        //Hash gw = _lease.getGateway();
+        //return getContext().tunnelManager().selectOutboundTunnel(_from.calculateHash(), gw);
+        return getContext().tunnelManager().selectOutboundTunnel(_from.calculateHash());
     }
 
     /**
diff --git a/router/java/src/net/i2p/router/message/package.html b/router/java/src/net/i2p/router/message/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..94184efa7720f002453484a50173e8a3a1779c69
--- /dev/null
+++ b/router/java/src/net/i2p/router/message/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+Creates and parses garlic messages.
+Creates the source routing for outbound messages.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
index 8b235260e30f2d1c20e04a81e323b2262bd22da8..d6c06858839b93a6b48f68f5db420ffc944d4400 100644
--- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
@@ -8,10 +8,17 @@ package net.i2p.router.networkdb;
  *
  */
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
+import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import net.i2p.data.DataFormatException;
+import net.i2p.data.router.RouterAddress;
 import net.i2p.data.router.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.router.JobImpl;
@@ -30,15 +37,16 @@ public class PublishLocalRouterInfoJob extends JobImpl {
 
     /**
      *  Don't store if somebody else stored it recently.
+     *  Must be less than PUBLISH_DELAY * 3 / 16 (see getDelay())
      */
-    private static final long MIN_PUBLISH_DELAY = 25*60*1000;
+    private static final long MIN_PUBLISH_DELAY = 9*60*1000;
 
     /**
      *  Too short and the network puts a big connection load on the
      *  floodfills since we store directly.
      *  Too long and the floodfill will drop us - timeout is 60 minutes.
      */
-    private static final long PUBLISH_DELAY = MIN_PUBLISH_DELAY * 2;
+    private static final long PUBLISH_DELAY = 52*60*1000;
 
     /** this needs to be long enough to give us time to start up,
         but less than 20m (when we start accepting tunnels and could be a IBGW)
@@ -47,7 +55,8 @@ public class PublishLocalRouterInfoJob extends JobImpl {
         we can't build IB exploratory tunnels.
      */
     private static final long FIRST_TIME_DELAY = 90*1000;
-    boolean _notFirstTime;
+    private volatile boolean _notFirstTime;
+    private final AtomicInteger _runCount = new AtomicInteger();
     
     public PublishLocalRouterInfoJob(RouterContext ctx) {
         super(ctx);
@@ -55,6 +64,7 @@ public class PublishLocalRouterInfoJob extends JobImpl {
     }
     
     public String getName() { return "Publish Local Router Info"; }
+
     public void runJob() {
         long last = getContext().netDb().getLastRouterInfoPublishTime();
         long now = getContext().clock().now();
@@ -63,18 +73,55 @@ public class PublishLocalRouterInfoJob extends JobImpl {
             requeue(last + delay - now);
             return;
         }
-        RouterInfo ri = new RouterInfo(getContext().router().getRouterInfo());
+        RouterInfo oldRI = getContext().router().getRouterInfo();
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Old routerInfo contains " + ri.getAddresses().size() 
-                       + " addresses and " + ri.getOptionsMap().size() + " options");
-        Properties stats = getContext().statPublisher().publishStatistics();
-        stats.setProperty(RouterInfo.PROP_NETWORK_ID, ""+Router.NETWORK_ID);
+            _log.debug("Old routerInfo contains " + oldRI.getAddresses().size() 
+                       + " addresses and " + oldRI.getOptionsMap().size() + " options");
         try {
+            List<RouterAddress> oldAddrs = new ArrayList<RouterAddress>(oldRI.getAddresses());
+            List<RouterAddress> newAddrs = getContext().commSystem().createAddresses();
+            int count = _runCount.incrementAndGet();
+            RouterInfo ri = new RouterInfo(oldRI);
+            // this will get overwritten by setOptions() below, must restore it below
+            getContext().router().addCapabilities(ri);
+            String caps = ri.getCapabilities();
+            if (_notFirstTime && (count % 4) != 0 && oldAddrs.size() == newAddrs.size()) {
+                // 3 times out of 4, we don't republish if everything is the same...
+                // If something changed, including the cost, then publish,
+                // otherwise don't.
+                boolean different = !oldRI.getCapabilities().equals(ri.getCapabilities());
+                if (!different) {
+                    Comparator<RouterAddress> comp = new AddrComparator();
+                    Collections.sort(oldAddrs, comp);
+                    Collections.sort(newAddrs, comp);
+                    for (int i = 0; i < oldAddrs.size(); i++) {
+                        // deepEquals() includes cost
+                        if (!oldAddrs.get(i).deepEquals(newAddrs.get(i))) {
+                            different = true;
+                            break;
+                        }
+                    }
+                    if (!different) {
+                        if (_log.shouldLog(Log.INFO))
+                            _log.info("Not republishing early because costs and caps and addresses are the same");
+                        requeue(getDelay());
+                        return;
+                    }
+                }
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Republishing early because addresses or costs or caps have changed -" +
+                              " oldCaps: " + oldRI.getCapabilities() + " newCaps: " + ri.getCapabilities() +
+                              " old:\n" +
+                              oldAddrs + "\nnew:\n" + newAddrs);
+            }
             ri.setPublished(getContext().clock().now());
+            Properties stats = getContext().statPublisher().publishStatistics();
+            stats.setProperty(RouterInfo.PROP_NETWORK_ID, String.valueOf(Router.NETWORK_ID));
+            // restore caps generated above
+            stats.setProperty(RouterInfo.PROP_CAPABILITIES, caps);
             ri.setOptions(stats);
-            ri.setAddresses(getContext().commSystem().createAddresses());
+            ri.setAddresses(newAddrs);
 
-            getContext().router().addCapabilities(ri);
             SigningPrivateKey key = getContext().keyManager().getSigningPrivateKey();
             if (key == null) {
                 _log.log(Log.CRIT, "Internal error - signing private key not known?  rescheduling publish for 30s");
@@ -98,8 +145,7 @@ public class PublishLocalRouterInfoJob extends JobImpl {
             _log.error("Error signing the updated local router info!", dfe);
         }
         if (_notFirstTime) {
-            long delay = getDelay();
-            requeue(delay);
+            requeue(getDelay());
         } else {
             requeue(FIRST_TIME_DELAY);
             _notFirstTime = true;
@@ -107,6 +153,29 @@ public class PublishLocalRouterInfoJob extends JobImpl {
     }
 
     private long getDelay() {
-        return (PUBLISH_DELAY * 3 / 4) + getContext().random().nextLong(PUBLISH_DELAY / 4);
+        long rv = (PUBLISH_DELAY * 3 / 4) + getContext().random().nextLong(PUBLISH_DELAY / 4);
+        // run 4x as often as usual publish time (see above)
+        rv /= 4;
+        return rv;
+    }
+
+    /**
+     *  Arbitrary sort so we can attempt to compare costs between two RIs to see if they have changed
+     *
+     *  @since 0.9.18
+     */
+    private static class AddrComparator implements Comparator<RouterAddress>, Serializable {
+        public int compare(RouterAddress l, RouterAddress r) {
+            int c = l.getTransportStyle().compareTo(r.getTransportStyle());
+            if (c != 0)
+                return c;
+            String lh = l.getHost();
+            String rh = r.getHost();
+            if (lh == null)
+                return rh == null ? 0 : -1;
+            if (rh == null)
+                return 1;
+            return lh.compareTo(rh);
+        }
     }
 }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
index c386d10b8de992a649509acf359bb06840ef88f0..bb75b682535f1b699584aba6f99a29d5076cfb0e 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
@@ -73,8 +73,8 @@ class ExploreJob extends SearchJob {
      * and PeerSelector doesn't include the floodfill peers,
      * so we add the ff peers ourselves and then use the regular PeerSelector.
      *
-     * @param replyTunnelId tunnel to receive replies through
-     * @param replyGateway gateway for the reply tunnel
+     * @param replyTunnelId tunnel to receive replies through, or our router hash if replyGateway is null
+     * @param replyGateway gateway for the reply tunnel, if null, we are sending direct, do not encrypt
      * @param expiration when the search should stop
      * @param peer the peer to send it to
      *
@@ -89,7 +89,8 @@ class ExploreJob extends SearchJob {
         //msg.setDontIncludePeers(getState().getClosestAttempted(MAX_CLOSEST));
         Set<Hash> dontIncludePeers = getState().getClosestAttempted(MAX_CLOSEST);
         msg.setMessageExpiration(expiration);
-        msg.setReplyTunnel(replyTunnelId);
+        if (replyTunnelId != null)
+            msg.setReplyTunnel(replyTunnelId);
         
         int available = MAX_CLOSEST - dontIncludePeers.size();
         if (available > 0) {
@@ -134,7 +135,8 @@ class ExploreJob extends SearchJob {
 
         // Now encrypt if we can
         I2NPMessage outMsg;
-        if (getContext().getProperty(IterativeSearchJob.PROP_ENCRYPT_RI, IterativeSearchJob.DEFAULT_ENCRYPT_RI)) {
+        if (replyTunnelId != null &&
+            getContext().getProperty(IterativeSearchJob.PROP_ENCRYPT_RI, IterativeSearchJob.DEFAULT_ENCRYPT_RI)) {
             // request encrypted reply?
             if (DatabaseLookupMessage.supportsEncryptedReplies(peer)) {
                 MessageWrapper.OneTimeSession sess;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
index f3e84597d2c811a204e9c4eb97609f26a8d928f4..89717e7073ff4546860d8eecb15eaad59e4064af 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
@@ -2,6 +2,7 @@ package net.i2p.router.networkdb.kademlia;
 
 import java.util.List;
 
+import net.i2p.crypto.SigType;
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterAddress;
 import net.i2p.data.router.RouterInfo;
@@ -9,6 +10,7 @@ import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.peermanager.PeerProfile;
+import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.router.util.EventLog;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
@@ -30,9 +32,10 @@ class FloodfillMonitorJob extends JobImpl {
     private static final int REQUEUE_DELAY = 60*60*1000;
     private static final long MIN_UPTIME = 2*60*60*1000;
     private static final long MIN_CHANGE_DELAY = 6*60*60*1000;
+
     private static final int MIN_FF = 5000;
     private static final int MAX_FF = 999999;
-    private static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant";
+    static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant";
     
     public FloodfillMonitorJob(RouterContext context, FloodfillNetworkDatabaseFacade facade) {
         super(context);
@@ -47,11 +50,11 @@ class FloodfillMonitorJob extends JobImpl {
         boolean ff = shouldBeFloodfill();
         _facade.setFloodfillEnabled(ff);
         if (ff != wasFF) {
-			if(ff) {
-				getContext().router().eventLog().addEvent(EventLog.BECAME_FLOODFILL);
-			} else {
-				getContext().router().eventLog().addEvent(EventLog.NOT_FLOODFILL);
-			}
+            if (ff) {
+                getContext().router().eventLog().addEvent(EventLog.BECAME_FLOODFILL);
+            } else {
+                getContext().router().eventLog().addEvent(EventLog.NOT_FLOODFILL);
+            }
             getContext().router().rebuildRouterInfo();
         }
         if (_log.shouldLog(Log.INFO))
@@ -65,8 +68,7 @@ class FloodfillMonitorJob extends JobImpl {
     }
 
     private boolean shouldBeFloodfill() {
-        // Only if not shutting down...
-        if (getContext().getProperty(Router.PROP_SHUTDOWN_IN_PROGRESS) != null)
+        if (!SigType.ECDSA_SHA256_P256.isAvailable())
             return false;
 
         // Hidden trumps netDb.floodfillParticipant=true
@@ -81,10 +83,17 @@ class FloodfillMonitorJob extends JobImpl {
 
         // auto from here down
 
+        // Only if not shutting down...
+        if (getContext().router().gracefulShutdownInProgress())
+            return false;
+
         // ARM ElG decrypt is too slow
         if (SystemVersion.isARM())
             return false;
 
+        if (getContext().getBooleanProperty(UDPTransport.PROP_LAPTOP_MODE))
+            return false;
+
         if (getContext().commSystem().isInBadCountry())
             return false;
         String country = getContext().commSystem().getOurCountry();
@@ -100,8 +109,9 @@ class FloodfillMonitorJob extends JobImpl {
         if (ri == null)
             return false;
         char bw = ri.getBandwidthTier().charAt(0);
-        // Only if class N or O...
-        if (bw < Router.CAPABILITY_BW128 || bw > Router.CAPABILITY_BW256)
+        // Only if class N, O, P, X
+        if (bw != Router.CAPABILITY_BW128 && bw != Router.CAPABILITY_BW256 &&
+            bw != Router.CAPABILITY_BW512 && bw != Router.CAPABILITY_BW_UNLIMITED)
             return false;
 
         // This list will not include ourselves...
@@ -145,12 +155,16 @@ class FloodfillMonitorJob extends JobImpl {
             ffcount++;
         int good = ffcount - failcount;
         boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf("R") >= 0;
-        // Use the same job lag test as in RouterThrottleImpl
-        happy = happy && getContext().jobQueue().getMaxLag() < 2*1000;
+        // TODO - limit may still be too high
+        // For reference, the avg lifetime job lag on my Pi is 6.
+        // Should we consider avg. dropped ff jobs?
+        RateStat lagStat = getContext().statManager().getRate("jobQueue.jobLag");
+        happy = happy && lagStat.getRate(60*60*1000L).getAvgOrLifetimeAvg() < 25;
+        happy = happy && getContext().tunnelManager().getInboundBuildQueueSize() < 5;
         // Only if we're pretty well integrated...
-        happy = happy && _facade.getKnownRouters() >= 200;
+        happy = happy && _facade.getKnownRouters() >= 400;
         happy = happy && getContext().commSystem().countActivePeers() >= 50;
-        happy = happy && getContext().tunnelManager().getParticipatingCount() >= 35;
+        happy = happy && getContext().tunnelManager().getParticipatingCount() >= 25;
         happy = happy && Math.abs(getContext().clock().getOffset()) < 10*1000;
         // We need an address and no introducers
         if (happy) {
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index 9358092260ea0e75d9e0f2c3b72718096d18129c..a02013a5f82fe1049ab39617f6dd6f9c09c278e7 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -66,6 +66,8 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
         _context.statManager().createRateStat("netDb.searchReplyNotValidated", "How many search replies we get that we are NOT able to validate (fetch)", "NetworkDatabase", new long[] { 5*60*1000l, 10*60*1000l, 60*60*1000l, 3*60*60*1000l, 24*60*60*1000l });
         _context.statManager().createRateStat("netDb.searchReplyValidationSkipped", "How many search replies we get from unreliable peers that we skip?", "NetworkDatabase", new long[] { 5*60*1000l, 10*60*1000l, 60*60*1000l, 3*60*60*1000l, 24*60*60*1000l });
         _context.statManager().createRateStat("netDb.republishQuantity", "How many peers do we need to send a found leaseSet to?", "NetworkDatabase", new long[] { 10*60*1000l, 60*60*1000l, 3*60*60*1000l, 24*60*60*1000l });
+        // for ISJ
+        _context.statManager().createRateStat("netDb.RILookupDirect", "Was an iterative RI lookup sent directly?", "NetworkDatabase", new long[] { 60*60*1000 });
     }
 
     @Override
@@ -92,7 +94,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
      */
     @Override
     public synchronized void shutdown() {
-        if (_floodfillEnabled) {
+        // only if not forced ff or not restarting
+        if (_floodfillEnabled &&
+            (!_context.getBooleanProperty(FloodfillMonitorJob.PROP_FLOODFILL_PARTICIPANT) ||
+             !(_context.router().scheduledGracefulExitCode() == Router.EXIT_HARD_RESTART ||
+               _context.router().scheduledGracefulExitCode() == Router.EXIT_GRACEFUL_RESTART))) {
             // turn off to build a new RI...
             _floodfillEnabled = false;
             // true -> publish inline
@@ -191,6 +197,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
             List<Hash> nextPeers = sel.selectFloodfillParticipants(nkey, NEXT_FLOOD_QTY, getKBuckets());
             int i = 0;
             for (Hash h : nextPeers) {
+                // Don't flood an RI back to itself
+                // Not necessary, a ff will do its own flooding (reply token == 0)
+                // But other implementations may not...
+                if (h.equals(key))
+                    continue;
                 // todo key cert skip?
                 if (!peers.contains(h)) {
                     peers.add(h);
@@ -206,19 +217,22 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
             RouterInfo target = lookupRouterInfoLocally(peer);
             if ( (target == null) || (_context.banlist().isBanlisted(peer)) )
                 continue;
-            // Don't flood a RI back to itself
+            // Don't flood an RI back to itself
             // Not necessary, a ff will do its own flooding (reply token == 0)
-            //if (peer.equals(target.getIdentity().getHash()))
-            //    continue;
+            // But other implementations may not...
+            if (ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO && peer.equals(key))
+                continue;
             if (peer.equals(_context.routerHash()))
                 continue;
             DatabaseStoreMessage msg = new DatabaseStoreMessage(_context);
             msg.setEntry(ds);
             OutNetMessage m = new OutNetMessage(_context, msg, _context.clock().now()+FLOOD_TIMEOUT, FLOOD_PRIORITY, target);
-            // note send failure but don't give credit on success
-            // might need to change this
             Job floodFail = new FloodFailedJob(_context, peer);
             m.setOnFailedSendJob(floodFail);
+            // we want to give credit on success, even if we aren't sure,
+            // because otherwise no use noting failure
+            Job floodGood = new FloodSuccessJob(_context, peer);
+            m.setOnSendJob(floodGood);
             _context.commSystem().processMessage(m);
             flooded++;
             if (_log.shouldLog(Log.INFO))
@@ -243,6 +257,23 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
         }
     }
 
+    /**
+     *  Note in the profile that the store succeeded
+     *  @since 0.9.19
+     */
+    private static class FloodSuccessJob extends JobImpl {
+        private final Hash _peer;
+    
+        public FloodSuccessJob(RouterContext ctx, Hash peer) {
+            super(ctx);
+            _peer = peer;
+        }
+        public String getName() { return "Flood succeeded"; }
+        public void runJob() {
+            getContext().profileManager().dbStoreSuccessful(_peer);
+        }
+    }
+
     @Override
     protected PeerSelector createPeerSelector() { return new FloodfillPeerSelector(_context); }
     
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index a1329967c6bfd18c7da333c921af6f57b040b0f4..66e0389cea2a7effd0f384e6c5019aac99546b74 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -94,7 +94,7 @@ class IterativeSearchJob extends FloodSearchJob {
 
     /** only on fast boxes, for now */
     public static final boolean DEFAULT_ENCRYPT_RI =
-            SystemVersion.isX86() && SystemVersion.is64Bit() &&
+            SystemVersion.isX86() && /* SystemVersion.is64Bit() && */
             !SystemVersion.isApache() && !SystemVersion.isGNU() &&
             NativeBigInteger.isNative();
 
@@ -127,6 +127,7 @@ class IterativeSearchJob extends FloodSearchJob {
         _fromLocalDest = fromLocalDest;
         if (fromLocalDest != null && !isLease && _log.shouldLog(Log.WARN))
             _log.warn("Search for RI " + key + " down client tunnel " + fromLocalDest, new Exception());
+        // all createRateStat in FNDF
     }
 
     @Override
@@ -260,9 +261,11 @@ class IterativeSearchJob extends FloodSearchJob {
      */
     private void sendQuery(Hash peer) {
             TunnelManagerFacade tm = getContext().tunnelManager();
+            RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer);
             TunnelInfo outTunnel;
             TunnelInfo replyTunnel;
             boolean isClientReplyTunnel;
+            boolean isDirect;
             if (_fromLocalDest != null) {
                 outTunnel = tm.selectOutboundTunnel(_fromLocalDest, peer);
                 if (outTunnel == null)
@@ -271,12 +274,26 @@ class IterativeSearchJob extends FloodSearchJob {
                 isClientReplyTunnel = replyTunnel != null;
                 if (!isClientReplyTunnel)
                     replyTunnel = tm.selectInboundExploratoryTunnel(peer);
+                isDirect = false;
+            } else if ((!_isLease) && ri != null && getContext().commSystem().isEstablished(peer)) {
+                // If it's a RI lookup, not from a client, and we're already connected, just ask directly
+                // This also saves the ElG encryption for us and the decryption for the ff
+                // There's no anonymity reason to use an expl. tunnel... the main reason
+                // is to limit connections to the ffs. But if we're already connected,
+                // do it the fast and easy way.
+                outTunnel = null;
+                replyTunnel = null;
+                isClientReplyTunnel = false;
+                isDirect = true;
+                getContext().statManager().addRateData("netDb.RILookupDirect", 1);
             } else {
                 outTunnel = tm.selectOutboundExploratoryTunnel(peer);
                 replyTunnel = tm.selectInboundExploratoryTunnel(peer);
                 isClientReplyTunnel = false;
+                isDirect = false;
+                getContext().statManager().addRateData("netDb.RILookupDirect", 0);
             }
-            if ( (replyTunnel == null) || (outTunnel == null) ) {
+            if ((!isDirect) && (replyTunnel == null || outTunnel == null)) {
                 failed();
                 return;
             }
@@ -287,7 +304,7 @@ class IterativeSearchJob extends FloodSearchJob {
             // if it happens to be closest to itself and we are using zero-hop exploratory tunnels.
             // If we don't, the OutboundMessageDistributor ends up logging erors for
             // not being able to send to the floodfill, if we don't have an older netdb entry.
-            if (outTunnel.getLength() <= 1) {
+            if (outTunnel != null && outTunnel.getLength() <= 1) {
                 if (peer.equals(_key)) {
                     failed(peer, false);
                     if (_log.shouldLog(Log.WARN))
@@ -303,9 +320,13 @@ class IterativeSearchJob extends FloodSearchJob {
             }
             
             DatabaseLookupMessage dlm = new DatabaseLookupMessage(getContext(), true);
-            dlm.setFrom(replyTunnel.getPeer(0));
+            if (isDirect) {
+                dlm.setFrom(getContext().routerHash());
+            } else {
+                dlm.setFrom(replyTunnel.getPeer(0));
+                dlm.setReplyTunnel(replyTunnel.getReceiveTunnelId(0));
+            }
             dlm.setMessageExpiration(getContext().clock().now() + SINGLE_SEARCH_MSG_TIME);
-            dlm.setReplyTunnel(replyTunnel.getReceiveTunnelId(0));
             dlm.setSearchKey(_key);
             dlm.setSearchType(_isLease ? DatabaseLookupMessage.Type.LS : DatabaseLookupMessage.Type.RI);
             
@@ -317,16 +338,21 @@ class IterativeSearchJob extends FloodSearchJob {
                 _log.info(getJobId() + ": ISJ try " + tries + " for " +
                           (_isLease ? "LS " : "RI ") +
                           _key + " to " + peer +
+                          " direct? " + isDirect +
                           " reply via client tunnel? " + isClientReplyTunnel);
             }
             long now = getContext().clock().now();
             _sentTime.put(peer, Long.valueOf(now));
 
             I2NPMessage outMsg = null;
-            if (_isLease || getContext().getProperty(PROP_ENCRYPT_RI, DEFAULT_ENCRYPT_RI)) {
+            if (isDirect) {
+                // never wrap
+            } else if (_isLease ||
+                       (getContext().getProperty(PROP_ENCRYPT_RI, DEFAULT_ENCRYPT_RI) &&
+                        getContext().jobQueue().getMaxLag() < 300)) {
                 // Full ElG is fairly expensive so only do it for LS lookups
+                // and for RI lookups on fast boxes.
                 // if we have the ff RI, garlic encrypt it
-                RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer);
                 if (ri != null) {
                     // request encrypted reply
                     if (DatabaseLookupMessage.supportsEncryptedReplies(ri)) {
@@ -355,7 +381,19 @@ class IterativeSearchJob extends FloodSearchJob {
             }
             if (outMsg == null)
                 outMsg = dlm;
-            getContext().tunnelDispatcher().dispatchOutbound(outMsg, outTunnel.getSendTunnelId(0), peer);
+            if (isDirect) {
+                OutNetMessage m = new OutNetMessage(getContext(), outMsg, outMsg.getMessageExpiration(),
+                                                    OutNetMessage.PRIORITY_MY_NETDB_LOOKUP, ri);
+                // Should always succeed, we are connected already
+                //m.setOnFailedReplyJob(onFail);
+                //m.setOnFailedSendJob(onFail);
+                //m.setOnReplyJob(onReply);
+                //m.setReplySelector(selector);
+                //getContext().messageRegistry().registerPending(m);
+                getContext().commSystem().processMessage(m);
+            } else {
+                getContext().tunnelDispatcher().dispatchOutbound(outMsg, outTunnel.getSendTunnelId(0), peer);
+            }
 
             // The timeout job is always run (never cancelled)
             // Note that the timeout is much shorter than the message expiration (see above)
@@ -481,8 +519,8 @@ class IterativeSearchJob extends FloodSearchJob {
             _log.info(getJobId() + ": ISJ for " + _key + " failed with " + timeRemaining + " remaining after " + time +
                       ", peers queried: " + tries);
         }
-        getContext().statManager().addRateData("netDb.failedTime", time, 0);
-        getContext().statManager().addRateData("netDb.failedRetries", Math.max(0, tries - 1), 0);
+        getContext().statManager().addRateData("netDb.failedTime", time);
+        getContext().statManager().addRateData("netDb.failedRetries", Math.max(0, tries - 1));
         for (Job j : _onFailed) {
             getContext().jobQueue().addJob(j);
         }
@@ -515,8 +553,8 @@ class IterativeSearchJob extends FloodSearchJob {
         if (_log.shouldLog(Log.INFO))
             _log.info(getJobId() + ": ISJ for " + _key + " successful after " + time +
                       ", peers queried: " + tries);
-        getContext().statManager().addRateData("netDb.successTime", time, 0);
-        getContext().statManager().addRateData("netDb.successRetries", tries - 1, 0);
+        getContext().statManager().addRateData("netDb.successTime", time);
+        getContext().statManager().addRateData("netDb.successRetries", tries - 1);
         for (Job j : _onFind) {
             getContext().jobQueue().addJob(j);
         }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/LookupThrottler.java b/router/java/src/net/i2p/router/networkdb/kademlia/LookupThrottler.java
index 4156ac152901c5a8145074557697d4ec0ed0476c..dc0e84bcba727bf492f7b9111231cee080c659db 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/LookupThrottler.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/LookupThrottler.java
@@ -21,7 +21,7 @@ class LookupThrottler {
     private static final TunnelId DUMMY_ID = new TunnelId();
     /** this seems like plenty */
     private static final int MAX_LOOKUPS = 30;
-    private static final long CLEAN_TIME = 60*1000;
+    private static final long CLEAN_TIME = 2*60*1000;
 
     LookupThrottler() {
         this.counter = new ObjectCounter<ReplyTunnel>();
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index 6c60e3a41c82456028cc72f655b6d369e794b481..5691faa32af96bef6238ab1666d4031f3dec5060 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -327,15 +327,17 @@ class PersistentDataStore extends TransientDataStore {
     }
     
     /**
-     *  This is mostly for manual reseeding, i.e. the user manually
+     *  This was mostly for manual reseeding, i.e. the user manually
      *  copies RI files to the directory. Nobody does this,
      *  so this is run way too often.
+     *
+     *  But it's also for migrating and reading the files after a reseed.
      *  Reseed task calls wakeup() on completion.
      *  As of 0.9.4, also initiates an automatic reseed if necessary.
      */
     private class ReadJob extends JobImpl {
-        private long _lastModified;
-        private long _lastReseed;
+        private volatile long _lastModified;
+        private volatile long _lastReseed;
         private static final int MIN_ROUTERS = KademliaNetworkDatabaseFacade.MIN_RESEED;
         private static final long MIN_RESEED_INTERVAL = 90*60*1000;
 
@@ -364,6 +366,7 @@ class PersistentDataStore extends TransientDataStore {
                 _log.info("Rereading new files");
                 // synch with the writer job
                 synchronized (_dbDir) {
+                    // _lastModified must be 0 for the first run
                     readFiles();
                 }
                 _lastModified = now;
@@ -429,14 +432,21 @@ class PersistentDataStore extends TransientDataStore {
             }
             
             if (!_initialized) {
-                if (_facade.reseedChecker().checkReseed(routerCount))
-                    _lastReseed = _context.clock().now();
                 _initialized = true;
+                if (_facade.reseedChecker().checkReseed(routerCount)) {
+                    _lastReseed = _context.clock().now();
+                    // checkReseed will call wakeup() when done and we will run again
+                } else {
+                    _context.router().setNetDbReady();
+                }
             } else if (_lastReseed < _context.clock().now() - MIN_RESEED_INTERVAL) {
                 int count = Math.min(routerCount, size());
                 if (count < MIN_ROUTERS) {
                     if (_facade.reseedChecker().checkReseed(count))
                         _lastReseed = _context.clock().now();
+                        // checkReseed will call wakeup() when done and we will run again
+                } else {
+                    _context.router().setNetDbReady();
                 }
             }
         }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
index f0edded8b0d63888bed92992069459cd4b032fbd..450aca44338eabda1da66a2b14232eaf425c3787 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
@@ -28,6 +28,7 @@ import net.i2p.router.JobImpl;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
+import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.util.Log;
 
 /**
@@ -47,6 +48,7 @@ class SearchJob extends JobImpl {
     private final long _expiration;
     private final long _timeoutMs;
     private final boolean _keepStats;
+    private final boolean _isLease;
     private Job _pendingRequeueJob;
     private final PeerSelector _peerSelector;
     private final List<Search> _deferredSearches;
@@ -88,7 +90,8 @@ class SearchJob extends JobImpl {
      * Create a new search for the routingKey specified
      * 
      */
-    public SearchJob(RouterContext context, KademliaNetworkDatabaseFacade facade, Hash key, Job onSuccess, Job onFailure, long timeoutMs, boolean keepStats, boolean isLease) {
+    public SearchJob(RouterContext context, KademliaNetworkDatabaseFacade facade, Hash key,
+                     Job onSuccess, Job onFailure, long timeoutMs, boolean keepStats, boolean isLease) {
         super(context);
         if ( (key == null) || (key.getData() == null) ) 
             throw new IllegalArgumentException("Search for null key?  wtf");
@@ -99,13 +102,14 @@ class SearchJob extends JobImpl {
         _onFailure = onFailure;
         _timeoutMs = timeoutMs;
         _keepStats = keepStats;
+        _isLease = isLease;
         _deferredSearches = new ArrayList<Search>(0);
         _peerSelector = facade.getPeerSelector();
         _startedOn = -1;
         _expiration = getContext().clock().now() + timeoutMs;
-        getContext().statManager().addRateData("netDb.searchCount", 1, 0);
+        getContext().statManager().addRateData("netDb.searchCount", 1);
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Search (" + getClass().getName() + " for " + key.toBase64(), new Exception("Search enqueued by"));
+            _log.debug("Search (" + getClass().getName() + " for " + key, new Exception("Search enqueued by"));
     }
 
     public void runJob() {
@@ -348,6 +352,7 @@ class SearchJob extends JobImpl {
         else
             requeuePending(REQUEUE_DELAY);
     }
+
     private void requeuePending(long ms) {
         if (_pendingRequeueJob == null)
             _pendingRequeueJob = new RequeuePending(getContext());
@@ -390,17 +395,24 @@ class SearchJob extends JobImpl {
             return;
         } else {
             if (_log.shouldLog(Log.INFO))
-                _log.info(getJobId() + ": Send search to " + router.getIdentity().getHash().toBase64()
-                          + " for " + _state.getTarget().toBase64() 
+                _log.info(getJobId() + ": Send search to " + router.getIdentity().getHash()
+                          + " for " + _state.getTarget()
                           + " w/ timeout " + getPerPeerTimeoutMs(router.getIdentity().calculateHash()));
         }
 
-        getContext().statManager().addRateData("netDb.searchMessageCount", 1, 0);
+        getContext().statManager().addRateData("netDb.searchMessageCount", 1);
+
+        // To minimize connection congestion, send RI lokups through exploratory tunnels if not connected.
+        // To minimize crypto overhead and response latency, send RI lookups directly if connected.
+        // But not too likely since we don't explore when we're floodfill.
+        // Always send LS lookups thru expl tunnels.
+        // But this is never used for LSes...
 
-        //if (_isLease || true) // always send searches out tunnels
+        if (_isLease ||
+             !getContext().commSystem().isEstablished(router.getIdentity().calculateHash()))
             sendLeaseSearch(router);
-        //else
-        //    sendRouterSearch(router);
+        else
+            sendRouterSearch(router);
     }
     
     
@@ -461,27 +473,27 @@ class SearchJob extends JobImpl {
     }
     
     /** we're searching for a router, so we can just send direct */
-/******* always send through the lease
     protected void sendRouterSearch(RouterInfo router) {
         int timeout = _facade.getPeerTimeout(router.getIdentity().getHash());
         long expiration = getContext().clock().now() + timeout;
 
-        DatabaseLookupMessage msg = buildMessage(expiration);
+        // use the 4-arg one so we pick up the override in ExploreJob
+        //I2NPMessage msg = buildMessage(expiration);
+        I2NPMessage msg = buildMessage(null, router.getIdentity().getHash(), expiration, router);	
 
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug(getJobId() + ": Sending router search to " + router.getIdentity().getHash().toBase64() 
-                      + " for " + msg.getSearchKey().toBase64() + " w/ replies to us [" 
-                      + msg.getFrom().toBase64() + "]");
+            _log.debug(getJobId() + ": Sending router search directly to " + router.getIdentity().getHash()
+                      + " for " + _state.getTarget());
         SearchMessageSelector sel = new SearchMessageSelector(getContext(), router, _expiration, _state);
         SearchUpdateReplyFoundJob reply = new SearchUpdateReplyFoundJob(getContext(), router, _state, _facade, this);
         SendMessageDirectJob j = new SendMessageDirectJob(getContext(), msg, router.getIdentity().getHash(), 
-                                                          reply, new FailedJob(getContext(), router), sel, timeout, SEARCH_PRIORITY);
+                                                          reply, new FailedJob(getContext(), router), sel, timeout,
+                                                          OutNetMessage.PRIORITY_EXPLORATORY);
         if (FloodfillNetworkDatabaseFacade.isFloodfill(router))
             _floodfillSearchesOutstanding++;
         j.runJob();
         //getContext().jobQueue().addJob(j);
     }
-**********/
     
 
     /**
@@ -495,6 +507,8 @@ class SearchJob extends JobImpl {
      * @return a DatabaseLookupMessage
      */
     protected I2NPMessage buildMessage(TunnelId replyTunnelId, Hash replyGateway, long expiration, RouterInfo peer) {
+        throw new UnsupportedOperationException("see ExploreJob");
+/*******
         DatabaseLookupMessage msg = new DatabaseLookupMessage(getContext(), true);
         msg.setSearchKey(_state.getTarget());
         //msg.setFrom(replyGateway.getIdentity().getHash());
@@ -503,6 +517,7 @@ class SearchJob extends JobImpl {
         msg.setMessageExpiration(expiration);
         msg.setReplyTunnel(replyTunnelId);
         return msg;
+*********/
     }
     
     /**
@@ -522,6 +537,7 @@ class SearchJob extends JobImpl {
     }
 *********/
     
+    /** found a reply */
     void replyFound(DatabaseSearchReplyMessage message, Hash peer) {
         long duration = _state.replyFound(peer);
         // this processing can take a while, so split 'er up
@@ -569,13 +585,13 @@ class SearchJob extends JobImpl {
             _state.replyTimeout(_peer);
             if (_penalizePeer) { 
                 if (_log.shouldLog(Log.INFO))
-                    _log.info("Penalizing peer for timeout on search: " + _peer.toBase64() + " after " + (getContext().clock().now() - _sentOn));
+                    _log.info("Penalizing peer for timeout on search: " + _peer + " after " + (getContext().clock().now() - _sentOn));
                 getContext().profileManager().dbLookupFailed(_peer);
             } else {
                 if (_log.shouldLog(Log.ERROR))
-                    _log.error("NOT (!!) Penalizing peer for timeout on search: " + _peer.toBase64());
+                    _log.error("NOT (!!) Penalizing peer for timeout on search: " + _peer);
             }
-            getContext().statManager().addRateData("netDb.failedPeers", 1, 0);
+            getContext().statManager().addRateData("netDb.failedPeers", 1);
             searchNext();
         }
         public String getName() { return "Kademlia Search Failed"; }
@@ -593,7 +609,7 @@ class SearchJob extends JobImpl {
 	
         if (_keepStats) {
             long time = getContext().clock().now() - _state.getWhenStarted();
-            getContext().statManager().addRateData("netDb.successTime", time, 0);
+            getContext().statManager().addRateData("netDb.successTime", time);
             getContext().statManager().addRateData("netDb.successPeers", _state.getAttempted().size(), time);
         }
         if (_onSuccess != null)
@@ -682,7 +698,7 @@ class SearchJob extends JobImpl {
     protected void fail() {
         if (isLocal()) {
             if (_log.shouldLog(Log.ERROR))
-                _log.error(getJobId() + ": why did we fail if the target is local?: " + _state.getTarget().toBase64(), new Exception("failure cause"));
+                _log.error(getJobId() + ": why did we fail if the target is local?: " + _state.getTarget(), new Exception("failure cause"));
             succeed();
             return;
         }
@@ -697,7 +713,7 @@ class SearchJob extends JobImpl {
         getContext().statManager().addRateData("netDb.failedAttemptedPeers", attempted, time);
         
         if (_keepStats) {
-            getContext().statManager().addRateData("netDb.failedTime", time, 0);
+            getContext().statManager().addRateData("netDb.failedTime", time);
             //_facade.fail(_state.getTarget());
         }
         if (_onFailure != null)
@@ -782,6 +798,7 @@ class SearchJob extends JobImpl {
     }
     
     boolean wasAttempted(Hash peer) { return _state.wasAttempted(peer); }
+
     long timeoutMs() { return _timeoutMs; }
 
     /** @return true if peer was new */
@@ -795,5 +812,6 @@ class SearchJob extends JobImpl {
         }
         return rv;
     }
+
     void decrementOutstandingFloodfillSearches() { _floodfillSearchesOutstanding--; }
 }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
index 7938ab072c200b7f957ec8f4d444a6695bd11063..f9023a00d3824d3c81f514e5dd8a1b0713447c02 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
@@ -42,6 +42,8 @@ class StartExplorersJob extends JobImpl {
     private static final int MIN_ROUTERS = 250;
     /** explore slowly if we have more than this many routers */
     private static final int MAX_ROUTERS = 800;
+    private static final long MAX_LAG = 100;
+    private static final long MAX_MSG_DELAY = 1500;
     
     public StartExplorersJob(RouterContext context, KademliaNetworkDatabaseFacade facade) {
         super(context);
@@ -50,8 +52,12 @@ class StartExplorersJob extends JobImpl {
     }
     
     public String getName() { return "Start Explorers Job"; }
+
     public void runJob() {
         if (! (_facade.floodfillEnabled() ||
+               getContext().jobQueue().getMaxLag() > MAX_LAG ||
+               getContext().throttle().getMessageDelay() > MAX_MSG_DELAY ||
+               // message delay limit also?
                getContext().router().gracefulShutdownInProgress())) {
             int num = MAX_PER_RUN;
             if (_facade.getDataStore().size() < LOW_ROUTERS)
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/package.html b/router/java/src/net/i2p/router/networkdb/kademlia/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..812838422a540bd4d34e24fd61932b4864ce1bfe
--- /dev/null
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/package.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<p>
+The network database, including implementation of floodfills.
+Database lookups, stores, exploration, and replies.
+Management of locally-generated RouterInfos and Leasesets.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/networkdb/package.html b/router/java/src/net/i2p/router/networkdb/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..59eab8325257736f840fb2f0663ae80010a81931
--- /dev/null
+++ b/router/java/src/net/i2p/router/networkdb/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+A couple of classes, but most things are in kademlia.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
index 2023452a8bd3ab677579a0e8b0dbf538a1976585..df4f31300c8f0953d4e81effc75f9c85b79f3eb0 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
@@ -1,11 +1,16 @@
 package net.i2p.router.networkdb.reseed;
 
 import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.URL;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Addresses;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
 
 /**
  *  Moved from RouterConsoleRunner.java
@@ -28,6 +33,7 @@ public class ReseedChecker {
     private volatile String _lastError = "";
 
     public static final int MINIMUM = 50;
+    private static final long STATUS_CLEAN_TIME = 20*60*1000;
 
     /**
      *  All reseeding must be done through this instance.
@@ -107,6 +113,62 @@ public class ReseedChecker {
     }
 
     /**
+     *  Start a reseed from a zip or su3 URI.
+     *
+     *  @return true if a reseed was started, false if already in progress
+     *  @throws IllegalArgumentException if it doesn't end with zip or su3
+     *  @since 0.9.19
+     */
+    public boolean requestReseed(URL url) throws IllegalArgumentException {
+        if (_inProgress.compareAndSet(false, true)) {
+            Reseeder reseeder = new Reseeder(_context, this);
+            try {
+                reseeder.requestReseed(url);
+                return true;
+            } catch (IllegalArgumentException iae) {
+                if (iae.getMessage() != null)
+                    setError(DataHelper.escapeHTML(iae.getMessage()));
+                done();
+                throw iae;
+            } catch (Throwable t) {
+                _log.error("Reseed failed to start", t);
+                done();
+                return false;
+            }
+        } else {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Reseed already in progress");
+            return false;
+        }
+    }
+
+    /**
+     *  Reseed from a zip or su3 input stream. Blocking.
+     *
+     *  @return true if a reseed was started, false if already in progress
+     *  @throws IOException if already in progress or on most other errors
+     *  @since 0.9.19
+     */
+    public int requestReseed(InputStream in) throws IOException {
+        // don't really need to check for in progress here
+        if (_inProgress.compareAndSet(false, true)) {
+            try {
+                Reseeder reseeder = new Reseeder(_context, this);
+                return reseeder.requestReseed(in);
+            } catch (IOException ioe) {
+                if (ioe.getMessage() != null)
+                    setError(DataHelper.escapeHTML(ioe.getMessage()));
+                done();
+                throw ioe;
+            } finally {
+                done();
+            }
+        } else {
+            throw new IOException("Reseed already in progress");
+        }
+    }
+
+    /**         .
      *  Is a reseed in progress?
      *
      *  @since 0.9
@@ -122,11 +184,13 @@ public class ReseedChecker {
      */
     void done() {
         _inProgress.set(false);
+        _context.simpleScheduler().addEvent(new StatusCleaner(_lastStatus, _lastError), STATUS_CLEAN_TIME);
     }
 
     /**
      *  Status from current reseed attempt,
      *  probably empty if no reseed in progress.
+     *  May include HTML.
      *
      *  @return non-null, may be empty
      *  @since 0.9
@@ -146,7 +210,8 @@ public class ReseedChecker {
     }
 
     /**
-     *  Error from last or current reseed attempt
+     *  Error from last or current reseed attempt.
+     *  May include HTML.
      *
      *  @return non-null, may be empty
      *  @since 0.9
@@ -165,4 +230,22 @@ public class ReseedChecker {
         _lastError = s;
     }
 
+    /**
+     *  @since 0.9.19
+     */
+    private class StatusCleaner implements SimpleTimer.TimedEvent {
+        private final String _status, _error;
+
+        public StatusCleaner(String status, String error) {
+            _status = status;
+            _error = error;
+        }
+
+        public void timeReached() {
+            if (_status.equals(getStatus()))
+                setStatus("");
+            if (_error.equals(getError()))
+                setError("");
+        }
+    }
 }
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 79338d8f697f63f60780d050d6e7cf910d6d1d81..1cfe767be8f30e249cf967a1ebb3af8bfc469685 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -1,9 +1,12 @@
 package net.i2p.router.networkdb.reseed;
 
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -70,33 +73,28 @@ public class Reseeder {
      *         URLs are constructed, and because SSLEepGet doesn't follow redirects.
      */
     public static final String DEFAULT_SEED_URL =
-              "http://reseed.i2p-projekt.de/" + "," +
-              "http://cowpuncher.drollette.com/netdb/" + "," +
               "http://i2p.mooo.com/netDb/" + "," +
               "http://193.150.121.66/netDb/" + "," +
-              "http://netdb.i2p2.no/" + "," +
-              "http://reseed.info/"  + "," +
-              "http://us.reseed.i2p2.no/" + "," +
+              // Disable due to misconfiguation (ticket #1466)
+              //"http://us.reseed.i2p2.no/" + "," +
+              // Down (ticket #1422)
+              //"http://jp.reseed.i2p2.no/" + "," +
               "http://uk.reseed.i2p2.no/" + "," +
-              "http://jp.reseed.i2p2.no/" + "," +
-              "http://i2p-netdb.innovatio.no/" + "," +
-              "http://ieb9oopo.mooo.com/";
+              "http://netdb.i2p2.no/"; // Only SU3 (v3) support
 
     /** @since 0.8.2 */
     public static final String DEFAULT_SSL_SEED_URL =
-              "https://reseed.i2p-projekt.de/" + "," +
-              "https://cowpuncher.drollette.com/netdb/" + "," +
+              "https://reseed.i2p-projekt.de/" + "," + // Only HTTPS
+              "https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support
+              "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support
               "https://i2p.mooo.com/netDb/" + "," +
-              "https://193.150.121.66/netDb/" + "," +
-              "https://netdb.i2p2.no/" + "," +
-              "https://reseed.info/"  + "," +
+              "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support
               "https://us.reseed.i2p2.no:444/" + "," +
               "https://uk.reseed.i2p2.no:444/" + "," +
-              "https://jp.reseed.i2p2.no:444/" + "," +
-              "https://i2p-netdb.innovatio.no/" + "," +
-              "https://ssl.webpack.de/ivae2he9.sg4.e-plaza.de/" + "," + // Only HTTPS and SU3 (v2) support
+              // Down (ticket #1422)
+              //"https://jp.reseed.i2p2.no:444/" + "," +
               "https://link.mx24.eu/" + "," + // Only HTTPS and SU3 (v3) support
-              "https://ieb9oopo.mooo.com/";
+              "https://ieb9oopo.mooo.com/"; // Only HTTPS and SU3 (v3) support
 
     private static final String SU3_FILENAME = "i2pseeds.su3";
 
@@ -133,6 +131,11 @@ public class Reseeder {
         _checker = rc;
     }
 
+    /**
+     *  Start a reseed using the default reseed URLs.
+     *  Supports su3 and directories.
+     *  Threaded, nonblocking.
+     */
     void requestReseed() {
         ReseedRunner reseedRunner = new ReseedRunner();
         // set to daemon so it doesn't hang a shutdown
@@ -140,6 +143,79 @@ public class Reseeder {
         reseed.start();
     }
 
+    /**
+     *  Start a reseed from a single zip or su3 URL only.
+     *  Threaded, nonblocking.
+     *
+     *  @throws IllegalArgumentException if it doesn't end with zip or su3
+     *  @since 0.9.19
+     */
+    void requestReseed(URL url) throws IllegalArgumentException {
+        ReseedRunner reseedRunner = new ReseedRunner(url);
+        // set to daemon so it doesn't hang a shutdown
+        Thread reseed = new I2PAppThread(reseedRunner, "Reseed", true);
+        reseed.start();
+    }
+
+    /**
+     *  Start a reseed from a zip or su3 input stream.
+     *  Blocking, inline. Should be fast.
+     *  This will close the stream.
+     *
+     *  @return number of valid routerinfos imported
+     *  @throws IOException on most errors
+     *  @since 0.9.19
+     */
+    int requestReseed(InputStream in) throws IOException {
+        _checker.setError("");
+        _checker.setStatus("Reseeding from file");
+        byte[] su3Magic = DataHelper.getASCII(SU3File.MAGIC);
+        byte[] zipMagic = new byte[] { 0x50, 0x4b, 0x03, 0x04 };
+        int len = Math.max(su3Magic.length, zipMagic.length);
+        byte[] magic = new byte[len];
+        File tmp =  null;
+        OutputStream out = null;
+        try {
+            DataHelper.read(in, magic);
+            boolean isSU3;
+            if (DataHelper.eq(magic, 0, su3Magic, 0, su3Magic.length))
+                isSU3 = true;
+            else if (DataHelper.eq(magic, 0, zipMagic, 0, zipMagic.length))
+                isSU3 = false;
+            else
+                throw new IOException("Not a zip or su3 file");
+            tmp =  new File(_context.getTempDir(), "manualreseeds-" + _context.random().nextInt() + (isSU3 ? ".su3" : ".zip"));
+            out = new BufferedOutputStream(new SecureFileOutputStream(tmp));
+            out.write(magic);
+            byte buf[] = new byte[16*1024];
+            int read = 0;
+            while ( (read = in.read(buf)) != -1) 
+                out.write(buf, 0, read);
+            out.close();
+            int[] stats;
+            ReseedRunner reseedRunner = new ReseedRunner();
+            // inline
+            if (isSU3)
+                stats = reseedRunner.extractSU3(tmp);
+            else
+                stats = reseedRunner.extractZip(tmp);
+            int fetched = stats[0];
+            int errors = stats[1];
+            if (fetched <= 0)
+                throw new IOException("No seeds extracted");
+            _checker.setStatus(
+                _("Reseeding: got router info from file ({0} successful, {1} errors).", fetched, errors));
+            System.err.println("Reseed got " + fetched + " router infos from file with " + errors + " errors");
+            _context.router().eventLog().addEvent(EventLog.RESEED, fetched + " from file");
+            return fetched;
+        } finally {
+            try { in.close(); } catch (IOException ioe) {}
+            if (out != null)  try { out.close(); } catch (IOException ioe) {}
+            if (tmp != null)
+                tmp.delete();
+        }
+    }
+
     private class ReseedRunner implements Runnable, EepGet.StatusListener {
         private boolean _isRunning;
         private String _proxyHost;
@@ -147,9 +223,32 @@ public class Reseeder {
         private SSLEepGet.SSLState _sslState;
         private int _gotDate;
         private long _attemptStarted;
+        /** bytes per sec for each su3 downloaded */
+        private final List<Long> _bandwidths;
         private static final int MAX_DATE_SETS = 2;
+        private final URL _url;
 
+        /**
+         *  Start a reseed from the default URL list
+         */
         public ReseedRunner() {
+            _url = null;
+            _bandwidths = new ArrayList<Long>(4);
+        }
+
+        /**
+         *  Start a reseed from this URL only, or null for trying one or more from the default list.
+         *
+         *  @param url if non-null, must be a zip or su3 URL, NOT a directory
+         *  @throws IllegalArgumentException if it doesn't end with zip or su3
+         *  @since 0.9.19
+         */
+        public ReseedRunner(URL url) throws IllegalArgumentException {
+            String lc = url.getPath().toLowerCase(Locale.US);
+            if (!(lc.endsWith(".zip") || lc.endsWith(".su3")))
+                throw new IllegalArgumentException("Reseed URL must end with .zip or .su3");
+            _url = url;
+            _bandwidths = new ArrayList<Long>(4);
         }
 
         /*
@@ -160,6 +259,7 @@ public class Reseeder {
                 run2();
             } finally {
                 _checker.done();
+                processBandwidths();
             }
         }
 
@@ -172,8 +272,19 @@ public class Reseeder {
                 _proxyPort = _context.getProperty(PROP_PROXY_PORT, -1);
             }
             System.out.println("Reseed start");
-            int total = reseed(false);
-            if (total >= 50) {
+            int total;
+            if (_url != null) {
+                String lc = _url.getPath().toLowerCase(Locale.US);
+                if (lc.endsWith(".su3"))
+                    total = reseedSU3(_url, false);
+                else if (lc.endsWith(".zip"))
+                    total = reseedZip(_url, false);
+                else
+                    throw new IllegalArgumentException("Must end with .zip or .su3");
+            } else {
+                total = reseed(false);
+            }
+            if (total >= 20) {
                 System.out.println("Reseed complete, " + total + " received");
                 _checker.setError("");
             } else if (total > 0) {
@@ -185,22 +296,47 @@ public class Reseeder {
                 System.out.println(
                      "Ensure that nothing blocks outbound HTTP, check the logs, " +
                      "and if nothing helps, read the FAQ about reseeding manually.");
+                String old = _checker.getError();
                 _checker.setError(_("Reseed failed.") + ' '  +
-                                               _("See {0} for help.",
-                                                 "<a target=\"_top\" href=\"/configreseed\">" + _("reseed configuration page") + "</a>"));
+                                  _("See {0} for help.",
+                                    "<a target=\"_top\" href=\"/configreseed\">" + _("reseed configuration page") + "</a>") +
+                                  "<br>" + old);
             }
             _isRunning = false;
-            _checker.setStatus("");
+            // ReseedChecker will set timer to clean up
+            //_checker.setStatus("");
             _context.router().eventLog().addEvent(EventLog.RESEED, Integer.toString(total));
         }
 
+        /**
+         *  @since 0.9.18
+         */
+        private void processBandwidths() {
+            if (_bandwidths.isEmpty())
+                return;
+            long tot = 0;
+            for (Long sample : _bandwidths) {
+                tot += sample.longValue();
+            }
+            long avg = tot / _bandwidths.size();
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Bandwidth average: " + avg + " KBps from " + _bandwidths.size() + " samples");
+            // TODO _context.bandwidthLimiter().....
+        }
+
         // EepGet status listeners
         public void attemptFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt, int numRetries, Exception cause) {
             // Since readURL() runs an EepGet with 0 retries,
             // we can report errors with attemptFailed() instead of transferFailed().
             // It has the benefit of providing cause of failure, which helps resolve issues.
-            if (_log.shouldLog(Log.ERROR)) _log.error("EepGet failed on " + url, cause);
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("EepGet failed on " + url, cause);
+            else
+                _log.logAlways(Log.WARN, "EepGet failed on " + url + " : " + cause);
+            if (cause != null && cause.getMessage() != null)
+                _checker.setError(DataHelper.escapeHTML(cause.getMessage()));
         }
+
         public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {}
         public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {}
         public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {}
@@ -298,6 +434,18 @@ public class Reseeder {
                 Collections.shuffle(URLList2, _context.random());
                 URLList.addAll(URLList2);
             }
+            return reseed(URLList, echoStatus);
+        }
+
+        /**
+        * Reseed has been requested, so lets go ahead and do it.  Fetch all of
+        * the routerInfo-*.dat files from the specified URLs
+        * save them into this router's netDb dir.
+        *
+        * @param echoStatus apparently always false
+        * @return count of routerinfos successfully fetched
+        */
+        private int reseed(List<URL> URLList, boolean echoStatus) {
             int total = 0;
             for (int i = 0; i < URLList.size() && _isRunning; i++) {
                 URL url = URLList.get(i);
@@ -449,22 +597,90 @@ public class Reseeder {
          *  @return count of routerinfos successfully fetched
          *  @since 0.9.14
          **/
-        private int reseedSU3(URL seedURL, boolean echoStatus) {
+        public int reseedSU3(URL seedURL, boolean echoStatus) {
+            return reseedSU3OrZip(seedURL, true, echoStatus);
+        }
+
+        /**
+         *  Fetch a zip file containing routerInfo files
+         *
+         *  We update the status here.
+         *
+         *  @param seedURL the URL of the zip file
+         *  @param echoStatus apparently always false
+         *  @return count of routerinfos successfully fetched
+         *  @since 0.9.19
+         **/
+        public int reseedZip(URL seedURL, boolean echoStatus) {
+            return reseedSU3OrZip(seedURL, false, echoStatus);
+        }
+
+        /**
+         *  Fetch an su3 or zip file containing routerInfo files
+         *
+         *  We update the status here.
+         *
+         *  @param seedURL the URL of the SU3 or zip file
+         *  @param echoStatus apparently always false
+         *  @return count of routerinfos successfully fetched
+         *  @since 0.9.19
+         **/
+        private int reseedSU3OrZip(URL seedURL, boolean isSU3, boolean echoStatus) {
             int fetched = 0;
             int errors = 0;
             File contentRaw = null;
-            File zip = null;
-            File tmpDir = null;
             try {
                 _checker.setStatus(_("Reseeding: fetching seed URL."));
                 System.err.println("Reseeding from " + seedURL);
+                // don't use context time, as we may be step-changing it
+                // from the server header
+                long startTime = System.currentTimeMillis();
                 contentRaw = fetchURL(seedURL);
+                long totalTime = System.currentTimeMillis() - startTime;
                 if (contentRaw == null) {
                     // Logging deprecated here since attemptFailed() provides better info
                     _log.warn("Failed reading seed URL: " + seedURL);
                     System.err.println("Reseed got no router infos from " + seedURL);
                     return 0;
                 }
+                if (totalTime > 0) {
+                    long sz = contentRaw.length();
+                    long bw = 1000 * sz / totalTime;
+                    _bandwidths.add(Long.valueOf(bw));
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Rcvd " + sz + " bytes in " + totalTime + " ms from " + seedURL);
+                }
+                int[] stats;
+                if (isSU3)
+                    stats = extractSU3(contentRaw);
+                else
+                    stats = extractZip(contentRaw);
+                fetched = stats[0];
+                errors = stats[1];
+            } catch (Throwable t) {
+                System.err.println("Error reseeding: " + t);
+                _log.error("Error reseeding", t);
+                errors++;
+            } finally {
+                if (contentRaw != null)
+                    contentRaw.delete();
+            }
+            _checker.setStatus(
+                _("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors));
+            System.err.println("Reseed got " + fetched + " router infos from " + seedURL + " with " + errors + " errors");
+            return fetched;
+        }
+
+
+        /**
+         *  @return 2 ints: number successful and number of errors
+         *  @since 0.9.19 pulled from reseedSU3
+         */
+        public int[] extractSU3(File contentRaw) throws IOException {
+            int fetched = 0;
+            int errors = 0;
+            File zip = null;
+            try {
                 SU3File su3 = new SU3File(_context, contentRaw);
                 zip = new File(_context.getTempDir(), "reseed-" + _context.random().nextInt() + ".zip");
                 su3.verifyAndMigrate(zip);
@@ -482,6 +698,35 @@ public class Reseeder {
                             throw new IOException("su3 file too old");
                     }
                 } catch (NumberFormatException nfe) {}
+
+                int[] stats = extractZip(zip);
+                fetched = stats[0];
+                errors = stats[1];
+            } catch (Throwable t) {
+                System.err.println("Error reseeding: " + t);
+                _log.error("Error reseeding", t);
+                errors++;
+            } finally {
+                contentRaw.delete();
+                if (zip != null)
+                    zip.delete();
+            }
+
+            int[] rv = new int[2];
+            rv[0] = fetched;
+            rv[1] = errors;
+            return rv;
+        }
+
+        /**
+         *  @return 2 ints: number successful and number of errors
+         *  @since 0.9.19 pulled from reseedSU3
+         */
+        public int[] extractZip(File zip) throws IOException {
+            int fetched = 0;
+            int errors = 0;
+            File tmpDir = null;
+            try {
                 tmpDir = new File(_context.getTempDir(), "reseeds-" + _context.random().nextInt());
                 if (!FileUtil.extractZip(zip, tmpDir))
                     throw new IOException("Bad zip file");
@@ -527,24 +772,17 @@ public class Reseeder {
                     if (errors >= 5)
                         break;
                 }
-            } catch (Throwable t) {
-                System.err.println("Error reseeding: " + t);
-                _log.error("Error reseeding", t);
-                errors++;
             } finally {
-                if (contentRaw != null)
-                    contentRaw.delete();
-                if (zip != null)
-                    zip.delete();
                 if (tmpDir != null)
                     FileUtil.rmdir(tmpDir, false);
             }
-            _checker.setStatus(
-                _("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors));
-            System.err.println("Reseed got " + fetched + " router infos from " + seedURL + " with " + errors + " errors");
+
             if (fetched > 0)
                 _context.netDb().rescan();
-            return fetched;
+            int[] rv = new int[2];
+            rv[0] = fetched;
+            rv[1] = errors;
+            return rv;
         }
 
         /**
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/package.html b/router/java/src/net/i2p/router/networkdb/reseed/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..e3848ed5387f55c5d1cbbc9f3febbef5832f0256
--- /dev/null
+++ b/router/java/src/net/i2p/router/networkdb/reseed/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+Fetching, validation, unpacking, and installation of RouterInfos from
+signed su3 files, unsigned zip files, and web indexes.
+Supports loading from clearnet via HTTP and HTTPS, and from local files.
+Automatic reseeding on first install and when references fall below a minimum value.
+Support for user-initiated reseeds and status feedback via the router console.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index d2de16d9ba5c4a60c8fa51f561824995b91d4b0e..9146a881e2e6b84e8bd9a38b6cd84fb7649d31cd 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -61,6 +61,8 @@ class PeerManager {
         Router.CAPABILITY_BW64 +
         Router.CAPABILITY_BW128 +
         Router.CAPABILITY_BW256 +
+        Router.CAPABILITY_BW512 +
+        Router.CAPABILITY_BW_UNLIMITED +
         Router.CAPABILITY_REACHABLE +
         Router.CAPABILITY_UNREACHABLE;
 
diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
index 9c3ff4cd6f4a911ca45168453ef19fcc04f7906c..3178cbbb8e2c4cca4f838574d10876c2fb1dedb5 100644
--- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java
+++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
@@ -65,7 +65,9 @@ import net.i2p.util.SecureFileOutputStream;
  */
 public class ClientAppConfig {
     /** wait 2 minutes before starting up client apps */
-    private final static long STARTUP_DELAY = 2*60*1000;
+    private final static long DEFAULT_STARTUP_DELAY = 2*60*1000;
+    /** speed up i2ptunnel without rewriting clients.config */
+    private final static long I2PTUNNEL_STARTUP_DELAY = 35*1000;
     
     private static final String PROP_CLIENT_CONFIG_FILENAME = "router.clientConfigFile";
     private static final String DEFAULT_CLIENT_CONFIG_FILENAME = "clients.config";
@@ -183,7 +185,10 @@ public class ClientAppConfig {
             if (onBoot != null)
                 onStartup = "true".equals(onBoot) || "yes".equals(onBoot);
 
-            long delay = (onStartup ? 0 : STARTUP_DELAY);
+            // speed up the start of i2ptunnel for everybody without rewriting clients.config
+            long delay = onStartup ? 0 :
+                                   (className.equals("net.i2p.i2ptunnel.TunnelControllerGroup") ?
+                                    I2PTUNNEL_STARTUP_DELAY : DEFAULT_STARTUP_DELAY);
             if (delayStr != null && !onStartup)
                 try { delay = 1000*Integer.parseInt(delayStr); } catch (NumberFormatException nfe) {}
 
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 23149c7599697990cde79ee146d655eafea549cc..3be6b6309f99a462811c03683c11b0cf86203e94 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -276,7 +276,8 @@ public class WorkingDir {
         // base install - files
         // We don't currently have a default router.config, logger.config, susimail.config, or webapps.config in the base distribution,
         // but distros might put one in
-        "blocklist.txt,hosts.txt,i2psnark.config,i2ptunnel.config,jetty-i2psnark.xml," +
+        // blocklist.txt now accessed in base dir, user can add another in config dir if desired
+        "hosts.txt,i2psnark.config,i2ptunnel.config,jetty-i2psnark.xml," +
         "logger.config,router.config,susimail.config,systray.config,webapps.config";
 
     private static boolean migrate(String list, File olddir, File todir) {
diff --git a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java
index 668536de3dfc50d3dd53ecf5e8681a41c72d4399..8178478358c83ff7b1eed8c5cc8b4327250f39c1 100644
--- a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java
+++ b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java
@@ -38,6 +38,7 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
         ctx.statManager().createRequiredRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
         ctx.statManager().createRateStat("router.activeSendPeers", "How many peers we've sent to this minute", "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         ctx.statManager().createRequiredRateStat("router.fastPeers", _x("Known fast peers"), "Throttle", new long[] { 5*60*1000, 60*60*1000 });
+        ctx.statManager().createRateStat("router.integratedPeers", _x("Known integrated (floodfill) peers"), "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         _maxMemory = Runtime.getRuntime().maxMemory();
         String legend = "(Bytes)";
         if (_maxMemory < Long.MAX_VALUE)
@@ -61,6 +62,9 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
         int highCap = getContext().profileOrganizer().countHighCapacityPeers();
         getContext().statManager().addRateData("router.highCapacityPeers", highCap, 60*1000);
 
+        int integrated = getContext().peerManager().getPeersByCapability('f').size();
+        getContext().statManager().addRateData("router.integratedPeers", integrated, 60*1000);
+
         getContext().statManager().addRateData("bw.sendRate", (long)getContext().bandwidthLimiter().getSendBps());
         getContext().statManager().addRateData("bw.recvRate", (long)getContext().bandwidthLimiter().getReceiveBps());
         
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index 88374cf496e58ab7e1feb7c03382ad85b2e15251..f31bcce373bf3ce51122433ec8f47a6cb6355fb5 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -390,24 +390,40 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
         RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer);
         if (ri == null)
             return null;
-        ip = getIP(ri);
+        ip = getValidIP(ri);
         if (ip != null)
             return _geoIP.get(ip);
         return null;
     }
 
+    /**
+     *  Return first IP (v4 or v6) we find, any transport.
+     *  Not validated, may be local, etc.
+     */
     private static byte[] getIP(RouterInfo ri) {
-        // Return first IP (v4 or v6) we find, any transport
-        // Assume IPv6 doesn't have geoIP for now
         for (RouterAddress ra : ri.getAddresses()) {
             byte[] rv = ra.getIP();
-            //if (rv != null && rv.length == 4)
             if (rv != null)
                 return rv;
         }
         return null;
     }
 
+    /**
+     *  Return first valid IP (v4 or v6) we find, any transport.
+     *  Local and other invalid IPs will not be returned.
+     *
+     *  @since 0.9.18
+     */
+    private static byte[] getValidIP(RouterInfo ri) {
+        for (RouterAddress ra : ri.getAddresses()) {
+            byte[] rv = ra.getIP();
+            if (rv != null && TransportUtil.isPubliclyRoutable(rv, true))
+                return rv;
+        }
+        return null;
+    }
+
     /** full name for a country code, or the code if we don't know the name */
     @Override
     public String getCountryName(String c) {
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index 231dadeec59e3463279e90012112c32cb7835cde..b650e5c03e965c89b28cc308e0da8e2904f85a10 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -34,8 +34,8 @@ import net.i2p.util.Log;
 public class FIFOBandwidthLimiter {
     private final Log _log;
     private final I2PAppContext _context;
-    private final List<Request> _pendingInboundRequests;
-    private final List<Request> _pendingOutboundRequests;
+    private final List<SimpleRequest> _pendingInboundRequests;
+    private final List<SimpleRequest> _pendingOutboundRequests;
     /** how many bytes we can consume for inbound transmission immediately */
     private final AtomicInteger _availableInbound = new AtomicInteger();
     /** how many bytes we can consume for outbound transmission immediately */
@@ -91,8 +91,8 @@ public class FIFOBandwidthLimiter {
         _context.statManager().createRateStat("bwLimiter.pendingInboundRequests", "How many inbound requests are ahead of the current one (ignoring ones with 0)?", "BandwidthLimiter", new long[] { 5*60*1000l, 60*60*1000l });
         _context.statManager().createRateStat("bwLimiter.outboundDelayedTime", "How long it takes to honor an outbound request (ignoring ones with that go instantly)?", "BandwidthLimiter", new long[] { 5*60*1000l, 60*60*1000l });
         _context.statManager().createRateStat("bwLimiter.inboundDelayedTime", "How long it takes to honor an inbound request (ignoring ones with that go instantly)?", "BandwidthLimiter", new long[] { 5*60*1000l, 60*60*1000l });
-        _pendingInboundRequests = new ArrayList<Request>(16);
-        _pendingOutboundRequests = new ArrayList<Request>(16);
+        _pendingInboundRequests = new ArrayList<SimpleRequest>(16);
+        _pendingOutboundRequests = new ArrayList<SimpleRequest>(16);
         _lastTotalSent = _totalAllocatedOutboundBytes.get();
         _lastTotalReceived = _totalAllocatedInboundBytes.get();
         _lastStatsUpdated = now();
@@ -278,8 +278,8 @@ public class FIFOBandwidthLimiter {
      * @param maxBurstOut allow up to this many bytes in from the burst section for this time period (may be negative)
      */
     final void refillBandwidthQueues(List<Request> buf, long bytesInbound, long bytesOutbound, long maxBurstIn, long maxBurstOut) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Refilling the queues with " + bytesInbound + "/" + bytesOutbound + ": " + getStatus().toString());
+        //if (_log.shouldLog(Log.DEBUG))
+        //    _log.debug("Refilling the queues with " + bytesInbound + "/" + bytesOutbound + ": " + getStatus().toString());
 
         // Take some care throughout to minimize accesses to the atomics,
         // both for efficiency and to not let strange things happen if
@@ -289,8 +289,8 @@ public class FIFOBandwidthLimiter {
         // FIXME wrap - change to AtomicLong or detect
         int avi = _availableInbound.addAndGet((int) bytesInbound);
         if (avi > _maxInbound) {
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("available inbound (" + avi + ") exceeds our inbound burst (" + _maxInbound + "), so no supplement");
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("available inbound (" + avi + ") exceeds our inbound burst (" + _maxInbound + "), so no supplement");
             int uib = _unavailableInboundBurst.addAndGet(avi - _maxInbound);
             _availableInbound.set(_maxInbound);
             if (uib > _maxInboundBurst) {
@@ -302,8 +302,8 @@ public class FIFOBandwidthLimiter {
             int want = (int)maxBurstIn;
             if (want > (_maxInbound - avi))
                 want = _maxInbound - avi;
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("want to pull " + want + " from the inbound burst (" + _unavailableInboundBurst + ") to supplement " + avi + " (max: " + _maxInbound + ")");
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("want to pull " + want + " from the inbound burst (" + _unavailableInboundBurst + ") to supplement " + avi + " (max: " + _maxInbound + ")");
             
             if (want > 0) {
                 int uib = _unavailableInboundBurst.get();
@@ -319,8 +319,8 @@ public class FIFOBandwidthLimiter {
         
         int avo = _availableOutbound.addAndGet((int) bytesOutbound);
         if (avo > _maxOutbound) {
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("available outbound (" + avo + ") exceeds our outbound burst (" + _maxOutbound + "), so no supplement");
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("available outbound (" + avo + ") exceeds our outbound burst (" + _maxOutbound + "), so no supplement");
             int uob = _unavailableOutboundBurst.getAndAdd(avo - _maxOutbound);
             _availableOutbound.set(_maxOutbound);
 
@@ -333,8 +333,8 @@ public class FIFOBandwidthLimiter {
             int want = (int)maxBurstOut;
             if (want > (_maxOutbound - avo))
                 want = _maxOutbound - avo;
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("want to pull " + want + " from the outbound burst (" + _unavailableOutboundBurst + ") to supplement " + avo + " (max: " + _maxOutbound + ")");
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("want to pull " + want + " from the outbound burst (" + _unavailableOutboundBurst + ") to supplement " + avo + " (max: " + _maxOutbound + ")");
             
             if (want > 0) {
                 int uob = _unavailableOutboundBurst.get();
@@ -450,7 +450,7 @@ public class FIFOBandwidthLimiter {
     private long locked_getLongestInboundWait() {
         long start = -1;
         for (int i = 0; i < _pendingInboundRequests.size(); i++) {
-            SimpleRequest req = (SimpleRequest)_pendingInboundRequests.get(i);
+            Request req = _pendingInboundRequests.get(i);
             if ( (start < 0) || (start > req.getRequestTime()) )
                 start = req.getRequestTime();
         }
@@ -464,7 +464,7 @@ public class FIFOBandwidthLimiter {
     private long locked_getLongestOutboundWait() {
         long start = -1;
         for (int i = 0; i < _pendingOutboundRequests.size(); i++) {
-            SimpleRequest req = (SimpleRequest)_pendingOutboundRequests.get(i);
+            Request req = _pendingOutboundRequests.get(i);
             if (req == null) continue;
             if ( (start < 0) || (start > req.getRequestTime()) )
                 start = req.getRequestTime();
@@ -481,7 +481,7 @@ public class FIFOBandwidthLimiter {
      */
     private final void locked_satisfyInboundUnlimited(List<Request> satisfied) {
         while (!_pendingInboundRequests.isEmpty()) {
-            SimpleRequest req = (SimpleRequest)_pendingInboundRequests.remove(0);
+            SimpleRequest req = _pendingInboundRequests.remove(0);
             int allocated = req.getPendingRequested();
             _totalAllocatedInboundBytes.addAndGet(allocated);
             req.allocateBytes(allocated);
@@ -506,7 +506,7 @@ public class FIFOBandwidthLimiter {
     private final void locked_satisfyInboundAvailable(List<Request> satisfied) {
         for (int i = 0; i < _pendingInboundRequests.size(); i++) {
             if (_availableInbound.get() <= 0) break;
-            SimpleRequest req = (SimpleRequest)_pendingInboundRequests.get(i);
+            SimpleRequest req = _pendingInboundRequests.get(i);
             long waited = now() - req.getRequestTime();
             if (req.getAborted()) {
                 // connection decided they dont want the data anymore
@@ -598,7 +598,7 @@ public class FIFOBandwidthLimiter {
      */
     private final void locked_satisfyOutboundUnlimited(List<Request> satisfied) {
         while (!_pendingOutboundRequests.isEmpty()) {
-            SimpleRequest req = (SimpleRequest)_pendingOutboundRequests.remove(0);
+            SimpleRequest req = _pendingOutboundRequests.remove(0);
             int allocated = req.getPendingRequested();
             _totalAllocatedOutboundBytes.addAndGet(allocated);
             req.allocateBytes(allocated);
@@ -624,7 +624,7 @@ public class FIFOBandwidthLimiter {
     private final void locked_satisfyOutboundAvailable(List<Request> satisfied) {
         for (int i = 0; i < _pendingOutboundRequests.size(); i++) {
             if (_availableOutbound.get() <= 0) break;
-            SimpleRequest req = (SimpleRequest)_pendingOutboundRequests.get(i);
+            SimpleRequest req = _pendingOutboundRequests.get(i);
             long waited = now() - req.getRequestTime();
             if (req.getAborted()) {
                 // connection decided they dont want the data anymore
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
index 4da99288ed97fe2eb7eef749bd14bac336cebe5c..3dc610b7813905e4b30623881cc764396f985822 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
@@ -70,6 +70,8 @@ public class FIFOBandwidthRefiller implements Runnable {
     public static final int MIN_INBOUND_BANDWIDTH_PEAK = 3;
     /** For now, until there is some tuning and safe throttling, we set the floor at a 3KBps during burst */
     public static final int MIN_OUTBOUND_BANDWIDTH_PEAK = 3;
+    /** Max for reasonable bloom filter false positive rate. See util/DecayingBloomFilter and tunnel/BloomFilterIVValidator */
+    public static final int MAX_OUTBOUND_BANDWIDTH = 4096;
     
     /** 
      * how often we replenish the queues.  
@@ -199,7 +201,9 @@ public class FIFOBandwidthRefiller implements Runnable {
         int out = _context.getProperty(PROP_OUTBOUND_BANDWIDTH, DEFAULT_OUTBOUND_BANDWIDTH);
         if (out != _outboundKBytesPerSecond) {
             // bandwidth was specified *and* changed
-                if ( (out <= 0) || (out >= MIN_OUTBOUND_BANDWIDTH) )
+                if (out >= MAX_OUTBOUND_BANDWIDTH)
+                    _outboundKBytesPerSecond = MAX_OUTBOUND_BANDWIDTH;
+                else if ( (out <= 0) || (out >= MIN_OUTBOUND_BANDWIDTH) )
                     _outboundKBytesPerSecond = out;
                 else
                     _outboundKBytesPerSecond = MIN_OUTBOUND_BANDWIDTH;
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 6dd93b4c59244fa39ab44e403978c174bd980f33..1b54d5c707ae3dac376a6cb89afa31a372797f1d 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -143,8 +143,27 @@ public abstract class TransportImpl implements Transport {
         RouterInfo ri = _context.router().getRouterInfo();
         if (ri != null) {
             char bw = ri.getBandwidthTier().charAt(0);
-            if (bw > Router.CAPABILITY_BW12 && bw <= Router.CAPABILITY_BW256)
-                def *= (1 + bw - Router.CAPABILITY_BW12);
+            switch (bw) {
+                case Router.CAPABILITY_BW12:
+                case 'u':  // unknown
+                default:
+                    break;
+                case Router.CAPABILITY_BW32:
+                    def *= 2;
+                    break;
+                case Router.CAPABILITY_BW64:
+                    def *= 3;
+                    break;
+                case Router.CAPABILITY_BW128:
+                    def *= 4;
+                    break;
+                case Router.CAPABILITY_BW256:
+                // TODO
+                case Router.CAPABILITY_BW512:
+                case Router.CAPABILITY_BW_UNLIMITED:
+                    def *= 7;
+                    break;
+            }
         }
         if (_context.netDb().floodfillEnabled()) {
             // && !SystemVersion.isWindows()) {
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 5062cc14bbd2264e492ea41d25e3e498d7ee63bf..188d5fb4d2832b5beb589d33a738bafe31cdf9c0 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -22,9 +22,11 @@ import java.util.TreeMap;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.i2p.crypto.SigType;
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterAddress;
 import net.i2p.data.router.RouterIdentity;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.CommSystemFacade;
 import net.i2p.router.OutNetMessage;
@@ -37,6 +39,7 @@ import net.i2p.util.Addresses;
 import net.i2p.util.Log;
 import net.i2p.util.SystemVersion;
 import net.i2p.util.Translate;
+import net.i2p.util.VersionComparator;
 
 public class TransportManager implements TransportEventListener {
     private final Log _log;
@@ -58,6 +61,9 @@ public class TransportManager implements TransportEventListener {
     /** default true */
     public final static String PROP_ENABLE_UPNP = "i2np.upnp.enable";
     
+    /** not forever, since they may update */
+    private static final long SIGTYPE_BANLIST_DURATION = 36*60*60*1000L;
+
     public TransportManager(RouterContext context) {
         _context = context;
         _log = _context.logManager().getLog(TransportManager.class);
@@ -559,12 +565,31 @@ public class TransportManager implements TransportEventListener {
         }
         if (unreachableTransports >= _transports.size()) {
             if (msg.getTarget().getIdentity().getSigningPublicKey().getType() == null) {
+                // we don't support his crypto
                 _context.statManager().addRateData("transport.banlistOnUnsupportedSigType", 1);
                 _context.banlist().banlistRouterForever(peer, _x("Unsupported signature type"));
             } else if (unreachableTransports >= _transports.size() && countActivePeers() > 0) {
                 // Don't banlist if we aren't talking to anybody, as we may have a network connection issue
-                _context.statManager().addRateData("transport.banlistOnUnreachable", msg.getLifetime(), msg.getLifetime());
-                _context.banlist().banlistRouter(peer, _x("Unreachable on any transport"));
+                boolean incompat = false;
+                RouterInfo us = _context.router().getRouterInfo();
+                if (us != null) {
+                    RouterIdentity id = us.getIdentity();
+                    if (id.getSigType() != SigType.DSA_SHA1) {
+                        String v = msg.getTarget().getVersion();
+                        // NTCP is earlier than SSU, use that one
+                        if (VersionComparator.comp(v, NTCPTransport.MIN_SIGTYPE_VERSION) < 0)
+                            incompat = true;
+                    }
+                }
+                if (incompat) {
+                    // they don't support our crypto
+                    _context.statManager().addRateData("transport.banlistOnUnsupportedSigType", 1);
+                    _context.banlist().banlistRouter(peer, _x("No support for our signature type"), null, null,
+                                                     _context.clock().now() + SIGTYPE_BANLIST_DURATION);
+                } else {
+                    _context.statManager().addRateData("transport.banlistOnUnreachable", msg.getLifetime(), msg.getLifetime());
+                    _context.banlist().banlistRouter(peer, _x("Unreachable on any transport"));
+                }
             }
         } else if (rv == null) {
             _context.statManager().addRateData("transport.noBidsYetNotAllUnreachable", unreachableTransports, msg.getLifetime());
@@ -593,8 +618,11 @@ public class TransportManager implements TransportEventListener {
     }
     
     public void transportAddressChanged() {
-        if (_upnpManager != null)
+        if (_upnpManager != null) {
+            _upnpManager.rescan();
+            // should really delay the following by 5 seconds?
             _upnpManager.update(getPorts());
+        }
     }
 
     public List<String> getMostRecentErrorMessages() { 
@@ -605,6 +633,10 @@ public class TransportManager implements TransportEventListener {
         return rv;
     }
     
+    /**
+     *  Warning - blocking, very slow, queries the active UPnP router,
+     *  will take many seconds if it has vanished.
+     */
     public void renderStatusHTML(Writer out, String urlBase, int sortFlags) throws IOException {
         TreeMap<String, Transport> transports = new TreeMap<String, Transport>();
         for (Transport t : _transports.values()) {
@@ -633,9 +665,13 @@ public class TransportManager implements TransportEventListener {
         }
         buf.append("</pre>\n");
         out.write(buf.toString());
-        // newer androids crash w/ network on IO thread
-        if (_upnpManager != null && !SystemVersion.isAndroid())
+        if (SystemVersion.isAndroid()) {
+            // newer androids crash w/ network on IO thread
+        } else if (_upnpManager != null) {
             out.write(_upnpManager.renderStatusHTML());
+        } else {
+            out.write("<h3><a name=\"upnp\"></a>" + _("UPnP is not enabled") + "</h3>\n");
+        }
         out.write("</p>\n");
         out.flush();
     }
diff --git a/router/java/src/net/i2p/router/transport/TransportUtil.java b/router/java/src/net/i2p/router/transport/TransportUtil.java
index ef8a7786feda66df4b9638312950430a1d6f9a14..650a9656f35b1764ce1d1e3f24ae6ae3af9a63d4 100644
--- a/router/java/src/net/i2p/router/transport/TransportUtil.java
+++ b/router/java/src/net/i2p/router/transport/TransportUtil.java
@@ -102,6 +102,8 @@ public abstract class TransportUtil {
     }
 
     /**
+     *  Ref: RFC 5735
+     *
      *  @param addr non-null
      *  @since IPv6
      */
@@ -110,22 +112,40 @@ public abstract class TransportUtil {
             if (!allowIPv4)
                 return false;
             int a0 = addr[0] & 0xFF;
-            if (a0 == 127) return false;
-            if (a0 == 10) return false;
-            int a1 = addr[1] & 0xFF;
-            if (a0 == 172 && a1 >= 16 && a1 <= 31) return false;
-            if (a0 == 192 && a1 == 168) return false;
-            if (a0 >= 224) return false; // no multicast
+            // please keep sorted by IP
             if (a0 == 0) return false;
-            if (a0 == 169 && a1 == 254) return false;
+            if (a0 == 10) return false;
             // 5/8 allocated to RIPE (30 November 2010)
             //if ((addr[0]&0xFF) == 5) return false;  // Hamachi
             // Hamachi moved to 25/8 Nov. 2012
             // Assigned to UK Ministry of Defence
             // http://blog.logmein.com/products/changes-to-hamachi-on-november-19th
             if (a0 == 25) return false;
+            if (a0 == 127) return false;
+            int a1 = addr[1] & 0xFF;
             // Carrier Grade NAT RFC 6598
             if (a0 == 100 && a1 >= 64 && a1 <= 127) return false;
+            if (a0 == 169 && a1 == 254) return false;
+            if (a0 == 172 && a1 >= 16 && a1 <= 31) return false;
+            if (a0 == 192) {
+                if (a1 == 168) return false;
+                if (a1 == 0) {
+                    int a2 = addr[2] & 0xFF;
+                    // protocol assignment, documentation
+                    // 192.0.0.2 seen in the wild, RFC 6333 "Dual-Stack Lite Broadband Deployments Following IPv4 Exhaustion"
+                    if (a2 == 0 || a2 == 2) return false;
+                }
+                // 6to4 anycast
+                if (a1 == 88 && (addr[2] & 0xff) == 99) return false;
+            }
+            if (a0 == 198) {
+                // tests
+                if (a1 == 18 || a1 == 19) return false;
+                if (a1 == 51 && (addr[2] & 0xff) == 100) return false;
+            }
+            // test
+            if (a0 == 203 && a1 == 0 && (addr[2] & 0xff) == 113) return false;
+            if (a0 >= 224) return false; // no multicast
             return true; // or at least possible to be true
         } else if (addr.length == 16) {
             if (allowIPv6) {
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 582f92272500c5f3c7a352a223100a2f6e052b1a..6753c09fcc927aaf958c83584fc9e2484fe1a333 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -111,6 +111,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	public synchronized boolean runPlugin() {
 		synchronized(lock) {
 			portsToForward.clear();
+			portsForwarded.clear();
 		}
 		return super.start();
 	}
@@ -133,9 +134,11 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			} catch (InterruptedException ie) {}
 		}
 		super.stop();
-		_router = null;
-		_service = null;
-		_serviceLacksAPM = false;
+		synchronized(lock) {
+			_router = null;
+			_service = null;
+			_serviceLacksAPM = false;
+		}
 	}
 	
 	public DetectedIP[] getAddress() {
@@ -190,6 +193,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
                 String name = dev.getFriendlyName();
 		if (name == null)
 			name = "???";
+		boolean isIGD = ROUTER_DEVICE.equals(dev.getDeviceType()) && dev.isRootDevice();
+		name += isIGD ? " IGD" : (" " + dev.getDeviceType());
 		synchronized (lock) {
 			if(isDisabled) {
 				if (_log.shouldLog(Log.WARN))
@@ -200,27 +205,18 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		}
 		if(!ROUTER_DEVICE.equals(dev.getDeviceType()) || !dev.isRootDevice()) {
 			if (_log.shouldLog(Log.WARN))
-				_log.warn("UP&P non-IGD device found, ignoring " + name);
+				_log.warn("UP&P non-IGD device found, ignoring " + name + ' ' + dev.getDeviceType());
 			synchronized (lock) {
 				_otherUDNs.put(udn, name);
 			}
 			return; // ignore non-IGD devices
 		} else if(isNATPresent()) {
                         // maybe we should see if the old one went away before ignoring the new one?
+			// TODO if old one doesn't have an IP address but new one does, switch
 			_log.logAlways(Log.WARN, "UP&P ignoring additional device " + name + " UDN: " + udn);
 			synchronized (lock) {
 				_otherUDNs.put(udn, name);
 			}
-			/********** seems a little drastic
-			isDisabled = true;
-			
-			synchronized(lock) {
-				_router = null;
-				_service = null;
-			}
-			
-			stop();
-			**************/
 			return;
 		}
 		
@@ -256,7 +252,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			/// we should look for the next one
 			if(_service == null) {
 				_log.error("The IGD device we got isn't suiting our needs, let's disable the plugin");
-				isDisabled = true;
+				//isDisabled = true;
 				_router = null;
 				return;
 			}
@@ -292,8 +288,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 					
 					_service = current2.getService(WAN_PPP_CONNECTION);
 					if(_service == null) {
-						if (_log.shouldLog(Log.WARN))
-							_log.warn(_router.getFriendlyName()+ " doesn't seems to be using PPP; we won't be able to extract bandwidth-related informations out of it.");
+						if (_log.shouldLog(Log.INFO))
+							_log.info(_router.getFriendlyName()+ " doesn't seems to be using PPP; we won't be able to extract bandwidth-related informations out of it.");
 						_service = current2.getService(WAN_IP_CONNECTION);
 						if(_service == null)
 							_log.error(_router.getFriendlyName()+ " doesn't export WAN_IP_CONNECTION either: we won't be able to use it!");
@@ -312,7 +308,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		int nbOfTries = 0;
 		boolean isPortForwarded = false;
 		while ((!_serviceLacksAPM) && nbOfTries++ < 5) {
-			isPortForwarded = addMapping(protocol, port, "I2P " + description, fp);
+			//isPortForwarded = addMapping(protocol, port, "I2P " + description, fp);
+			isPortForwarded = addMapping(protocol, port, description, fp);
 			if(isPortForwarded || _serviceLacksAPM)
 				break;
 			try {
@@ -341,12 +338,14 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
                 String udn = dev.getUDN();
 		if (_log.shouldLog(Log.WARN))
 			_log.warn("UP&P device removed : " + dev.getFriendlyName() + " UDN: " + udn);
+		ForwardPortCallback fpc = null;
+		Map<ForwardPort, ForwardPortStatus> removeMap = null;
 		synchronized (lock) {
-			if(_router == null) return;
 			if (udn != null)
 				_otherUDNs.remove(udn);
 			else
 				_otherUDNs.remove("???");
+			if (_router == null) return;
 			// I2P this wasn't working
 			//if(_router.equals(dev)) {
 		        if(ROUTER_DEVICE.equals(dev.getDeviceType()) &&
@@ -355,11 +354,28 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			   stringEquals(_router.getUDN(), udn)) {
 				if (_log.shouldLog(Log.WARN))
 					_log.warn("UP&P IGD device removed : " + dev.getFriendlyName());
+				// TODO promote an IGD from _otherUDNs ??
+				// For now, just clear the others so they can be promoted later
+				// after a rescan.
+				_otherUDNs.clear();
 				_router = null;
 				_service = null;
 				_serviceLacksAPM = false;
+				if (!portsForwarded.isEmpty()) {
+					fpc = forwardCallback;
+					removeMap = new HashMap<ForwardPort, ForwardPortStatus>(portsForwarded.size());
+					for (ForwardPort port : portsForwarded) {
+						ForwardPortStatus fps = new ForwardPortStatus(ForwardPortStatus.DEFINITE_FAILURE,
+                                                                      "UPnP device removed",
+                                                                      port.portNumber);
+					}
+				}
+				portsForwarded.clear();
 			}
 		}
+		if (fpc != null) {
+			fpc.portForwardStatus(removeMap);
+		}
 	}
 	
 	/**
@@ -381,25 +397,31 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	/**
 	 * @return whether we are behind an UPnP-enabled NAT/router
 	 */
-	public boolean isNATPresent() {
-	    return _router != null && _service != null;
+	private boolean isNATPresent() {
+		synchronized(lock) {
+			return _router != null && _service != null;
+		}
 	}
 
 	/**
 	 * @return the external address the NAT thinks we have.  Blocking.
 	 * null if we can't find it.
 	 */
-	public String getNATAddress() {
-		if(!isNATPresent())
-			return null;
+	private String getNATAddress() {
+		Service service;
+		synchronized(lock) {
+			if(!isNATPresent())
+				return null;
+			service = _service;
+		}
 
-		Action getIP = _service.getAction("GetExternalIPAddress");
+		Action getIP = service.getAction("GetExternalIPAddress");
 		if(getIP == null || !getIP.postControlAction())
 			return null;
 
 		String rv = (getIP.getOutputArgumentList().getArgument("NewExternalIPAddress")).getValue();
 		// I2P some devices return 0.0.0.0 when not connected
-		if ("0.0.0.0".equals(rv))
+		if ("0.0.0.0".equals(rv) || rv == null || rv.length() <= 0)
 			return null;
 		return rv;
 	}
@@ -407,11 +429,15 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	/**
 	 * @return the reported upstream bit rate in bits per second. -1 if it's not available. Blocking.
 	 */
-	public int getUpstreamMaxBitRate() {
-		if(!isNATPresent() || thinksWeAreDoubleNatted)
-			return -1;
+	private int getUpstreamMaxBitRate() {
+		Service service;
+		synchronized(lock) {
+			if(!isNATPresent() || thinksWeAreDoubleNatted)
+				return -1;
+			service = _service;
+		}
 
-		Action getIP = _service.getAction("GetLinkLayerMaxBitRates");
+		Action getIP = service.getAction("GetLinkLayerMaxBitRates");
 		if(getIP == null || !getIP.postControlAction())
 			return -1;
 
@@ -425,11 +451,15 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	/**
 	 * @return the reported downstream bit rate in bits per second. -1 if it's not available. Blocking.
 	 */
-	public int getDownstreamMaxBitRate() {
-		if(!isNATPresent() || thinksWeAreDoubleNatted)
-			return -1;
+	private int getDownstreamMaxBitRate() {
+		Service service;
+		synchronized(lock) {
+			if(!isNATPresent() || thinksWeAreDoubleNatted)
+				return -1;
+			service = _service;
+		}
 
-		Action getIP = _service.getAction("GetLinkLayerMaxBitRates");
+		Action getIP = service.getAction("GetLinkLayerMaxBitRates");
 		if(getIP == null || !getIP.postControlAction())
 			return -1;
 
@@ -454,7 +484,9 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		sb.append("<ul><small>");
 		for(int i=0; i<table.size(); i++) {
 			StateVariable current = table.getStateVariable(i);
-			sb.append("<li>" + current.getName() + " : \"" + current.getValue() + "\"</li>");
+			sb.append("<li>").append(DataHelper.escapeHTML(current.getName()))
+			  .append(" : \"").append(DataHelper.escapeHTML(current.getValue()))
+			  .append("\"</li>");
 		}
 		sb.append("</small></ul>");
 	}
@@ -466,7 +498,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		for(int i=0; i<ar.size(); i++) {
 			Argument argument = ar.getArgument(i);
 			if(argument == null ) continue;
-			sb.append("<li><small>argument : ").append(argument.getName()).append("</small></li>");
+			sb.append("<li><small>argument : ").append(DataHelper.escapeHTML(argument.getName()))
+			  .append("</small></li>");
 		}
 		sb.append("</ol>");
 	}
@@ -478,7 +511,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		for(int i=0; i<al.size(); i++) {
 			Action action = al.getAction(i);
 			if(action == null ) continue;
-			sb.append("<li>").append(action.getName());
+			sb.append("<li>").append(DataHelper.escapeHTML(action.getName()));
 			listActionsArguments(action, sb);
 			sb.append("</li>");
 		}
@@ -495,6 +528,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	private Service _lastService;
 	private ArgumentList _lastArgumentList;
 	private final Object toStringLock = new Object();
+
 	private String toString(String action, String arg, Service serv) {
 		synchronized(toStringLock) {
 			if ((!action.equals(_lastAction)) ||
@@ -509,7 +543,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				_lastService = serv;
 				_lastArgumentList = getIP.getOutputArgumentList();
 			}
-			return _lastArgumentList.getArgument(arg).getValue();
+			String rv = _lastArgumentList.getArgument(arg).getValue();
+			return DataHelper.escapeHTML(rv);
 		}
 	}
 	
@@ -523,6 +558,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			Service serv = sl.getService(i);
 			if(serv == null) continue;
 			sb.append("<li>").append(_("Service")).append(": ");
+			// NOTE: Group all toString() of common actions together
+			// to avoid excess fetches, since toString() caches.
 			if("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1".equals(serv.getServiceType())){
 				sb.append(_("WAN Common Interface Configuration"));
 				sb.append("<ul><li>").append(_("Status")).append(": ")
@@ -538,6 +575,15 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				sb.append(_("WAN PPP Connection"));
 				sb.append("<ul><li>").append(_("Status")).append(": ")
 				  .append(toString("GetStatusInfo", "NewConnectionStatus", serv));
+				String up = toString("GetStatusInfo", "NewUptime", serv);
+				if (up != null) {
+					try {
+						long uptime = Long.parseLong(up);
+						uptime *= 1000;
+						sb.append("<li>").append(_("Uptime")).append(": ")
+						  .append(DataHelper.formatDuration2(uptime));
+					} catch (NumberFormatException nfe) {}
+				}
 				sb.append("<li>").append(_("Type")).append(": ")
 				  .append(toString("GetConnectionTypeInfo", "NewConnectionType", serv));
 				sb.append("<li>").append(_("Upstream")).append(": ")
@@ -554,8 +600,19 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				  .append("</li>");
 			}else if(WAN_IP_CONNECTION.equals(serv.getServiceType())){
 				sb.append(_("WAN IP Connection"));
-				sb.append("<ul><li>").append(_("Status")).append(": " + toString("GetStatusInfo", "NewConnectionStatus", serv));
-				sb.append("<li>").append(_("Type")).append(": " + toString("GetConnectionTypeInfo", "NewConnectionType", serv));
+				sb.append("<ul><li>").append(_("Status")).append(": ")
+				  .append(toString("GetStatusInfo", "NewConnectionStatus", serv));
+				String up = toString("GetStatusInfo", "NewUptime", serv);
+				if (up != null) {
+					try {
+						long uptime = Long.parseLong(up);
+						uptime *= 1000;
+						sb.append("<li>").append(_("Uptime")).append(": ")
+						  .append(DataHelper.formatDuration2(uptime));
+					} catch (NumberFormatException nfe) {}
+				}
+				sb.append("<li>").append(_("Type")).append(": ")
+				  .append(toString("GetConnectionTypeInfo", "NewConnectionType", serv));
 				sb.append("<li>").append(_("External IP")).append(": ")
 				  .append(toString("GetExternalIPAddress", "NewExternalIPAddress", serv))
 				  .append("</li>");
@@ -564,8 +621,9 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				sb.append("<ul><li>").append(_("Status")).append(": ")
 				  .append(toString("GetEthernetLinkStatus", "NewEthernetLinkStatus", serv))
 				  .append("</li>");
-			}else
-				sb.append("~~~~~~~ "+serv.getServiceType() + "<ul>");
+			} else {
+				sb.append(DataHelper.escapeHTML(serv.getServiceType())).append("<ul>");
+			}
 			if (_context.getBooleanProperty(PROP_ADVANCED)) {
 				sb.append("<li>Actions");
 				listActions(serv, sb);
@@ -583,7 +641,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			sb.append("<p>").append(_("Found Device")).append(": ");
 		else
 			sb.append("<li>").append(_("Subdevice")).append(": ");
-		sb.append(dev.getFriendlyName());
+		sb.append(DataHelper.escapeHTML(dev.getFriendlyName()));
                 if (prefix == null)
 			sb.append("</p>");
 		listSubServices(dev, sb);
@@ -612,8 +670,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				for (Map.Entry<String, String> e : _otherUDNs.entrySet()) {
 					String udn = e.getKey();
 					String name = e.getValue();
-					sb.append("<li>").append(name)
-					  .append("<br>UDN: ").append(udn)
+					sb.append("<li>").append(DataHelper.escapeHTML(name));
+					sb.append("<br>UDN: ").append(DataHelper.escapeHTML(udn))
 					  .append("</li>");
 				}
 				sb.append("</ul>");
@@ -632,7 +690,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		String addr = getNATAddress();
 		sb.append("<p>");
 		if (addr != null)
-		    sb.append(_("The current external IP address reported by UPnP is {0}", addr));
+		    sb.append(_("The current external IP address reported by UPnP is {0}", DataHelper.escapeHTML(addr)));
 		else
 		    sb.append(_("The current external IP address is not available."));
 		int downstreamMaxBitRate = getDownstreamMaxBitRate();
@@ -663,16 +721,20 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	 *  Blocking!
 	 */
 	private boolean addMapping(String protocol, int port, String description, ForwardPort fp) {
-		if(isDisabled || !isNATPresent() || _router == null) {
-                        _log.error("Can't addMapping: " + isDisabled + " " + isNATPresent() + " " + _router);
-			return false;
-                }
+		Service service;
+		synchronized(lock) {
+			if(isDisabled || !isNATPresent() || _router == null) {
+				_log.error("Can't addMapping: " + isDisabled + " " + isNATPresent() + " " + _router);
+				return false;
+			}
+			service = _service;
+		}
 		
 		// Just in case...
                 // this confuses my linksys? - zzz
 		//removeMapping(protocol, port, fp, true);
 		
-		Action add = _service.getAction("AddPortMapping");
+		Action add = service.getAction("AddPortMapping");
 		if(add == null) {
                     if (_serviceLacksAPM) {
 			if (_log.shouldLog(Log.WARN))
@@ -805,15 +867,21 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 
 	/** blocking */
 	private boolean removeMapping(String protocol, int port, ForwardPort fp, boolean noLog) {
-		if(isDisabled || !isNATPresent())
-			return false;
+		Service service;
+		synchronized(lock) {
+			if(isDisabled || !isNATPresent()) {
+				_log.error("Can't removeMapping: " + isDisabled + " " + isNATPresent() + " " + _router);
+				return false;
+			}
+			service = _service;
+		}
 		
-		Action remove = _service.getAction("DeletePortMapping");
+		Action remove = service.getAction("DeletePortMapping");
 		if(remove == null) {
 		    if (_log.shouldLog(Log.WARN))
 			_log.warn("Couldn't find DeletePortMapping action!");
 		    return false;
-	    }
+		}
 		
 		// remove.setArgumentValue("NewRemoteHost", "");
 		remove.setArgumentValue("NewExternalPort", port);
@@ -839,7 +907,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		Set<ForwardPort> portsToDumpNow = null;
 		Set<ForwardPort> portsToForwardNow = null;
 		if (_log.shouldLog(Log.INFO))
-			_log.info("UP&P Forwarding "+ports.size()+" ports...");
+			_log.info("UP&P Forwarding "+ports.size()+" ports...", new Exception());
 		synchronized(lock) {
 			if(forwardCallback != null && forwardCallback != cb && cb != null) {
 				_log.error("ForwardPortCallback changed from "+forwardCallback+" to "+cb+" - using new value, but this is very strange!");
@@ -913,13 +981,15 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		if (_serviceLacksAPM) {
                     if (_log.shouldLog(Log.WARN))
 			_log.warn("UPnP device does not support port forwarding");
+		    Map<ForwardPort, ForwardPortStatus> map =
+			new HashMap<ForwardPort, ForwardPortStatus>(portsToForwardNow.size());
 		    for (ForwardPort port : portsToForwardNow) {
 			ForwardPortStatus fps = new ForwardPortStatus(ForwardPortStatus.DEFINITE_FAILURE,
                                                                       "UPnP device does not support port forwarding",
                                                                       port.portNumber);
-			Map<ForwardPort, ForwardPortStatus> map = Collections.singletonMap(port, fps);
-			forwardCallback.portForwardStatus(map);
+			map.put(port, fps);
 		    }
+		    forwardCallback.portForwardStatus(map);
 		    return;
 		}
 		if (_log.shouldLog(Log.INFO))
@@ -938,6 +1008,8 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		}
 
 		public void run() {
+			Map<ForwardPort, ForwardPortStatus> map =
+				new HashMap<ForwardPort, ForwardPortStatus>(portsToForwardNow.size());
 			for(ForwardPort port : portsToForwardNow) {
 				String proto = protoToString(port.protocol);
 				ForwardPortStatus fps;
@@ -948,13 +1020,9 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 				} else {
 					fps = new ForwardPortStatus(ForwardPortStatus.PROBABLE_FAILURE, "UPnP port forwarding apparently failed", port.portNumber);
 				}
-				Map<ForwardPort, ForwardPortStatus> map = Collections.singletonMap(port, fps);
-				try {
-					forwardCallback.portForwardStatus(map);
-				} catch (Exception e) {
-                                    _log.error("UPnP RPT error", e);
-				}
+				map.put(port, fps);
 			}
+			forwardCallback.portForwardStatus(map);
 		}
 	}
 
@@ -1008,10 +1076,12 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 			System.out.println("Found " + list.size() + " devices!");
 			StringBuilder sb = new StringBuilder();
 			Iterator<Device> it = list.iterator();
+			int i = 0;
 			while(it.hasNext()) {
 				Device device = it.next();
 				upnp.listSubDev(device.toString(), device, sb);
-				System.out.println("Here is the listing for " + device.toString() + " :");
+				System.out.println("Here is the listing for device " + (++i) +
+				                   ' ' + device.getFriendlyName() + " :");
 				System.out.println(sb.toString());
 				sb.setLength(0);
 			}
diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index d7e5544e0baedb3c375d7f439321373d769f0113..a1ad8db3a9569e1c3ad5c03782431d319ec7b1bd 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -13,6 +13,7 @@ import net.i2p.router.RouterContext;
 import static net.i2p.router.transport.Transport.AddressSource.SOURCE_UPNP;
 import net.i2p.util.Addresses;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer2;
 import net.i2p.util.Translate;
 
 import org.cybergarage.util.Debug;
@@ -34,8 +35,12 @@ class UPnPManager {
     private final UPnP _upnp;
     private final UPnPCallback _upnpCallback;
     private volatile boolean _isRunning;
+    private volatile boolean _shouldBeRunning;
+    private volatile long _lastRescan;
+    private volatile boolean _errorLogged;
     private InetAddress _detectedAddress;
     private final TransportManager _manager;
+    private final SimpleTimer2.TimedEvent _rescanner;
     /**
      *  This is the TCP HTTP Event listener
      *  We move these so we don't conflict with other users of the same upnp library
@@ -46,6 +51,12 @@ class UPnPManager {
     /** this is the UDP SSDP Search reply listener */
     private static final String PROP_SSDP_PORT = "i2np.upnp.SSDPPort";
     private static final int DEFAULT_SSDP_PORT = 7653;
+    private static final long RESCAN_MIN_DELAY = 60*1000;
+    private static final long RESCAN_SHORT_DELAY = 2*60*1000;
+    // minimum UPnP announce interval is 30 minutes. Let's be faster
+    // 30 minutes is also the default "lease time" in cybergarage.
+    // It expires after 31 minutes.
+    private static final long RESCAN_LONG_DELAY = 14*60*1000;
 
     public UPnPManager(RouterContext context, TransportManager manager) {
         _context = context;
@@ -60,6 +71,7 @@ class UPnPManager {
         _upnp.setHTTPPort(_context.getProperty(PROP_HTTP_PORT, DEFAULT_HTTP_PORT));
         _upnp.setSSDPPort(_context.getProperty(PROP_SSDP_PORT, DEFAULT_SSDP_PORT));
         _upnpCallback = new UPnPCallback();
+        _rescanner = new Rescanner();
     }
     
     /**
@@ -68,6 +80,7 @@ class UPnPManager {
     public synchronized void start() {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("UPnP Start");
+        _shouldBeRunning = true;
         if (!_isRunning) {
             long b = _context.clock().now();
             try {
@@ -76,10 +89,18 @@ class UPnPManager {
                     _log.info("UPnP runPlugin took " + (_context.clock().now() - b));
             } catch (Exception e) {
                 // NPE in UPnP (ticket #728), can't let it bring us down
-                _log.error("UPnP error, please report", e);
+                if (!_errorLogged) {
+                    _log.error("UPnP error, please report", e);
+                    _errorLogged = true;
+                }
             }
         }
-        if (!_isRunning) {
+        if (_isRunning) {
+            _rescanner.schedule(RESCAN_LONG_DELAY);
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("UPnP Start Done");
+        } else {
+            _rescanner.schedule(RESCAN_SHORT_DELAY);
             // Do we have a non-loopback, non-broadcast address?
             // If not, that's why it failed (HTTPServer won't start)
             if (!Addresses.isConnected())
@@ -90,15 +111,71 @@ class UPnPManager {
     }
 
     /**
-     *  Blocking, may take a while
+     *  Blocking, may take a while, up to 20 seconds
      */
     public synchronized void stop() {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("UPnP Stop");
+        _shouldBeRunning = false;
+        _rescanner.cancel();
         if (_isRunning)
             _upnp.terminate();
         _isRunning = false;
         _detectedAddress = null;
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("UPnP Stop Done");
+    }
+
+    /**
+     *  Call when IP or network connectivity might have changed.
+     *  Starts UPnP if previous start failed, else starts a search.
+     *  Must have called start() first, and not called stop().
+     *
+     *  Should be fast. This only starts the search, the responses
+     *  will come in over the MX time (3 seconds).
+     *
+     *  @since 0.9.18
+     */
+    public synchronized void rescan() {
+        if (!_shouldBeRunning)
+            return;
+        if (_context.router().gracefulShutdownInProgress())
+            return;
+        long now = System.currentTimeMillis();
+        if (_lastRescan + RESCAN_MIN_DELAY > now)
+            return;
+        _lastRescan = now;
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("UPnP Rescan Start");
+        if (_isRunning) {
+            // TODO default search MX (jitter) is 3 seconds... reduce?
+            // See also:
+            // Adaptive Jitter Control for UPnP M-Search
+            // Kevin Mills and Christopher Dabrowski
+            _upnp.search();
+        } else {
+            start();
+        }
+    }
+
+    /**
+     * Initiate a UPnP search
+     *
+     * @since 0.9.18
+     */
+    private class Rescanner extends SimpleTimer2.TimedEvent {
+
+        /** caller must schedule() */
+        public Rescanner() {
+            super(_context.simpleTimer2());
+        }
+
+        public void timeReached() {
+            if (_shouldBeRunning) {
+                rescan();
+                reschedule(_isRunning ? RESCAN_LONG_DELAY : RESCAN_SHORT_DELAY);
+            }
+        }
     }
     
     /**
@@ -192,6 +269,10 @@ class UPnPManager {
         }
     }
 
+    /**
+     *  Warning - blocking, very slow, queries the active router,
+     *  will take many seconds if it has vanished.
+     */
     public String renderStatusHTML() {
         if (!_isRunning)
             return "<h3><a name=\"upnp\"></a>" + _("UPnP is not enabled") + "</h3>\n";
diff --git a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
index 061bbc09e878270a5b16b0fc0ede5424c6d46c10..a30215ce36c5e7987f922c6c7944e96ac5bff30c 100644
--- a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
+++ b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
@@ -62,9 +62,9 @@ public class DHSessionKeyBuilder {
     private final static String PROP_DH_PRECALC_MIN = "crypto.dh.precalc.min";
     private final static String PROP_DH_PRECALC_MAX = "crypto.dh.precalc.max";
     private final static String PROP_DH_PRECALC_DELAY = "crypto.dh.precalc.delay";
-    private final static int DEFAULT_DH_PRECALC_MIN = 15;
-    private final static int DEFAULT_DH_PRECALC_MAX = 40;
-    private final static int DEFAULT_DH_PRECALC_DELAY = 200;
+    private final static int DEFAULT_DH_PRECALC_MIN = 20;
+    private final static int DEFAULT_DH_PRECALC_MAX = 60;
+    private final static int DEFAULT_DH_PRECALC_DELAY = 25;
 
     /**
      * Create a new public/private value pair for the DH exchange.
@@ -429,6 +429,12 @@ public class DHSessionKeyBuilder {
         public void returnUnused(DHSessionKeyBuilder builder);
     }
 
+    /**
+     *  Try to keep DH pairs at the ready.
+     *  It's important to do this in a separate thread, because if we run out,
+     *  the pairs are generated in the NTCP Pumper thread,
+     *  and it can fall behind.
+     */
     public static class PrecalcRunner extends I2PThread implements Factory {
         private final I2PAppContext _context;
         private final Log _log;
@@ -438,8 +444,8 @@ public class DHSessionKeyBuilder {
         private final LinkedBlockingQueue<DHSessionKeyBuilder> _builders;
         private volatile boolean _isRunning;
 
-        /** check every 30 seconds whether we have less than the minimum */
-        private long _checkDelay = 30 * 1000;
+        /** check periodically whether we have less than the minimum */
+        private long _checkDelay = 10 * 1000;
 
         public PrecalcRunner(I2PAppContext ctx) {
             super("DH Precalc");
@@ -499,7 +505,7 @@ public class DHSessionKeyBuilder {
                         long curCalc = System.currentTimeMillis() - curStart;
                         // for some relief...
                         try {
-                            Thread.sleep(_calcDelay + (curCalc * 3));
+                            Thread.sleep(Math.min(200, Math.max(10, _calcDelay + (curCalc * 3))));
                         } catch (InterruptedException ie) { // nop
                         }
                     }
diff --git a/router/java/src/net/i2p/router/transport/crypto/package.html b/router/java/src/net/i2p/router/transport/crypto/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..6c4a94d2e74df783ba3f4df5e5026b3d8fe404e5
--- /dev/null
+++ b/router/java/src/net/i2p/router/transport/crypto/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+DH key generation.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
index c7684993d12cee923fcabe8533bfddc368375227..e53d9666699a45c261592a6c9d027c529224a12a 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
@@ -849,8 +849,8 @@ class EstablishState {
                     _log.debug(prefix()+"Clock skew: " + diff + " ms");
                 }
 
-                sendInboundConfirm(_aliceIdent, tsA);
                 _con.setRemotePeer(_aliceIdent);
+                sendInboundConfirm(_aliceIdent, tsA);
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug(prefix()+"e_bobSig is " + _e_bobSig.length + " bytes long");
                 byte iv[] = _curEncrypted;  // reuse buf
diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
index b6f539c962c014db3e417a0caeedae749f4cc170..fbe8a9763391b56cca1e11f2095d2a98390bc644 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
@@ -1,6 +1,7 @@
 package net.i2p.router.transport.ntcp;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
@@ -20,6 +21,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import net.i2p.I2PAppContext;
+import net.i2p.data.ByteArray;
 import net.i2p.data.router.RouterAddress;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.router.CommSystemFacade;
@@ -29,6 +31,7 @@ import net.i2p.util.Addresses;
 import net.i2p.util.ConcurrentHashSet;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
+import net.i2p.util.ObjectCounter;
 import net.i2p.util.SystemVersion;
 
 /**
@@ -47,6 +50,7 @@ class EventPumper implements Runnable {
     private final Queue<ServerSocketChannel> _wantsRegister = new ConcurrentLinkedQueue<ServerSocketChannel>();
     private final Queue<NTCPConnection> _wantsConRegister = new ConcurrentLinkedQueue<NTCPConnection>();
     private final NTCPTransport _transport;
+    private final ObjectCounter<ByteArray> _blockedIPs;
     private long _expireIdleWriteTime;
     private boolean _useDirect;
     
@@ -75,6 +79,7 @@ class EventPumper implements Runnable {
      */
     private static final long FAILSAFE_ITERATION_FREQ = 2*1000l;
     private static final long SELECTOR_LOOP_DELAY = 200;
+    private static final long BLOCKED_IP_FREQ = 3*60*1000;
 
     /** tunnel test now disabled, but this should be long enough to allow an active tunnel to get started */
     private static final long MIN_EXPIRE_IDLE_TIME = 135*1000l;
@@ -100,11 +105,13 @@ class EventPumper implements Runnable {
         _log = ctx.logManager().getLog(getClass());
         _transport = transport;
         _expireIdleWriteTime = MAX_EXPIRE_IDLE_TIME;
+        _blockedIPs = new ObjectCounter<ByteArray>();
         _context.statManager().createRateStat("ntcp.pumperKeySetSize", "", "ntcp", new long[] {10*60*1000} );
         //_context.statManager().createRateStat("ntcp.pumperKeysPerLoop", "", "ntcp", new long[] {10*60*1000} );
         _context.statManager().createRateStat("ntcp.pumperLoopsPerSecond", "", "ntcp", new long[] {10*60*1000} );
         _context.statManager().createRateStat("ntcp.zeroRead", "", "ntcp", new long[] {10*60*1000} );
         _context.statManager().createRateStat("ntcp.zeroReadDrop", "", "ntcp", new long[] {10*60*1000} );
+        _context.statManager().createRateStat("ntcp.dropInboundNoMessage", "", "ntcp", new long[] {10*60*1000} );
     }
     
     public synchronized void startPumping() {
@@ -165,6 +172,7 @@ class EventPumper implements Runnable {
     public void run() {
         int loopCount = 0;
         long lastFailsafeIteration = System.currentTimeMillis();
+        long lastBlockedIPClear = lastFailsafeIteration;
         while (_alive && _selector.isOpen()) {
             try {
                 loopCount++;
@@ -194,12 +202,13 @@ class EventPumper implements Runnable {
 		    continue;
 		}
                 
-                if (lastFailsafeIteration + FAILSAFE_ITERATION_FREQ < System.currentTimeMillis()) {
+                long now = System.currentTimeMillis();
+                if (lastFailsafeIteration + FAILSAFE_ITERATION_FREQ < now) {
                     // in the *cough* unthinkable possibility that there are bugs in
                     // the code, lets periodically pass over all NTCP connections and
                     // make sure that anything which should be able to write has been
                     // properly marked as such, etc
-                    lastFailsafeIteration = System.currentTimeMillis();
+                    lastFailsafeIteration = now;
                     try {
                         Set<SelectionKey> all = _selector.keys();
                         _context.statManager().addRateData("ntcp.pumperKeySetSize", all.size());
@@ -254,6 +263,8 @@ class EventPumper implements Runnable {
                                     // the data queued to be sent has already passed through
                                     // the bw limiter and really just wants to get shoved
                                     // out the door asap.
+                                    if (_log.shouldLog(Log.INFO))
+                                        _log.info("Failsafe write for " + con);
                                     key.interestOps(SelectionKey.OP_WRITE | key.interestOps());
                                     failsafeWrites++;
                                 }
@@ -277,7 +288,24 @@ class EventPumper implements Runnable {
                     } catch (ClosedSelectorException cse) {
                         continue;
                     }
+                } else {
+                    // another 100% CPU workaround 
+                    if ((loopCount % 512) == 511) {
+                        if (_log.shouldLog(Log.INFO))
+                            _log.info("EventPumper throttle " + loopCount + " loops in " +
+                                      (now - lastFailsafeIteration) + " ms");
+                        _context.statManager().addRateData("ntcp.failsafeThrottle", 1);
+                        try {
+                            Thread.sleep(25);
+                        } catch (InterruptedException ie) {}
+                    }
+                }
+                if (lastBlockedIPClear + BLOCKED_IP_FREQ < now) {
+                    _blockedIPs.clear();
+                    lastBlockedIPClear = now;
                 }
+
+
                 // Clear the cache if the user changes the setting,
                 // so we can test the effect.
                 boolean newUseDirect = _context.getBooleanProperty(PROP_DIRECT);
@@ -496,7 +524,8 @@ class EventPumper implements Runnable {
                 return;
             }
 
-            if (_context.blocklist().isBlocklisted(chan.socket().getInetAddress().getAddress())) {
+            byte[] ip = chan.socket().getInetAddress().getAddress();
+            if (_context.blocklist().isBlocklisted(ip)) {
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Receive session request from blocklisted IP: " + chan.socket().getInetAddress());
                 // need to add this stat first
@@ -504,6 +533,18 @@ class EventPumper implements Runnable {
                 try { chan.close(); } catch (IOException ioe) { }
                 return;
             }
+
+            ByteArray ba = new ByteArray(ip);
+            int count = _blockedIPs.count(ba);
+            if (count > 0) {
+                count = _blockedIPs.increment(ba);
+                if (_log.shouldLog(Log.WARN))
+                   _log.warn("Blocking accept of IP with count " + count + ": " + Addresses.toString(ip));
+                _context.statManager().addRateData("ntcp.dropInboundNoMessage", count);
+                try { chan.close(); } catch (IOException ioe) { }
+                return;
+            }
+
             // BUGFIX for firewalls. --Sponge
             if (_context.commSystem().getReachabilityStatus() != CommSystemFacade.STATUS_OK)
                 chan.socket().setKeepAlive(true);
@@ -560,9 +601,27 @@ class EventPumper implements Runnable {
         ByteBuffer buf = acquireBuf();
         try {
             int read = con.getChannel().read(buf);
-            if (read == -1) {
-                //if (_log.shouldLog(Log.DEBUG)) _log.debug("EOF on " + con);
+            if (read < 0) {
                 //_context.statManager().addRateData("ntcp.readEOF", 1);
+                if (con.isInbound() && con.getMessagesReceived() <= 0) {
+                    InetAddress addr = con.getChannel().socket().getInetAddress();
+                    int count;
+                    if (addr != null) {
+                        byte[] ip = addr.getAddress();
+                        ByteArray ba = new ByteArray(ip);
+                        count = _blockedIPs.increment(ba);
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Blocking IP " + Addresses.toString(ip) + " with count " + count + ": " + con);
+                    } else {
+                        count = 1;
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("EOF on inbound before receiving any: " + con);
+                    }
+                    _context.statManager().addRateData("ntcp.dropInboundNoMessage", count);
+                } else {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("EOF on " + con);
+                }
                 con.close();
                 releaseBuf(buf);
             } else if (read == 0) {
@@ -583,7 +642,7 @@ class EventPumper implements Runnable {
                     if (_log.shouldLog(Log.INFO))
                         _log.info("nothing to read for " + con + ", but stay interested");
                 }
-            } else if (read > 0) {
+            } else {
                 // clear counter for workaround above
                 con.clearZeroRead();
                 // ZERO COPY. The buffer will be returned in Reader.processRead()
@@ -614,8 +673,25 @@ class EventPumper implements Runnable {
         } catch (IOException ioe) {
             // common, esp. at outbound connect time
             releaseBuf(buf);
-            if (_log.shouldLog(Log.INFO))
-                _log.info("error reading on " + con, ioe);
+            if (con.isInbound() && con.getMessagesReceived() <= 0) {
+                InetAddress addr = con.getChannel().socket().getInetAddress();
+                int count;
+                if (addr != null) {
+                    byte[] ip = addr.getAddress();
+                    ByteArray ba = new ByteArray(ip);
+                    count = _blockedIPs.increment(ba);
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("Blocking IP " + Addresses.toString(ip) + " with count " + count + ": " + con);
+                } else {
+                    count = 1;
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("IOE on inbound before receiving any: " + con);
+                }
+                _context.statManager().addRateData("ntcp.dropInboundNoMessage", count);
+            } else {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("error reading on " + con, ioe);
+            }
             if (con.isEstablished()) {
                 _context.statManager().addRateData("ntcp.readError", 1);
             } else {
@@ -726,6 +802,8 @@ class EventPumper implements Runnable {
                 key.interestOps(key.interestOps() | SelectionKey.OP_READ);
             } catch (CancelledKeyException cke) {
                 // ignore, we remove/etc elsewhere
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("RDE CKE 1", cke);
             } catch (IllegalArgumentException iae) {
                 // JamVM (Gentoo: jamvm-1.5.4, gnu-classpath-0.98+gmp)
                 // throws
@@ -756,6 +834,8 @@ class EventPumper implements Runnable {
                 try {
                     key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
                 } catch (CancelledKeyException cke) {
+                   if (_log.shouldLog(Log.WARN))
+                       _log.warn("RDE CKE 2", cke);
                     // ignore
                 } catch (IllegalArgumentException iae) {
                     // see above
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
index a9752a286250a2ec406c749c25aed8f71257b184..662dc8afcc5a7ae55658b6d56c8782b06ac43168 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
@@ -12,6 +12,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.Adler32;
 
 import net.i2p.data.Base64;
@@ -113,8 +114,8 @@ class NTCPConnection {
     private byte _prevWriteEnd[];
     /** current partially read I2NP message */
     private final ReadState _curReadState;
-    private long _messagesRead;
-    private long _messagesWritten;
+    private final AtomicLong _messagesRead = new AtomicLong();
+    private final AtomicLong _messagesWritten = new AtomicLong();
     private long _lastSendTime;
     private long _lastReceiveTime;
     private long _lastRateUpdated;
@@ -161,6 +162,8 @@ class NTCPConnection {
 
     private static final int INFO_PRIORITY = OutNetMessage.PRIORITY_MY_NETDB_STORE_LOW;
     private static final String FIXED_RI_VERSION = "0.9.12";
+    private static final AtomicLong __connID = new AtomicLong();
+    private final long _connID = __connID.incrementAndGet();
     
     /**
      * Create an inbound connected (though not established) NTCP connection
@@ -285,6 +288,7 @@ class NTCPConnection {
      *                  be under 1 minute)
      * @param prevWriteEnd exactly 16 bytes, not copied, do not corrupt
      * @param prevReadEnd 16 or more bytes, last 16 bytes copied
+     * @return old conn to be closed by caller, or null
      */
     private synchronized NTCPConnection locked_finishInboundEstablishment(
             SessionKey key, long clockSkew, byte prevWriteEnd[], byte prevReadEnd[]) {
@@ -313,9 +317,9 @@ class NTCPConnection {
             return System.currentTimeMillis()-_establishedOn; 
     }
 
-    public long getMessagesSent() { return _messagesWritten; }
+    public long getMessagesSent() { return _messagesWritten.get(); }
 
-    public long getMessagesReceived() { return _messagesRead; }
+    public long getMessagesReceived() { return _messagesRead.get(); }
 
     public long getOutboundQueueSize() {
             int queued;
@@ -390,6 +394,9 @@ class NTCPConnection {
         es.close(cause, e);
     }
 
+    /**
+     * @return a second connection with the same peer...
+     */
     private synchronized NTCPConnection locked_close(boolean allowRequeue) {
         if (_chan != null) try { _chan.close(); } catch (IOException ioe) { }
         if (_conKey != null) _conKey.cancel();
@@ -1070,7 +1077,7 @@ class NTCPConnection {
                               + msg.getLifetime()
                               + " with " + buf.capacity() + " bytes (uid=" + System.identityHashCode(msg)+" on " + toString() + ")");
                 }
-                _messagesWritten++;
+                _messagesWritten.incrementAndGet();
                 _transport.sendComplete(msg);
             }
         } else {
@@ -1183,7 +1190,8 @@ class NTCPConnection {
                 //    _log.debug("parse decrypted i2np block (remaining: " + buf.remaining() + ")");
                 boolean ok = recvUnencryptedI2NP();
                 if (!ok) {
-                    _log.error("Read buffer " + System.identityHashCode(buf) + " contained corrupt data");
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info("Read buffer " + System.identityHashCode(buf) + " contained corrupt data");
                     _context.statManager().addRateData("ntcp.corruptDecryptedI2NP", 1);
                     return;
                 }
@@ -1231,7 +1239,8 @@ class NTCPConnection {
             }
             boolean ok = recvUnencryptedI2NP();
             if (!ok) {
-                _log.error("Read buffer " + System.identityHashCode(buf) + " contained corrupt data");
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Read buffer " + System.identityHashCode(buf) + " contained corrupt data");
                 _context.statManager().addRateData("ntcp.corruptDecryptedI2NP", 1);
                 return;
             }
@@ -1250,7 +1259,8 @@ class NTCPConnection {
         _curReadState.receiveBlock(_decryptBlockBuf);
         // FIXME move check to ReadState; must we close? possible attack vector?
         if (_curReadState.getSize() > BUFFER_SIZE) {
-            _log.error("I2NP message too big - size: " + _curReadState.getSize() + " Dropping " + toString());
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("I2NP message too big - size: " + _curReadState.getSize() + " Dropping " + toString());
             _context.statManager().addRateData("ntcp.corruptTooLargeI2NP", _curReadState.getSize());
             close();
             return false;
@@ -1514,7 +1524,7 @@ class NTCPConnection {
                     if (read != null) {
                         _transport.messageReceived(read, _remotePeer, null, timeToRecv, _size);
                         _lastReceiveTime = System.currentTimeMillis();
-                        _messagesRead++;
+                        _messagesRead.incrementAndGet();
                     }
                 } catch (I2NPMessageException ime) {
                     if (_log.shouldLog(Log.WARN)) {
@@ -1547,7 +1557,8 @@ class NTCPConnection {
     @Override
     public String toString() {
         return "NTCP conn " +
-               (_isInbound ? "from " : "to ") +
+               _connID +
+               (_isInbound ? " from " : " to ") +
                (_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) +
                (isEstablished() ? "" : " not established") +
                " created " + DataHelper.formatDuration(getTimeSinceCreated()) + " ago," +
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
index b48dab09023de79d21bae22d9592661575109a56..01ef417a060728c30b93820d73de5a1b4f8df81d 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -106,7 +106,7 @@ public class NTCPTransport extends TransportImpl {
     /**
      *  RI sigtypes supported in 0.9.16
      */
-    private static final String MIN_SIGTYPE_VERSION = "0.9.16";
+    public static final String MIN_SIGTYPE_VERSION = "0.9.16";
 
 
     public NTCPTransport(RouterContext ctx, DHSessionKeyBuilder.Factory dh) {
@@ -122,6 +122,7 @@ public class NTCPTransport extends TransportImpl {
         _context.statManager().createRateStat("ntcp.failsafeWrites", "How many times do we need to proactively add in an extra nio write to a peer at any given failsafe pass?", "ntcp", RATES);
         _context.statManager().createRateStat("ntcp.failsafeCloses", "How many times do we need to proactively close an idle connection to a peer at any given failsafe pass?", "ntcp", RATES);
         _context.statManager().createRateStat("ntcp.failsafeInvalid", "How many times do we close a connection to a peer to work around a JVM bug?", "ntcp", RATES);
+        _context.statManager().createRateStat("ntcp.failsafeThrottle", "Delay event pumper", "ntcp", RATES);
         _context.statManager().createRateStat("ntcp.accept", "", "ntcp", RATES);
         _context.statManager().createRateStat("ntcp.attemptBanlistedPeer", "", "ntcp", RATES);
         _context.statManager().createRateStat("ntcp.attemptUnreachablePeer", "", "ntcp", RATES);
@@ -198,15 +199,16 @@ public class NTCPTransport extends TransportImpl {
 
     /**
      * @param con that is established
-     * @return the previous connection to the same peer, null if no such.
+     * @return the previous connection to the same peer, must be closed by caller, null if no such.
      */
     NTCPConnection inboundEstablished(NTCPConnection con) {
         _context.statManager().addRateData("ntcp.inboundEstablished", 1);
-        markReachable(con.getRemotePeer().calculateHash(), true);
+        Hash peer = con.getRemotePeer().calculateHash();
+        markReachable(peer, true);
         //_context.banlist().unbanlistRouter(con.getRemotePeer().calculateHash());
         NTCPConnection old;
         synchronized (_conLock) {
-            old = _conByIdent.put(con.getRemotePeer().calculateHash(), con);
+            old = _conByIdent.put(peer, con);
         }
         return old;
     }
@@ -245,7 +247,8 @@ public class NTCPTransport extends TransportImpl {
                 return;
             }
             if (isNew) {
-                con.send(msg); // doesn't do anything yet, just enqueues it
+                // doesn't do anything yet, just enqueues it
+                con.send(msg);
                 // As of 0.9.12, don't send our info if the first message is
                 // doing the same (common when connecting to a floodfill).
                 // Also, put the info message after whatever we are trying to send
@@ -475,6 +478,9 @@ public class NTCPTransport extends TransportImpl {
             return (con != null) && con.isEstablished() && con.tooBacklogged();
     }
 
+    /**
+     * @return usually the con passed in, but possibly a second connection with the same peer...
+     */
     NTCPConnection removeCon(NTCPConnection con) {
         NTCPConnection removed = null;
         RouterIdentity ident = con.getRemotePeer();
diff --git a/router/java/src/net/i2p/router/transport/udp/ACKSender.java b/router/java/src/net/i2p/router/transport/udp/ACKSender.java
index f2ca91fc85ba1b0558adcdd5ac6a938a7e60642a..a94572ace35d58f1cc6462986e7fca3138ecb7fd 100644
--- a/router/java/src/net/i2p/router/transport/udp/ACKSender.java
+++ b/router/java/src/net/i2p/router/transport/udp/ACKSender.java
@@ -28,7 +28,7 @@ class ACKSender implements Runnable {
     private static final long POISON_PS = -9999999999l;
     
     /** how frequently do we want to send ACKs to a peer? */
-    static final int ACK_FREQUENCY = 350;
+    static final int ACK_FREQUENCY = 250;
     
     public ACKSender(RouterContext ctx, UDPTransport transport) {
         _context = ctx;
diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
index 951f0c192d9055e701fc4014d0878b9e42b22d5f..6a0b41253383f549a9beb8871e3579dd44339b44 100644
--- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
@@ -3,6 +3,7 @@ package net.i2p.router.transport.udp;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -140,8 +141,9 @@ class IntroductionManager {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("removing peer " + peer.getRemoteHostId() + ", weRelayToThemAs " 
                        + peer.getWeRelayToThemAs() + ", theyRelayToUsAs " + peer.getTheyRelayToUsAs());
-        if (peer.getWeRelayToThemAs() > 0) 
-            _outbound.remove(Long.valueOf(peer.getWeRelayToThemAs()));
+        long id = peer.getWeRelayToThemAs(); 
+        if (id > 0) 
+            _outbound.remove(Long.valueOf(id));
         if (peer.getTheyRelayToUsAs() > 0) {
             _inbound.remove(peer);
         }
@@ -176,6 +178,7 @@ class IntroductionManager {
         // if not too many to choose from, be less picky
         if (sz <= howMany + 2)
             inactivityCutoff -= UDPTransport.EXPIRE_TIMEOUT / 4;
+        List<Introducer> introducers = new ArrayList<Introducer>(howMany);
         for (int i = 0; i < sz && found < howMany; i++) {
             PeerState cur = peers.get((start + i) % sz);
             RouterInfo ri = _context.netDb().lookupRouterInfoLocally(cur.getRemotePeer());
@@ -222,19 +225,45 @@ class IntroductionManager {
             byte[] ikey = ura.getIntroKey();
             if (ikey == null)
                 continue;
-            ssuOptions.setProperty(UDPAddress.PROP_INTRO_HOST_PREFIX + found, Addresses.toString(ip));
-            ssuOptions.setProperty(UDPAddress.PROP_INTRO_PORT_PREFIX + found, String.valueOf(port));
-            ssuOptions.setProperty(UDPAddress.PROP_INTRO_KEY_PREFIX + found, Base64.encode(ikey));
-            ssuOptions.setProperty(UDPAddress.PROP_INTRO_TAG_PREFIX + found, String.valueOf(cur.getTheyRelayToUsAs()));
+            introducers.add(new Introducer(ip, port, ikey, cur.getTheyRelayToUsAs()));
             found++;
         }
 
+        // we sort them so a change in order only won't happen, and won't cause a republish
+        Collections.sort(introducers);
+        for (int i = 0; i < found; i++) {
+            Introducer in = introducers.get(i);
+            ssuOptions.setProperty(UDPAddress.PROP_INTRO_HOST_PREFIX + i, in.sip);
+            ssuOptions.setProperty(UDPAddress.PROP_INTRO_PORT_PREFIX + i, in.sport);
+            ssuOptions.setProperty(UDPAddress.PROP_INTRO_KEY_PREFIX + i, in.skey);
+            ssuOptions.setProperty(UDPAddress.PROP_INTRO_TAG_PREFIX + i, in.stag);
+        }
+
         // FIXME failsafe if found == 0, relax inactivityCutoff and try again?
 
         pingIntroducers();
         return found;
     }
 
+    /**
+     *  So we can sort them
+     *  @since 0.9.18
+     */
+    private static class Introducer implements Comparable<Introducer> {
+        public final String sip, sport, skey, stag;
+
+        public Introducer(byte[] ip, int port, byte[] key, long tag) {
+            sip = Addresses.toString(ip);
+            sport = String.valueOf(port);
+            skey = Base64.encode(key);
+            stag = String.valueOf(tag);
+        }
+
+        public int compareTo(Introducer i) {
+            return skey.compareTo(i.skey);
+        }
+    }
+
     /**
      *  Was part of pickInbound(), moved out so we can call it more often
      *  @since 0.8.11
@@ -278,6 +307,9 @@ class IntroductionManager {
      *  Send a HolePunch to Alice, who will soon be sending us a RelayRequest.
      *  We should already have a session with Bob, but probably not with Alice.
      *
+     *  If we don't have a session with Bob, we removed the relay tag from
+     *  our _outbound table, so this won't work.
+     *
      *  We do some throttling here.
      */
     void receiveRelayIntro(RemoteHostId bob, UDPPacketReader reader) {
@@ -404,7 +436,7 @@ class IntroductionManager {
             if (_log.shouldLog(Log.INFO))
                 _log.info("Receive relay request from " + alice 
                       + " with unknown tag");
-            _context.statManager().addRateData("udp.receiveRelayRequestBadTag", 1, 0);
+            _context.statManager().addRateData("udp.receiveRelayRequestBadTag", 1);
             return;
         }
         if (_log.shouldLog(Log.INFO))
@@ -414,7 +446,7 @@ class IntroductionManager {
 
         // TODO throttle based on alice identity and/or intro tag?
 
-        _context.statManager().addRateData("udp.receiveRelayRequest", 1, 0);
+        _context.statManager().addRateData("udp.receiveRelayRequest", 1);
 
         // send that peer an introduction for alice
         _transport.send(_builder.buildRelayIntro(alice, charlie, reader.getRelayRequestReader()));
diff --git a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java
index 74dba836b2674964a8f5b92752da6cc227b2cb4b..01bca49abed87c32db826e4dbfd11c9b0734f070 100644
--- a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java
+++ b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java
@@ -225,7 +225,9 @@ class MessageReceiver {
             _context.messageHistory().droppedInboundMessage(state.getMessageId(), state.getFrom(), "error: " + ime.toString() + ": " + state.toString());
             return null;
         } catch (Exception e) {
-            _log.log(Log.CRIT, "Error dealing with a message: " + state, e);
+            // e.g. AIOOBE
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error handling a message: " + state, e);
             _context.messageHistory().droppedInboundMessage(state.getMessageId(), state.getFrom(), "error: " + e.toString() + ": " + state.toString());
             return null;
         } finally {
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
index 64a96dcf044f4c59c291c3b388f590a2b6d8e54e..8fb465aead9964ed9ab899e543a5dacad7c2a9d6 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
@@ -16,6 +16,7 @@ import net.i2p.data.Hash;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.data.SessionKey;
 import net.i2p.data.Signature;
+import net.i2p.router.transport.TransportUtil;
 import net.i2p.util.Addresses;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleByteCache;
@@ -1222,7 +1223,7 @@ class PacketBuilder {
             byte ikey[] = addr.getIntroducerKey(i);
             long tag = addr.getIntroducerTag(i);
             // let's not use an introducer on a privileged port, sounds like trouble
-            if (ikey == null || iport < 1024 || iport > 65535 ||
+            if (ikey == null || !TransportUtil.isValidPort(iport) ||
                 iaddr == null || tag <= 0 ||
                 // must be IPv4 for now as we don't send Alice IP/port, see below
                 iaddr.getAddress().length != 4 ||
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
index 206e9c44f7aea9964f813d7fcd9b7ba0c8ae73d4..8d812852fafa3e4a64896dec3844b296ba7d3400 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
@@ -47,6 +47,7 @@ class PacketHandler {
     private static final int MAX_NUM_HANDLERS = 1;
     /** let packets be up to 30s slow */
     private static final long GRACE_PERIOD = Router.CLOCK_FUDGE_FACTOR + 30*1000;
+    private static final long MAX_SKEW = 90*24*60*60*1000L;
     
     private enum AuthType { NONE, INTRO, BOBINTRO, SESSION }
 
@@ -610,17 +611,21 @@ class PacketHandler {
             long recvOn = packet.getBegin();
             long sendOn = reader.readTimestamp() * 1000;
             long skew = recvOn - sendOn;
+            int type = reader.readPayloadType();
+            // if it's a bad type, the whole packet is probably corrupt
+            boolean typeOK = type <= UDPPacket.MAX_PAYLOAD_TYPE;
+            boolean skewOK = skew < MAX_SKEW && skew > (0 - MAX_SKEW) && typeOK;
 
             // update skew whether or not we will be dropping the packet for excessive skew
             if (state != null) {
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Received packet from " + state.getRemoteHostId().toString() + " with skew " + skew);
-                if (auth == AuthType.SESSION)
+                if (auth == AuthType.SESSION && typeOK && (skewOK || state.getMessagesReceived() <= 0))
                     state.adjustClockSkew(skew);
             }
-            _context.statManager().addRateData("udp.receivePacketSkew", skew, packet.getLifetime());
+            _context.statManager().addRateData("udp.receivePacketSkew", skew);
 
-            if (!_context.clock().getUpdatedSuccessfully()) {
+            if (skewOK && !_context.clock().getUpdatedSuccessfully()) {
                 // adjust the clock one time in desperation
                 // this doesn't seem to work for big skews, we never get anything back,
                 // so we have to wait for NTCP to do it
@@ -648,7 +653,6 @@ class PacketHandler {
             RemoteHostId from = packet.getRemoteHost();
             _state = 46;
             
-            int type = reader.readPayloadType();
             switch (type) {
                 case UDPPacket.PAYLOAD_TYPE_SESSION_REQUEST:
                     _state = 47;
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java
index 37cde0c8e6677d6cc980c3e317858535178e4e29..b3c8d86b60dedc3cdb06e81ebcdb7b0559128664 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -761,6 +761,8 @@ class PeerState {
     
     /** we received the message specified completely */
     public void messageFullyReceived(Long messageId, int bytes) { messageFullyReceived(messageId, bytes, false); }
+
+    /** FIXME synch */
     public void messageFullyReceived(Long messageId, int bytes, boolean isForACK) {
         if (bytes > 0) {
             _receiveBytes += bytes;
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
index 211554f8b2b4185e2d385961ea54e0f074e9b116..3fd6432b44d1aba0912ec675b6d90d119bde11d6 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
@@ -345,8 +345,8 @@ class PeerTestManager {
                 if (test.getAlicePortFromCharlie() > 0)
                     testComplete(false);
             } catch (UnknownHostException uhe) {
-                if (_log.shouldLog(Log.ERROR))
-                    _log.error("Unable to get our IP (length " + ipSize +
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Unable to get our IP (length " + ipSize +
                                ") from bob's reply: " + from + ", " + testInfo, uhe);
                 _context.statManager().addRateData("udp.testBadIP", 1);
             }
diff --git a/router/java/src/net/i2p/router/transport/udp/Sorters.java b/router/java/src/net/i2p/router/transport/udp/Sorters.java
new file mode 100644
index 0000000000000000000000000000000000000000..21ea5ec7aff8b171e8aeb5e26315ffd4ffa314be
--- /dev/null
+++ b/router/java/src/net/i2p/router/transport/udp/Sorters.java
@@ -0,0 +1,304 @@
+package net.i2p.router.transport.udp;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Comparator;
+
+import net.i2p.data.DataHelper;
+
+/**
+ *  Comparators for various columns
+ *
+ *  @since 0.9.18 moved from UDPTransport
+ */
+class Sorters {
+
+    static final int FLAG_ALPHA = 0;
+    static final int FLAG_IDLE_IN = 1;
+    static final int FLAG_IDLE_OUT = 2;
+    static final int FLAG_RATE_IN = 3;
+    static final int FLAG_RATE_OUT = 4;
+    static final int FLAG_SKEW = 5;
+    static final int FLAG_CWND= 6;
+    static final int FLAG_SSTHRESH = 7;
+    static final int FLAG_RTT = 8;
+    // static final int FLAG_DEV = 9;
+    static final int FLAG_RTO = 10;
+    static final int FLAG_MTU = 11;
+    static final int FLAG_SEND = 12;
+    static final int FLAG_RECV = 13;
+    static final int FLAG_RESEND = 14;
+    static final int FLAG_DUP = 15;
+    static final int FLAG_UPTIME = 16;
+    static final int FLAG_DEBUG = 99;
+    
+    static Comparator<PeerState> getComparator(int sortFlags) {
+        Comparator<PeerState> rv;
+        switch (Math.abs(sortFlags)) {
+            case FLAG_IDLE_IN:
+                rv = new IdleInComparator();
+                break;
+            case FLAG_IDLE_OUT:
+                rv = new IdleOutComparator();
+                break;
+            case FLAG_RATE_IN:
+                rv = new RateInComparator();
+                break;
+            case FLAG_RATE_OUT:
+                rv = new RateOutComparator();
+                break;
+            case FLAG_UPTIME:
+                rv = new UptimeComparator();
+                break;
+            case FLAG_SKEW:
+                rv = new SkewComparator();
+                break;
+            case FLAG_CWND:
+                rv = new CwndComparator();
+                break;
+            case FLAG_SSTHRESH:
+                rv = new SsthreshComparator();
+                break;
+            case FLAG_RTT:
+                rv = new RTTComparator();
+                break;
+            //case FLAG_DEV:
+            //    rv = new DevComparator();
+            //    break;
+            case FLAG_RTO:
+                rv = new RTOComparator();
+                break;
+            case FLAG_MTU:
+                rv = new MTUComparator();
+                break;
+            case FLAG_SEND:
+                rv = new SendCountComparator();
+                break;
+            case FLAG_RECV:
+                rv = new RecvCountComparator();
+                break;
+            case FLAG_RESEND:
+                rv = new ResendComparator();
+                break;
+            case FLAG_DUP:
+                rv = new DupComparator();
+                break;
+            case FLAG_ALPHA:
+            default:
+                rv = new AlphaComparator();
+                break;
+        }
+        if (sortFlags < 0)
+            rv = Collections.reverseOrder(rv);
+        return rv;
+    }
+
+    static class AlphaComparator extends PeerComparator {
+    }
+
+    static class IdleInComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = r.getLastReceiveTime() - l.getLastReceiveTime();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class IdleOutComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = r.getLastSendTime() - l.getLastSendTime();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class RateInComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getReceiveBps() - r.getReceiveBps();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class RateOutComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getSendBps() - r.getSendBps();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class UptimeComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = r.getKeyEstablishedTime() - l.getKeyEstablishedTime();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class SkewComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = Math.abs(l.getClockSkew()) - Math.abs(r.getClockSkew());
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class CwndComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getSendWindowBytes() - r.getSendWindowBytes();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class SsthreshComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getSlowStartThreshold() - r.getSlowStartThreshold();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class RTTComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getRTT() - r.getRTT();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+ /***
+    static class DevComparator extends PeerComparator {
+        static final DevComparator _instance = new DevComparator();
+        public static final DevComparator instance() { return _instance; }
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = l.getRTTDeviation() - r.getRTTDeviation();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+  ****/
+
+    /** */
+    static class RTOComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getRTO() - r.getRTO();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class MTUComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            int rv = l.getMTU() - r.getMTU();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return rv;
+        }
+    }
+
+    static class SendCountComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = l.getPacketsTransmitted() - r.getPacketsTransmitted();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class RecvCountComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = l.getPacketsReceived() - r.getPacketsReceived();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class ResendComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = l.getPacketsRetransmitted() - r.getPacketsRetransmitted();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+
+    static class DupComparator extends PeerComparator {
+        @Override
+        public int compare(PeerState l, PeerState r) {
+            long rv = l.getPacketsReceivedDuplicate() - r.getPacketsReceivedDuplicate();
+            if (rv == 0) // fallback on alpha
+                return super.compare(l, r);
+            else
+                return (int)rv;
+        }
+    }
+    
+    static class PeerComparator implements Comparator<PeerState>, Serializable {
+        public int compare(PeerState l, PeerState r) {
+            return DataHelper.compareTo(l.getRemotePeer().getData(), r.getRemotePeer().getData());
+        }
+    }
+
+    static void appendSortLinks(StringBuilder buf, String urlBase, int sortFlags, String descr, int ascending) {
+        if (ascending == FLAG_ALPHA) {  // 0
+            buf.append(" <a href=\"").append(urlBase).append("?sort=0" +
+                       "#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>");
+        } else if (sortFlags == ascending) {
+            buf.append(" <a href=\"").append(urlBase).append("?sort=").append(0-ascending);
+            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>" +
+                       "<b><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></b>");
+        } else if (sortFlags == 0 - ascending) {
+            buf.append(" <b><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></b><a href=\"").append(urlBase).append("?sort=").append(ascending);
+            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></a>");
+        } else {
+            buf.append(" <a href=\"").append(urlBase).append("?sort=").append(0-ascending);
+            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>" +
+                       "<a href=\"").append(urlBase).append("?sort=").append(ascending);
+            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></a>");
+        }
+    }
+}
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index cb201b324cea20b4a61d54c35d5ad7c5cff0c7a4..7b9c2bdd00159c7d5a87aa1bc3b161a434eb2760 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -84,6 +84,7 @@ class UDPPacket implements CDQEntry {
     public static final int PAYLOAD_TYPE_RELAY_INTRO = 5;
     public static final int PAYLOAD_TYPE_DATA = 6;
     public static final int PAYLOAD_TYPE_TEST = 7;
+    public static final int MAX_PAYLOAD_TYPE = PAYLOAD_TYPE_TEST;
     /** @since 0.8.1 */
     public static final int PAYLOAD_TYPE_SESSION_DESTROY = 8;
     
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index efed5b13b09e7c912f727b893255f11fd7e44561..391a703b2ecb23264980739cadda0dcac60b94d0 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1,7 +1,6 @@
 package net.i2p.router.transport.udp;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.Writer;
 import java.net.InetAddress;
 import java.net.SocketException;
@@ -9,8 +8,6 @@ import java.net.UnknownHostException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -42,8 +39,9 @@ import net.i2p.router.transport.TransportBid;
 import net.i2p.router.transport.TransportImpl;
 import net.i2p.router.transport.TransportUtil;
 import static net.i2p.router.transport.TransportUtil.IPv6Config.*;
-import static net.i2p.router.transport.udp.PeerTestState.Role.*;
 import net.i2p.router.transport.crypto.DHSessionKeyBuilder;
+import static net.i2p.router.transport.udp.PeerTestState.Role.*;
+import static net.i2p.router.transport.udp.Sorters.*;
 import net.i2p.router.util.EventLog;
 import net.i2p.router.util.RandomIterator;
 import net.i2p.util.Addresses;
@@ -113,6 +111,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     private Hash _lastFrom;
     private byte[] _lastOurIP;
     private int _lastOurPort;
+    /** since we don't publish our IP/port if introduced anymore, we need
+        to store it somewhere. */
+    private RouterAddress _currentOurV4Address;
+    private RouterAddress _currentOurV6Address;
 
     private static final int DROPLIST_PERIOD = 10*60*1000;
     public static final String STYLE = "SSU";
@@ -164,6 +166,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     /** override the "large" (max) MTU, default is PeerState.LARGE_MTU */
     private static final String PROP_DEFAULT_MTU = "i2np.udp.mtu";
         
+    private static final String CAP_TESTING = "" + UDPAddress.CAPACITY_TESTING;
+    private static final String CAP_TESTING_INTRO = "" + UDPAddress.CAPACITY_TESTING + UDPAddress.CAPACITY_INTRODUCER;
+
     /** how many relays offered to us will we use at a time? */
     public static final int PUBLIC_RELAY_COUNT = 3;
     
@@ -784,7 +789,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             //_context.banlist().banlistRouter(from, "They said we had an invalid IP", STYLE);
             return;
         }
-        RouterAddress addr = getCurrentAddress(false);
+
+        RouterAddress addr = getCurrentExternalAddress(false);
         if (inboundRecent && addr != null && addr.getPort() > 0 && addr.getHost() != null) {
             // use OS clock since its an ordering thing, not a time thing
             // Note that this fails us if we switch from one IP to a second, then back to the first,
@@ -835,7 +841,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         boolean fireTest = false;
 
         boolean isIPv6 = ourIP.length == 16;
-        RouterAddress current = getCurrentAddress(isIPv6);
+        RouterAddress current = getCurrentExternalAddress(isIPv6);
         byte[] externalListenHost = current != null ? current.getIP() : null;
         int externalListenPort = current != null ? current.getPort() : getRequestedPort(isIPv6);
 
@@ -1810,9 +1816,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 return rv;
             }
         } else {
-            RouterAddress cur = getCurrentAddress(false);
-            if (cur != null)
-                host = cur.getHost();
+            if (!introducersRequired()) {
+                RouterAddress cur = getCurrentExternalAddress(false);
+                if (cur != null)
+                    host = cur.getHost();
+            }
         }
         return rebuildExternalAddress(host, port, allowRebuildRouterInfo);
     }
@@ -1869,12 +1877,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         } else {
             directIncluded = false;
         }
-        
+
         boolean introducersIncluded = false;
         if (introducersRequired) {
-            // FIXME intro manager doesn't sort introducers, so
-            // deepEquals() below can fail even with same introducers.
-            // Only a problem when we have very very few peers to pick from.
+            // intro manager now sorts introducers, so
+            // deepEquals() below will not fail even with same introducers.
+            // Was only a problem when we had very very few peers to pick from.
             int found = _introManager.pickInbound(options, PUBLIC_RELAY_COUNT);
             if (found > 0) {
                 if (_log.shouldLog(Log.INFO))
@@ -1891,9 +1899,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         
         // if we have explicit external addresses, they had better be reachable
         if (introducersRequired)
-            options.setProperty(UDPAddress.PROP_CAPACITY, ""+UDPAddress.CAPACITY_TESTING);
+            options.setProperty(UDPAddress.PROP_CAPACITY, CAP_TESTING);
         else
-            options.setProperty(UDPAddress.PROP_CAPACITY, ""+UDPAddress.CAPACITY_TESTING + UDPAddress.CAPACITY_INTRODUCER);
+            options.setProperty(UDPAddress.PROP_CAPACITY, CAP_TESTING_INTRO);
 
         // MTU since 0.9.2
         int mtu;
@@ -1936,6 +1944,20 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             RouterAddress current = getCurrentAddress(isIPv6);
             boolean wantsRebuild = !addr.deepEquals(current);
 
+            // save the external address, even if we didn't publish it
+            if (port > 0 && host != null) {
+                RouterAddress local;
+                if (directIncluded) {
+                    local = addr;
+                } else {
+                    OrderedProperties localOpts = new OrderedProperties(); 
+                    localOpts.setProperty(UDPAddress.PROP_PORT, String.valueOf(port));
+                    localOpts.setProperty(UDPAddress.PROP_HOST, host);
+                    local = new RouterAddress(STYLE, localOpts, cost);
+                }
+                replaceCurrentExternalAddress(local, isIPv6);
+            }
+
             if (wantsRebuild) {
                 if (_log.shouldLog(Log.INFO))
                     _log.info("Address rebuilt: " + addr);
@@ -1945,6 +1967,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             } else {
                 addr = null;
             }
+        
             if (!isIPv6)
                 _needsRebuild = false;
             return addr;
@@ -1953,10 +1976,56 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 _log.warn("Wanted to rebuild my SSU address, but couldn't specify either the direct or indirect info (needs introducers? " 
                            + introducersRequired + ")", new Exception("source"));
             _needsRebuild = true;
+            // save the external address, even if we didn't publish it
+            if (port > 0 && host != null) {
+                OrderedProperties localOpts = new OrderedProperties(); 
+                localOpts.setProperty(UDPAddress.PROP_PORT, String.valueOf(port));
+                localOpts.setProperty(UDPAddress.PROP_HOST, host);
+                RouterAddress local = new RouterAddress(STYLE, localOpts, DEFAULT_COST);
+                replaceCurrentExternalAddress(local, isIPv6);
+            }
+            if (hasCurrentAddress()) {
+                // We must remove current address, otherwise the user will see
+                // "firewalled with inbound NTCP enabled" warning in console.
+                // Unfortunately this will remove any IPv6 also,
+                // but we don't have a method to remove just the IPv4 address. FIXME
+                replaceAddress(null);
+                if (allowRebuildRouterInfo)
+                    _context.router().rebuildRouterInfo();
+            }
             return null;
         }
     }
 
+    /**
+     *  Simple storage of IP and port, since
+     *  we don't put them in the real, published RouterAddress anymore
+     *  if we are firewalled.
+     *
+     *  Caller must sync on _rebuildLock
+     *
+     *  @since 0.9.18
+     */
+    private void replaceCurrentExternalAddress(RouterAddress ra, boolean isIPv6) {
+        if (isIPv6)
+            _currentOurV6Address = ra;
+        else
+            _currentOurV4Address = ra;
+    }
+
+    /**
+     *  Simple fetch of stored IP and port, since
+     *  we don't put them in the real, published RouterAddress anymore
+     *  if we are firewalled.
+     *
+     *  @since 0.9.18
+     */
+    private RouterAddress getCurrentExternalAddress(boolean isIPv6) {
+        synchronized (_rebuildLock) {
+            return isIPv6 ? _currentOurV6Address : _currentOurV4Address;
+        }
+    }
+
     /**
      *  Replace then tell NTCP that we changed.
      *
@@ -2254,295 +2323,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     DHSessionKeyBuilder.Factory getDHFactory() {
         return _dhFactory;
     }
-
-    private static final int FLAG_ALPHA = 0;
-    private static final int FLAG_IDLE_IN = 1;
-    private static final int FLAG_IDLE_OUT = 2;
-    private static final int FLAG_RATE_IN = 3;
-    private static final int FLAG_RATE_OUT = 4;
-    private static final int FLAG_SKEW = 5;
-    private static final int FLAG_CWND= 6;
-    private static final int FLAG_SSTHRESH = 7;
-    private static final int FLAG_RTT = 8;
-    //private static final int FLAG_DEV = 9;
-    private static final int FLAG_RTO = 10;
-    private static final int FLAG_MTU = 11;
-    private static final int FLAG_SEND = 12;
-    private static final int FLAG_RECV = 13;
-    private static final int FLAG_RESEND = 14;
-    private static final int FLAG_DUP = 15;
-    private static final int FLAG_UPTIME = 16;
-    private static final int FLAG_DEBUG = 99;
-    
-    private static Comparator<PeerState> getComparator(int sortFlags) {
-        Comparator<PeerState> rv;
-        switch (Math.abs(sortFlags)) {
-            case FLAG_IDLE_IN:
-                rv = new IdleInComparator();
-                break;
-            case FLAG_IDLE_OUT:
-                rv = new IdleOutComparator();
-                break;
-            case FLAG_RATE_IN:
-                rv = new RateInComparator();
-                break;
-            case FLAG_RATE_OUT:
-                rv = new RateOutComparator();
-                break;
-            case FLAG_UPTIME:
-                rv = new UptimeComparator();
-                break;
-            case FLAG_SKEW:
-                rv = new SkewComparator();
-                break;
-            case FLAG_CWND:
-                rv = new CwndComparator();
-                break;
-            case FLAG_SSTHRESH:
-                rv = new SsthreshComparator();
-                break;
-            case FLAG_RTT:
-                rv = new RTTComparator();
-                break;
-            //case FLAG_DEV:
-            //    rv = new DevComparator();
-            //    break;
-            case FLAG_RTO:
-                rv = new RTOComparator();
-                break;
-            case FLAG_MTU:
-                rv = new MTUComparator();
-                break;
-            case FLAG_SEND:
-                rv = new SendCountComparator();
-                break;
-            case FLAG_RECV:
-                rv = new RecvCountComparator();
-                break;
-            case FLAG_RESEND:
-                rv = new ResendComparator();
-                break;
-            case FLAG_DUP:
-                rv = new DupComparator();
-                break;
-            case FLAG_ALPHA:
-            default:
-                rv = new AlphaComparator();
-                break;
-        }
-        if (sortFlags < 0)
-            rv = Collections.reverseOrder(rv);
-        return rv;
-    }
-
-    private static class AlphaComparator extends PeerComparator {
-    }
-
-    private static class IdleInComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = r.getLastReceiveTime() - l.getLastReceiveTime();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class IdleOutComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = r.getLastSendTime() - l.getLastSendTime();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class RateInComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getReceiveBps() - r.getReceiveBps();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class RateOutComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getSendBps() - r.getSendBps();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class UptimeComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = r.getKeyEstablishedTime() - l.getKeyEstablishedTime();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class SkewComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = Math.abs(l.getClockSkew()) - Math.abs(r.getClockSkew());
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class CwndComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getSendWindowBytes() - r.getSendWindowBytes();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class SsthreshComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getSlowStartThreshold() - r.getSlowStartThreshold();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class RTTComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getRTT() - r.getRTT();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
- /***
-    private static class DevComparator extends PeerComparator {
-        private static final DevComparator _instance = new DevComparator();
-        public static final DevComparator instance() { return _instance; }
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = l.getRTTDeviation() - r.getRTTDeviation();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-  ****/
-
-    /** */
-    private static class RTOComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getRTO() - r.getRTO();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class MTUComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            int rv = l.getMTU() - r.getMTU();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return rv;
-        }
-    }
-
-    private static class SendCountComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = l.getPacketsTransmitted() - r.getPacketsTransmitted();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class RecvCountComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = l.getPacketsReceived() - r.getPacketsReceived();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class ResendComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = l.getPacketsRetransmitted() - r.getPacketsRetransmitted();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-
-    private static class DupComparator extends PeerComparator {
-        @Override
-        public int compare(PeerState l, PeerState r) {
-            long rv = l.getPacketsReceivedDuplicate() - r.getPacketsReceivedDuplicate();
-            if (rv == 0) // fallback on alpha
-                return super.compare(l, r);
-            else
-                return (int)rv;
-        }
-    }
-    
-    private static class PeerComparator implements Comparator<PeerState>, Serializable {
-        public int compare(PeerState l, PeerState r) {
-            return DataHelper.compareTo(l.getRemotePeer().getData(), r.getRemotePeer().getData());
-        }
-    }
-
-    private static void appendSortLinks(StringBuilder buf, String urlBase, int sortFlags, String descr, int ascending) {
-        if (ascending == FLAG_ALPHA) {  // 0
-            buf.append(" <a href=\"").append(urlBase).append("?sort=0" +
-                       "#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>");
-        } else if (sortFlags == ascending) {
-            buf.append(" <a href=\"").append(urlBase).append("?sort=").append(0-ascending);
-            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>" +
-                       "<b><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></b>");
-        } else if (sortFlags == 0 - ascending) {
-            buf.append(" <b><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></b><a href=\"").append(urlBase).append("?sort=").append(ascending);
-            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></a>");
-        } else {
-            buf.append(" <a href=\"").append(urlBase).append("?sort=").append(0-ascending);
-            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/inbound.png\" alt=\"V\"></a>" +
-                       "<a href=\"").append(urlBase).append("?sort=").append(ascending);
-            buf.append("#udpcon\" title=\"").append(descr).append("\"><img src=\"/themes/console/images/outbound.png\" alt=\"^\"></a>");
-        }
-    }
     
     @Override
     public void renderStatusHTML(Writer out, String urlBase, int sortFlags) throws IOException {
@@ -3047,6 +2827,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         if ( (status != old) && (status != CommSystemFacade.STATUS_UNKNOWN) ) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Old status: " + old + " New status: " + status + " from: ", new Exception("traceback"));
+            if (old != CommSystemFacade.STATUS_UNKNOWN)
+                _context.router().eventLog().addEvent(EventLog.REACHABILITY, Integer.toString(status));
             // Always rebuild when the status changes, even if our address hasn't changed,
             // as rebuildExternalAddress() calls replaceAddress() which calls CSFI.notifyReplaceAddress()
             // which will start up NTCP inbound when we transition to OK.
@@ -3109,7 +2891,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             PeerState peer = iter.next();
             if ( (dontInclude != null) && (dontInclude.equals(peer.getRemoteHostId())) )
                 continue;
-            // enforce IPv4 connection for BOB
+            // enforce IPv4 connection if we are ALICE looking for a BOB
             byte[] ip = peer.getRemoteIP();
             if (peerRole == BOB && ip.length != 4)
                 continue;
@@ -3172,12 +2954,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                     _log.info("Running periodic test with bob = " + bob);
                 _testManager.runTest(bob.getRemoteIPAddress(), bob.getRemotePort(), bob.getCurrentCipherKey(), bob.getCurrentMACKey());
                 setLastTested();
-                _forceRun = false;
-                return;
+            } else {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Unable to run a periodic test, as there are no peers with the capacity required");
             }
-            
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Unable to run a periodic test, as there are no peers with the capacity required");
             _forceRun = false;
         }
         
diff --git a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java
index 3d62ded4bd777d320aafc9e2eb876d1829b5ebb8..702719931d4a700c4518d5fb974c892f1f9fc7b2 100644
--- a/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java
+++ b/router/java/src/net/i2p/router/tunnel/BatchedRouterPreprocessor.java
@@ -24,11 +24,11 @@ class BatchedRouterPreprocessor extends BatchedPreprocessor {
     /** This goes in router advanced config */
     public static final String PROP_ROUTER_BATCH_FREQUENCY = "router.batchFrequency";
     /** for client OBGWs only (our data) */
-    public static final int OB_CLIENT_BATCH_FREQ = 100;
+    public static final int OB_CLIENT_BATCH_FREQ = 75;
     /** for exploratory OBGWs only (our tunnel tests and build messages) */
-    public static final int OB_EXPL_BATCH_FREQ = 150;
+    public static final int OB_EXPL_BATCH_FREQ = 100;
     /** for IBGWs for efficiency (not our data) */
-    public static final int DEFAULT_BATCH_FREQUENCY = 250;
+    public static final int DEFAULT_BATCH_FREQUENCY = 175;
     
     /** for OBGWs */
     public BatchedRouterPreprocessor(RouterContext ctx, TunnelCreatorConfig cfg) {
diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java
index c6ddbb1b03a41488e14eb974453d2ac39e108580..57a6f022249bd8f0cc987fd1f40cca586fb02f07 100644
--- a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java
+++ b/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java
@@ -154,7 +154,7 @@ public abstract class BuildMessageGenerator {
      * Encrypt the records so their hop ident is visible at the appropriate times.
      *
      * Note that this layer-encrypts the build records for the message in-place.
-     * Only call this onece for a given message.
+     * Only call this once for a given message.
      *
      * @param order list of hop #s as Integers.  For instance, if (order.get(1) is 4), it is peer cfg.getPeer(4)
      */
diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
index b651daa1d901aa83b5a150b91e685d1391fd3032..62c1e6ed69c1072e8124323119ecfedf95a43d79 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@@ -63,75 +63,87 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
         */
         
         int type = msg.getType();
-        // FVSJ or client lookups could also result in a DSRM.
-        // Since there's some code that replies directly to this to gather new ff RouterInfos,
-        // sanitize it
-        if ( (_client != null) && 
-             (type == DatabaseSearchReplyMessage.MESSAGE_TYPE)) {
-            // TODO: Strip in IterativeLookupJob etc. instead, depending on
-            // LS or RI and client or expl., so that we can safely follow references
-            // in a reply to a LS lookup over client tunnels.
-            // ILJ would also have to follow references via client tunnels
-          /****
-            DatabaseSearchReplyMessage orig = (DatabaseSearchReplyMessage) msg;
-            if (orig.getNumReplies() > 0) {
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Removing replies from a DSRM down a tunnel for " + _client + ": " + msg);
-                DatabaseSearchReplyMessage newMsg = new DatabaseSearchReplyMessage(_context);
-                newMsg.setFromHash(orig.getFromHash());
-                newMsg.setSearchKey(orig.getSearchKey());
-                msg = newMsg;
-            }
-          ****/
-        } else if ( (_client != null) && 
-                    (type == DatabaseStoreMessage.MESSAGE_TYPE)) {
-            DatabaseStoreMessage dsm = (DatabaseStoreMessage) msg;
-            if (dsm.getEntry().getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) {
-                // FVSJ may result in an unsolicited RI store if the peer went non-ff.
-                // We handle this safely, so we don't ask him again.
-                // Todo: if peer was ff and RI is not ff, queue for exploration in netdb (but that isn't part of the facade now)
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Dropping DSM down a tunnel for " + _client + ": " + msg);
-                // Handle safely by just updating the caps table, after doing basic validation
-                Hash key = dsm.getKey();
-                if (_context.routerHash().equals(key))
-                    return;
-                RouterInfo ri = (RouterInfo) dsm.getEntry();
-                if (!key.equals(ri.getIdentity().getHash()))
-                    return;
-                if (!ri.isValid())
+
+        // if the message came down a client tunnel:
+        if (_client != null) {
+            switch (type) {
+                 case DatabaseSearchReplyMessage.MESSAGE_TYPE:
+                     // FVSJ or client lookups could also result in a DSRM.
+                     // Since there's some code that replies directly to this to gather new ff RouterInfos,
+                     // sanitize it
+
+                     // TODO: Strip in IterativeLookupJob etc. instead, depending on
+                     // LS or RI and client or expl., so that we can safely follow references
+                     // in a reply to a LS lookup over client tunnels.
+                     // ILJ would also have to follow references via client tunnels
+                  /****
+                     DatabaseSearchReplyMessage orig = (DatabaseSearchReplyMessage) msg;
+                     if (orig.getNumReplies() > 0) {
+                         if (_log.shouldLog(Log.INFO))
+                             _log.info("Removing replies from a DSRM down a tunnel for " + _client + ": " + msg);
+                         DatabaseSearchReplyMessage newMsg = new DatabaseSearchReplyMessage(_context);
+                         newMsg.setFromHash(orig.getFromHash());
+                         newMsg.setSearchKey(orig.getSearchKey());
+                         msg = newMsg;
+                     }
+                   ****/
+                     break;
+
+                case DatabaseStoreMessage.MESSAGE_TYPE:
+                    DatabaseStoreMessage dsm = (DatabaseStoreMessage) msg;
+                    if (dsm.getEntry().getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) {
+                        // FVSJ may result in an unsolicited RI store if the peer went non-ff.
+                        // We handle this safely, so we don't ask him again.
+                        // Todo: if peer was ff and RI is not ff, queue for exploration in netdb (but that isn't part of the facade now)
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Dropping DSM down a tunnel for " + _client + ": " + msg);
+                        // Handle safely by just updating the caps table, after doing basic validation
+                        Hash key = dsm.getKey();
+                        if (_context.routerHash().equals(key))
+                            return;
+                        RouterInfo ri = (RouterInfo) dsm.getEntry();
+                        if (!key.equals(ri.getIdentity().getHash()))
+                            return;
+                        if (!ri.isValid())
+                            return;
+                        RouterInfo oldri = _context.netDb().lookupRouterInfoLocally(key);
+                        // only update if RI is newer and non-ff
+                        if (oldri != null && oldri.getPublished() < ri.getPublished() &&
+                            !FloodfillNetworkDatabaseFacade.isFloodfill(ri)) {
+                            if (_log.shouldLog(Log.WARN))
+                                _log.warn("Updating caps for RI " + key + " from \"" +
+                                          oldri.getCapabilities() + "\" to \"" + ri.getCapabilities() + '"');
+                            _context.peerManager().setCapabilities(key, ri.getCapabilities());
+                        }
+                        return;
+                    } else if (dsm.getReplyToken() != 0) {
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Dropping LS DSM w/ reply token down a tunnel for " + _client + ": " + msg);
+                        return;
+                    } else {
+                        // allow DSM of our own key (used by FloodfillVerifyStoreJob)
+                        // or other keys (used by IterativeSearchJob)
+                        // as long as there's no reply token (we will never set a reply token but an attacker might)
+                        ((LeaseSet)dsm.getEntry()).setReceivedAsReply();
+                    }
+                    break;
+
+                case DeliveryStatusMessage.MESSAGE_TYPE:
+                case GarlicMessage.MESSAGE_TYPE:
+                case TunnelBuildReplyMessage.MESSAGE_TYPE:
+                case VariableTunnelBuildReplyMessage.MESSAGE_TYPE:
+                    // these are safe, handled below
+                    break;
+
+                default:
+                    // drop it, since we should only get the above message types down
+                    // client tunnels
+                    _context.statManager().addRateData("tunnel.dropDangerousClientTunnelMessage", 1, type);
+                    _log.error("Dropped dangerous message down a tunnel for " + _client + ": " + msg, new Exception("cause"));
                     return;
-                RouterInfo oldri = _context.netDb().lookupRouterInfoLocally(key);
-                // only update if RI is newer and non-ff
-                if (oldri != null && oldri.getPublished() < ri.getPublished() &&
-                    !FloodfillNetworkDatabaseFacade.isFloodfill(ri)) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn("Updating caps for RI " + key + " from \"" +
-                                  oldri.getCapabilities() + "\" to \"" + ri.getCapabilities() + '"');
-                    _context.peerManager().setCapabilities(key, ri.getCapabilities());
-                }
-                return;
-            } else if (dsm.getReplyToken() != 0) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Dropping LS DSM w/ reply token down a tunnel for " + _client + ": " + msg);
-                return;
-            } else {
-                // allow DSM of our own key (used by FloodfillVerifyStoreJob)
-                // or other keys (used by IterativeSearchJob)
-                // as long as there's no reply token (we will never set a reply token but an attacker might)
-                ((LeaseSet)dsm.getEntry()).setReceivedAsReply();
-            }
-        } else if ( (_client != null) && 
-             (type != DeliveryStatusMessage.MESSAGE_TYPE) &&
-             (type != GarlicMessage.MESSAGE_TYPE) &&
-             (type != TunnelBuildReplyMessage.MESSAGE_TYPE) &&
-             (type != VariableTunnelBuildReplyMessage.MESSAGE_TYPE)) {
-            // drop it, since we should only get tunnel test messages and garlic messages down
-            // client tunnels
-            _context.statManager().addRateData("tunnel.dropDangerousClientTunnelMessage", 1, type);
-            _log.error("Dropped dangerous message down a tunnel for " + _client + ": " + msg, new Exception("cause"));
-            return;
-        }
+
+            } // switch
+        } // client != null
 
         if ( (target == null) || ( (tunnel == null) && (_context.routerHash().equals(target) ) ) ) {
             // targetting us either implicitly (no target) or explicitly (no tunnel)
diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
index 9493932e658440d43270a9747e4b0961d7c998a5..614c7faab9bcca51bd59c1d0e3df3eb95b302373 100644
--- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
@@ -63,6 +63,7 @@ class PumpedTunnelGateway extends TunnelGateway {
         super(context, preprocessor, sender, receiver);
         if (getClass() == PumpedTunnelGateway.class) {
             // Unbounded priority queue for outbound
+            // fixme lint PendingGatewayMessage is not a CDPQEntry
             _prequeue = new CoDelPriorityBlockingQueue(context, "OBGW", INITIAL_OB_QUEUE);
             _nextHop = receiver.getSendTo();
             _isInbound = false;
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index 7e786016ceb69bed33052d5abdbf10918f5b9482..09744c5698f6d47cb2fa4777eac747848a539e6e 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -389,7 +389,7 @@ public class TunnelDispatcher implements Service {
         long rv;
         TunnelId tid;
         do {
-            rv = _context.random().nextLong(TunnelId.MAX_ID_VALUE);
+            rv = 1 + _context.random().nextLong(TunnelId.MAX_ID_VALUE - 1);
             tid = new TunnelId(rv);
         } while (_outboundGateways.containsKey(tid));
         return rv;
@@ -406,7 +406,7 @@ public class TunnelDispatcher implements Service {
         long rv;
         TunnelId tid;
         do {
-            rv = _context.random().nextLong(TunnelId.MAX_ID_VALUE);
+            rv = 1 + _context.random().nextLong(TunnelId.MAX_ID_VALUE - 1);
             tid = new TunnelId(rv);
         } while (_participants.containsKey(tid));
         return rv;
@@ -423,7 +423,7 @@ public class TunnelDispatcher implements Service {
         long rv;
         TunnelId tid;
         do {
-            rv = _context.random().nextLong(TunnelId.MAX_ID_VALUE);
+            rv = 1 + _context.random().nextLong(TunnelId.MAX_ID_VALUE - 1);
             tid = new TunnelId(rv);
         } while (_inboundGateways.containsKey(tid));
         return rv;
@@ -612,7 +612,7 @@ public class TunnelDispatcher implements Service {
      * endpoint.
      *
      * @param msg raw message to deliver to the target peer
-     * @param outboundTunnel tunnel to send the message out
+     * @param outboundTunnel tunnel to send the message out, or null for direct
      * @param targetPeer peer to receive the message
      */
     public void dispatchOutbound(I2NPMessage msg, TunnelId outboundTunnel, Hash targetPeer) {
@@ -626,7 +626,7 @@ public class TunnelDispatcher implements Service {
      *
      * @param msg raw message to deliver to the targetTunnel on the targetPeer
      * @param outboundTunnel tunnel to send the message out
-     * @param targetTunnel tunnel on the targetPeer to deliver the message to
+     * @param targetTunnel tunnel on the targetPeer to deliver the message to, or null for direct
      * @param targetPeer gateway to the tunnel to receive the message
      */
     public void dispatchOutbound(I2NPMessage msg, TunnelId outboundTunnel, TunnelId targetTunnel, Hash targetPeer) {
@@ -950,8 +950,8 @@ public class TunnelDispatcher implements Service {
         public LeaveTunnel(RouterContext ctx) {
             super(ctx);
             _configs = new LinkedBlockingQueue<HopConfig>();
-            // 20 min no tunnels accepted + 10 min tunnel expiration
-            getTiming().setStartAfter(ctx.clock().now() + 30*60*1000);
+            // 10 min no tunnels accepted + 10 min tunnel expiration
+            getTiming().setStartAfter(ctx.clock().now() + 20*60*1000);
             getContext().jobQueue().addJob(LeaveTunnel.this);
         }
         
diff --git a/router/java/src/net/i2p/router/tunnel/package.html b/router/java/src/net/i2p/router/tunnel/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..368c544da5b74ad79c0e1331e2d8f8e5ec3adba4
--- /dev/null
+++ b/router/java/src/net/i2p/router/tunnel/package.html
@@ -0,0 +1,13 @@
+<html>
+<body>
+<p>
+All the work of managing locally created and participating tunnels,
+creating and handling tunnel messages, and their encryption.
+Deals with the five different types of tunnel hops:
+outbound gateway, outbound endpoint, inbound gateway, inbound endpoint, and middle hop.
+Distributes messages received for each type.
+Validation, queueing and throttling for each type.
+Tunnel build message handling is in the pool package.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java
index 42cff28c7a3dbb9b37a7d9b91660e110719b89b9..5a55b11b4ab0b16dc6529a06371b81d0c078b429 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java
@@ -43,7 +43,7 @@ class BuildExecutor implements Runnable {
     private final ConcurrentHashMap<Long, PooledTunnelCreatorConfig> _recentlyBuildingMap;
     private volatile boolean _isRunning;
     private boolean _repoll;
-    private static final int MAX_CONCURRENT_BUILDS = 10;
+    private static final int MAX_CONCURRENT_BUILDS = 13;
     /** accept replies up to a minute after we gave up on them */
     private static final long GRACE_PERIOD = 60*1000;
 
@@ -129,8 +129,10 @@ class BuildExecutor implements Runnable {
                 }
             }
         }
-        if (allowed < 2) allowed = 2; // Never choke below 2 builds (but congestion may)
-        else if (allowed > MAX_CONCURRENT_BUILDS) allowed = MAX_CONCURRENT_BUILDS; // Never go beyond 10, that is uncharted territory (old limit was 5)
+        if (allowed < 2)
+            allowed = 2; // Never choke below 2 builds (but congestion may)
+        else if (allowed > MAX_CONCURRENT_BUILDS)
+             allowed = MAX_CONCURRENT_BUILDS;
         allowed = _context.getProperty("router.tunnelConcurrentBuilds", allowed);
 
         // expire any REALLY old requests
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index cf3cb1053430e4353c39b9399725687d72ae96e6..13bffe7eeb87b1b9a2b315bbde2ec0114e0b76b0 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -62,6 +62,10 @@ class BuildHandler implements Runnable {
     private final BuildReplyHandler _buildReplyHandler;
     private final AtomicInteger _currentLookups = new AtomicInteger();
     private volatile boolean _isRunning;
+    private final Object _startupLock = new Object();
+    private ExplState _explState = ExplState.NONE;
+
+    private enum ExplState { NONE, IB, OB, BOTH }
 
     /** TODO these may be too high, review and adjust */
     private static final int MIN_QUEUE = 18;
@@ -89,6 +93,8 @@ class BuildHandler implements Runnable {
     /** must be > 1 hour due to rouding down */
     private static final long MAX_REQUEST_AGE = 65*60*1000;
 
+    private static final long JOB_LAG_LIMIT_TUNNEL = 350;
+
 
     public BuildHandler(RouterContext ctx, TunnelPoolManager manager, BuildExecutor exec) {
         _context = ctx;
@@ -152,6 +158,30 @@ class BuildHandler implements Runnable {
         ctx.inNetMessagePool().registerHandlerJobBuilder(VariableTunnelBuildMessage.MESSAGE_TYPE, tbmhjb);
         ctx.inNetMessagePool().registerHandlerJobBuilder(VariableTunnelBuildReplyMessage.MESSAGE_TYPE, tbrmhjb);
     }
+
+    /**
+     *  Call the same time you start the threads
+     *
+     *  @since 0.9.18
+     */
+    void init() {
+        // fixup startup state if 0-hop exploratory is allowed in either direction
+        int ibl = _manager.getInboundSettings().getLength();
+        int ibv = _manager.getInboundSettings().getLengthVariance();
+        int obl = _manager.getOutboundSettings().getLength();
+        int obv = _manager.getOutboundSettings().getLengthVariance();
+        boolean ibz = ibl <= 0 || ibl + ibv <= 0;
+        boolean obz = obl <= 0 || obl + obv <= 0;
+        if (ibz && obz) {
+            _explState = ExplState.BOTH;
+            _context.router().setExplTunnelsReady();
+        } else if (ibz) {
+            _explState = ExplState.IB;
+        } else if (obz) {
+            _explState = ExplState.OB;
+        }
+    }
+
     
     /**
      *  @since 0.9
@@ -220,6 +250,17 @@ class BuildHandler implements Runnable {
                 _context.throttle().setTunnelStatus(_x("Dropping tunnel requests: Too slow"));
                 return;
             }       
+
+            long lag = _context.jobQueue().getMaxLag();
+            // TODO reject instead of drop also for a lower limit? see throttle
+            if (lag > JOB_LAG_LIMIT_TUNNEL) {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Dropping tunnel request, as the job lag is " + lag);
+                _context.statManager().addRateData("router.throttleTunnelCause", lag);
+                _context.throttle().setTunnelStatus(_x("Dropping tunnel requests: High job lag"));
+                return;
+            }       
+
             handleRequest(state);
 
         //int remaining = _inboundBuildMessages.size();
@@ -337,6 +378,38 @@ class BuildHandler implements Runnable {
                 // call buildComplete() after addTunnel() so we don't try another build.
                 _exec.buildComplete(cfg, cfg.getTunnelPool());
                 _exec.buildSuccessful(cfg);
+
+                if (cfg.getTunnelPool().getSettings().isExploratory()) {
+                    // Notify router that exploratory tunnels are ready
+                    boolean isIn = cfg.isInbound();
+                    synchronized(_startupLock) {
+                        switch (_explState) {
+                            case NONE:
+                                if (isIn)
+                                    _explState = ExplState.IB;
+                                else
+                                    _explState = ExplState.OB;
+                                break;
+
+                            case IB:
+                                if (!isIn) {
+                                    _explState = ExplState.BOTH;
+                                    _context.router().setExplTunnelsReady();
+                                }
+                                break;
+
+                            case OB:
+                                if (isIn) {
+                                    _explState = ExplState.BOTH;
+                                    _context.router().setExplTunnelsReady();
+                                }
+                                break;
+
+                            case BOTH:
+                                break;
+                        }
+                    }
+                }
                 
                 ExpireJob expireJob = new ExpireJob(_context, cfg, cfg.getTunnelPool());
                 cfg.setExpireJob(expireJob);
@@ -588,8 +661,10 @@ class BuildHandler implements Runnable {
             // Previous and next hop the same? Don't help somebody be evil. Drop it without a reply.
             // A-B-C-A is not preventable
             if (nextPeer.equals(from)) {
+                // i2pd does this
                 _context.statManager().addRateData("tunnel.rejectHostile", 1);
-                _log.error("Dropping build request with the same previous and next hop");
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Dropping build request with the same previous and next hop");
                 return;
             }
         }
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
index 4e74aedb54a4eacd060452c924914608c17c4270..15c90b092ca21390e2ed24026097e25f5c173c69 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
@@ -81,7 +81,7 @@ abstract class BuildRequestor {
                 else if (isIB && i == len - 1)
                     id = ctx.tunnelDispatcher().getNewIBEPID();
                 else
-                    id = ctx.random().nextLong(TunnelId.MAX_ID_VALUE);
+                    id = 1 + ctx.random().nextLong(TunnelId.MAX_ID_VALUE - 1);
                 cfg.getConfig(i).setReceiveTunnelId(DataHelper.toLong(4, id));
             }
             
@@ -138,6 +138,7 @@ abstract class BuildRequestor {
                     pairedTunnel = mgr.selectOutboundTunnel();
                     if (pairedTunnel != null &&
                         pairedTunnel.getLength() <= 1 &&
+                        mgr.getOutboundSettings().getLength() > 0 &&
                         mgr.getOutboundSettings().getLength() + mgr.getOutboundSettings().getLengthVariance() > 0) {
                         // don't build using a zero-hop expl.,
                         // as it is both very bad for anonomyity,
@@ -150,6 +151,7 @@ abstract class BuildRequestor {
                     pairedTunnel = mgr.selectInboundTunnel();
                     if (pairedTunnel != null &&
                         pairedTunnel.getLength() <= 1 &&
+                        mgr.getInboundSettings().getLength() > 0 &&
                         mgr.getInboundSettings().getLength() + mgr.getInboundSettings().getLengthVariance() > 0) {
                         // ditto
                         pairedTunnel = null;
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 1258c10d674f88baad570a1448606614632d3936..521ff740a0f23dd17e0c3b888ecfdcb0a99f98e7 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -52,6 +52,7 @@ public class TunnelPool {
     /** if less than one success in this many, reduce length (exploratory only) */
     private static final int BUILD_TRIES_LENGTH_OVERRIDE_1 = 10;
     private static final int BUILD_TRIES_LENGTH_OVERRIDE_2 = 18;
+    private static final long STARTUP_TIME = 30*60*1000;
     
     TunnelPool(RouterContext ctx, TunnelPoolManager mgr, TunnelPoolSettings settings, TunnelPeerSelector sel) {
         _context = ctx;
@@ -89,7 +90,7 @@ public class TunnelPool {
         _lastRateUpdate = _started;
         _lastLifetimeProcessed = 0;
         _manager.getExecutor().repoll();
-        if (_settings.isInbound() && (_settings.getDestination() != null) ) {
+        if (_settings.isInbound() && !_settings.isExploratory()) {
             // we just reconnected and didn't require any new tunnel builders.
             // however, we /do/ want a leaseSet, so build one
             LeaseSet ls = null;
@@ -117,10 +118,8 @@ public class TunnelPool {
         }
     }
 
-    TunnelPoolManager getManager() { return _manager; }
-    
     void refreshSettings() {
-        if (_settings.getDestination() != null) {
+        if (!_settings.isExploratory()) {
             return; // don't override client specified settings
         } else {
             if (_settings.isExploratory()) {
@@ -160,7 +159,8 @@ public class TunnelPool {
     TunnelInfo selectTunnel() { return selectTunnel(true); }
 
     private TunnelInfo selectTunnel(boolean allowRecurseOnFail) {
-        boolean avoidZeroHop = ((getSettings().getLength() + getSettings().getLengthVariance()) > 0);
+        boolean avoidZeroHop = getSettings().getLength() > 0 &&
+                               getSettings().getLength() + getSettings().getLengthVariance() > 0;
         
         long period = curPeriod();
         synchronized (_tunnels) {
@@ -247,7 +247,8 @@ public class TunnelPool {
      * @since 0.8.10
      */
     TunnelInfo selectTunnel(Hash closestTo) {
-        boolean avoidZeroHop = ((getSettings().getLength() + getSettings().getLengthVariance()) > 0);
+        boolean avoidZeroHop = getSettings().getLength() > 0 &&
+                               getSettings().getLength() + getSettings().getLengthVariance() > 0;
         TunnelInfo rv = null;
         synchronized (_tunnels) {
             if (!_tunnels.isEmpty()) {
@@ -323,10 +324,19 @@ public class TunnelPool {
      *  length settings. Although I guess inbound and outbound exploratory
      *  could be different too, and inbound is harder...
      *
+     *  As of 0.9.19, add more if exploratory and floodfill, as floodfills
+     *  generate a lot of exploratory traffic.
+     *  TODO high-bandwidth non-floodfills do also...
+     *
      *  @since 0.8.11
      */
     private int getAdjustedTotalQuantity() {
         int rv = _settings.getTotalQuantity();
+        // TODO high-bw non-ff also
+        if (_settings.isExploratory() && _context.netDb().floodfillEnabled() &&
+            _context.router().getUptime() > 5*60*1000) {
+            rv += 2;
+        }
         if (_settings.isExploratory() && rv > 1) {
             RateStat e = _context.statManager().getRate("tunnel.buildExploratoryExpire");
             RateStat r = _context.statManager().getRate("tunnel.buildExploratoryReject");
@@ -348,6 +358,10 @@ public class TunnelPool {
                 }
             }
         }
+        if (_settings.isExploratory() && _context.router().getUptime() < STARTUP_TIME) {
+            // more exploratory during startup, when we are refreshing the netdb RIs
+            rv++;
+        }
         return rv;
     }
 
@@ -419,8 +433,7 @@ public class TunnelPool {
     public boolean isAlive() {
         return _alive &&
                (_settings.isExploratory() ||
-                (_settings.getDestination() != null &&
-                 _context.clientManager().isLocal(_settings.getDestination())));
+                 _context.clientManager().isLocal(_settings.getDestination()));
     }
 
     /** duplicate of getTunnelCount(), let's pick one */
@@ -439,7 +452,7 @@ public class TunnelPool {
         LeaseSet ls = null;
         synchronized (_tunnels) {
             _tunnels.add(info);
-            if (_settings.isInbound() && (_settings.getDestination() != null) )
+            if (_settings.isInbound() && !_settings.isExploratory())
                 ls = locked_buildNewLeaseSet();
         }
         
@@ -459,7 +472,7 @@ public class TunnelPool {
             boolean removed = _tunnels.remove(info);
             if (!removed)
                 return;
-            if (_settings.isInbound() && (_settings.getDestination() != null) )
+            if (_settings.isInbound() && !_settings.isExploratory())
                 ls = locked_buildNewLeaseSet();
             remaining = _tunnels.size();
             if (_lastSelected == info) {
@@ -478,7 +491,7 @@ public class TunnelPool {
         for (int i = 0; i < info.getLength(); i++)
             _context.profileManager().tunnelLifetimePushed(info.getPeer(i), lifetime, lifetimeConfirmed);
         
-        if (_alive && _settings.isInbound() && (_settings.getDestination() != null) ) {
+        if (_alive && _settings.isInbound() && !_settings.isExploratory()) {
             if (ls != null) {
                 _context.clientManager().requestLeaseSet(_settings.getDestination(), ls);
             } else {
@@ -528,7 +541,7 @@ public class TunnelPool {
             boolean removed = _tunnels.remove(cfg);
             if (!removed)
                 return;
-            if (_settings.isInbound() && (_settings.getDestination() != null) )
+            if (_settings.isInbound() && !_settings.isExploratory())
                 ls = locked_buildNewLeaseSet();
             if (_lastSelected == cfg) {
                 _lastSelected = null;
@@ -541,7 +554,7 @@ public class TunnelPool {
         _lifetimeProcessed += cfg.getProcessedMessagesCount();
         updateRate();
         
-        if (_settings.isInbound() && (_settings.getDestination() != null) ) {
+        if (_settings.isInbound() && !_settings.isExploratory()) {
             if (ls != null) {
                 _context.clientManager().requestLeaseSet(_settings.getDestination(), ls);
             }
@@ -590,7 +603,7 @@ public class TunnelPool {
 
     /** noop for outbound and exploratory */
     void refreshLeaseSet() {
-        if (_settings.isInbound() && (_settings.getDestination() != null) ) {
+        if (_settings.isInbound() && !_settings.isExploratory()) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug(toString() + ": refreshing leaseSet on tunnel expiration (but prior to grace timeout)");
             LeaseSet ls = null;
@@ -618,7 +631,7 @@ public class TunnelPool {
 
         if (_settings.getAllowZeroHop()) {
             if ( (_settings.getLength() + _settings.getLengthVariance() > 0) && 
-                 (_settings.getDestination() != null) &&
+                 (!_settings.isExploratory()) &&
                  (_context.profileOrganizer().countActivePeers() > 0) ) {
                 // if it is a client tunnel pool and our variance doesn't allow 0 hop, prefer failure to
                 // 0 hop operation (unless our router is offline)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index c559e140ce4c255c5d79a54e6cd551c76411374a..d311d46a9679b495509c5646ee4fba5888637efb 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -344,9 +344,16 @@ public class TunnelPoolManager implements TunnelManagerFacade {
         return pool.listTunnels().contains(tunnel);
     }
 
+    /** exploratory */
     public TunnelPoolSettings getInboundSettings() { return _inboundExploratory.getSettings(); }
+
+    /** exploratory */
     public TunnelPoolSettings getOutboundSettings() { return _outboundExploratory.getSettings(); }
+
+    /** exploratory */
     public void setInboundSettings(TunnelPoolSettings settings) { _inboundExploratory.setSettings(settings); }
+
+    /** exploratory */
     public void setOutboundSettings(TunnelPoolSettings settings) { _outboundExploratory.setSettings(settings); }
 
     public TunnelPoolSettings getInboundSettings(Hash client) { 
@@ -497,6 +504,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
         if (!_executor.isRunning()) {
             I2PThread t = new I2PThread(_executor, "BuildExecutor", true);
             t.start();
+            _handler.init();
             for (int i = 1; i <= _numHandlerThreads; i++) {
                 I2PThread hThread = new I2PThread(_handler, "BuildHandler " + i + '/' + _numHandlerThreads, true);
                 hThread.start();
diff --git a/router/java/src/net/i2p/router/tunnel/pool/package.html b/router/java/src/net/i2p/router/tunnel/pool/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..36c7ad17131139d93860533d9a1c0c9a8b40771e
--- /dev/null
+++ b/router/java/src/net/i2p/router/tunnel/pool/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+Tunnel creation, tunnel build message handling. Peer selection for tunnels.
+Grouping of tunnels into inbound and outbound pools.
+Pool configuration. Adaptive tunnel build strategy.
+Build request throttling, acceptance, rejection, and dropping based on local
+statistics and conditions.
+</p>
+</body>
+</html>
diff --git a/router/java/src/net/i2p/router/util/EventLog.java b/router/java/src/net/i2p/router/util/EventLog.java
index ef59c5fc6bd8cab9ab2ae674bb256fe0bd471548..1cad4b9b4700d7ff866ff2b1e5196d675f4e1c01 100644
--- a/router/java/src/net/i2p/router/util/EventLog.java
+++ b/router/java/src/net/i2p/router/util/EventLog.java
@@ -44,6 +44,7 @@ public class EventLog {
     public static final String NEW_IDENT = "newIdent";
     public static final String NOT_FLOODFILL = "disabledFloodfill";
     public static final String OOM = "oom";
+    public static final String REACHABILITY = "reachability";
     public static final String REKEYED = "rekeyed";
     public static final String RESEED = "reseed";
     public static final String SOFT_RESTART = "softRestart";
diff --git a/router/java/src/org/cybergarage/Dummy.java b/router/java/src/org/cybergarage/Dummy.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7d71c9ad210fba67dce1b88ad1538cf7a52aadb
--- /dev/null
+++ b/router/java/src/org/cybergarage/Dummy.java
@@ -0,0 +1,7 @@
+package org.cybergarage;
+
+/**  
+ * Exists only to enable package.html to be included in javadoc.
+ * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
+ */
+abstract class Dummy {}
diff --git a/router/java/src/org/cybergarage/http/Date.java b/router/java/src/org/cybergarage/http/Date.java
index 117964d34b49b326059d9eeab0ae057cf4c362b9..2b1d8a2f8293d587c7ee4333128e455fe61f2361 100644
--- a/router/java/src/org/cybergarage/http/Date.java
+++ b/router/java/src/org/cybergarage/http/Date.java
@@ -1,165 +1,165 @@
-/******************************************************************
-*
+/******************************************************************
+*
 *	CyberHTTP for Java
 *
 *	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File : Date.java
-*
-*	Revision;
-*
-*	01/05/03
-*		- first revision
-*	10/20/04
-*		- Theo Beisch <theo.beisch@gmx.de>
-*		- Fixed the following methods to use HOUR_OF_DAY instead of HOUR.
-*			getHour(), getDateString() getTimeString()
-*		- Fixed getInstance() to return GMT instance.
-*
+*
+*	File : Date.java
+*
+*	Revision;
+*
+*	01/05/03
+*		- first revision
+*	10/20/04
+*		- Theo Beisch <theo.beisch@gmx.de>
+*		- Fixed the following methods to use HOUR_OF_DAY instead of HOUR.
+*			getHour(), getDateString() getTimeString()
+*		- Fixed getInstance() to return GMT instance.
+*
 ******************************************************************/
-
-package org.cybergarage.http;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-
-public class Date
-{
-	private Calendar cal;
-
-	public Date(Calendar cal)
-	{
-		this.cal = cal;
-	}
-
-	public Calendar getCalendar()
-	{
-		return cal;
-	}
-
-	////////////////////////////////////////////////
-	//	Time
-	////////////////////////////////////////////////
-
-	public int getHour()
-	{
-		// Thanks for Theo Beisch (10/20/04)
-		return getCalendar().get(Calendar.HOUR_OF_DAY);
-	}
-
-	public int getMinute()
-	{
-		return getCalendar().get(Calendar.MINUTE);
-	}
-
-	public int getSecond()
-	{
-		return getCalendar().get(Calendar.SECOND);
-	}
-	
-	////////////////////////////////////////////////
-	//	paint
-	////////////////////////////////////////////////
-
-	public final static Date getLocalInstance()
-	{
-		return new Date(Calendar.getInstance());
-	}
-
-	public final static Date getInstance()
-	{
-		// Thanks for Theo Beisch (10/20/04)
-		return new Date(Calendar.getInstance(TimeZone.getTimeZone("GMT")));
-	}
-	
-	////////////////////////////////////////////////
-	//	getDateString
-	////////////////////////////////////////////////
-
-	public final static String toDateString(int value)
-	{
-		if (value < 10)
-			return "0" + Integer.toString(value);
-		return Integer.toString(value);
-	}
-
-	private final static String MONTH_STRING[] = {
-		"Jan",
-		"Feb",
-		"Mar",
-		"Apr",
-		"May",
-		"Jun",
-		"Jul",
-		"Aug",
-		"Sep",
-		"Oct",
-		"Nov",
-		"Dec",
-	};
-
-	public final static String toMonthString(int value)
-	{
-		value -= Calendar.JANUARY;
-		if (0 <= value && value < 12)
-			return MONTH_STRING[value];
-		return "";
-	}
-	
-	private final static String WEEK_STRING[] = {
-		"Sun",
-		"Mon",
-		"Tue",
-		"Wed",
-		"Thu",
-		"Fri",
-		"Sat",
-	};
-
-	public final static String toWeekString(int value)
-	{
-		value -= Calendar.SUNDAY;
-		if (0 <= value && value < 7)
-			return WEEK_STRING[value];
-		return "";
-	}
-
-	public final static String toTimeString(int value)
-	{
-		String str  = "";
-		if (value < 10)
-			str += "0";
-		str += Integer.toString(value);
-		return str;
-	}
-	
-	public String getDateString()
-	{
-		// Thanks for Theo Beisch (10/20/04)
-		Calendar cal = getCalendar();
-		return
-			toWeekString(cal.get(Calendar.DAY_OF_WEEK)) +", " + 
-			toTimeString(cal.get(Calendar.DATE)) + " " +
-			toMonthString(cal.get(Calendar.MONTH)) + " " +
-			Integer.toString(cal.get(Calendar.YEAR)) + " " +
-			toTimeString(cal.get(Calendar.HOUR_OF_DAY)) + ":" +
-			toTimeString(cal.get(Calendar.MINUTE)) + ":" +
-			toTimeString(cal.get(Calendar.SECOND)) + " GMT";
-	}
-
-	////////////////////////////////////////////////
-	//	getTimeString
-	////////////////////////////////////////////////
-	
-	public String getTimeString()
-	{
-		// Thanks for Theo Beisch (10/20/04)
-		Calendar cal = getCalendar();
-		return
-			toDateString(cal.get(Calendar.HOUR_OF_DAY)) +
-			(((cal.get(Calendar.SECOND) % 2) == 0) ? ":" : " ") +
-			toDateString(cal.get(Calendar.MINUTE));
-	}
-		
-}
-
+
+package org.cybergarage.http;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+public class Date
+{
+	private Calendar cal;
+
+	public Date(Calendar cal)
+	{
+		this.cal = cal;
+	}
+
+	public Calendar getCalendar()
+	{
+		return cal;
+	}
+
+	////////////////////////////////////////////////
+	//	Time
+	////////////////////////////////////////////////
+
+	public int getHour()
+	{
+		// Thanks for Theo Beisch (10/20/04)
+		return getCalendar().get(Calendar.HOUR_OF_DAY);
+	}
+
+	public int getMinute()
+	{
+		return getCalendar().get(Calendar.MINUTE);
+	}
+
+	public int getSecond()
+	{
+		return getCalendar().get(Calendar.SECOND);
+	}
+	
+	////////////////////////////////////////////////
+	//	paint
+	////////////////////////////////////////////////
+
+	public final static Date getLocalInstance()
+	{
+		return new Date(Calendar.getInstance());
+	}
+
+	public final static Date getInstance()
+	{
+		// Thanks for Theo Beisch (10/20/04)
+		return new Date(Calendar.getInstance(TimeZone.getTimeZone("GMT")));
+	}
+	
+	////////////////////////////////////////////////
+	//	getDateString
+	////////////////////////////////////////////////
+
+	public final static String toDateString(int value)
+	{
+		if (value < 10)
+			return "0" + Integer.toString(value);
+		return Integer.toString(value);
+	}
+
+	private final static String MONTH_STRING[] = {
+		"Jan",
+		"Feb",
+		"Mar",
+		"Apr",
+		"May",
+		"Jun",
+		"Jul",
+		"Aug",
+		"Sep",
+		"Oct",
+		"Nov",
+		"Dec",
+	};
+
+	public final static String toMonthString(int value)
+	{
+		value -= Calendar.JANUARY;
+		if (0 <= value && value < 12)
+			return MONTH_STRING[value];
+		return "";
+	}
+	
+	private final static String WEEK_STRING[] = {
+		"Sun",
+		"Mon",
+		"Tue",
+		"Wed",
+		"Thu",
+		"Fri",
+		"Sat",
+	};
+
+	public final static String toWeekString(int value)
+	{
+		value -= Calendar.SUNDAY;
+		if (0 <= value && value < 7)
+			return WEEK_STRING[value];
+		return "";
+	}
+
+	public final static String toTimeString(int value)
+	{
+		String str  = "";
+		if (value < 10)
+			str += "0";
+		str += Integer.toString(value);
+		return str;
+	}
+	
+	public String getDateString()
+	{
+		// Thanks for Theo Beisch (10/20/04)
+		Calendar cal = getCalendar();
+		return
+			toWeekString(cal.get(Calendar.DAY_OF_WEEK)) +", " + 
+			toTimeString(cal.get(Calendar.DATE)) + " " +
+			toMonthString(cal.get(Calendar.MONTH)) + " " +
+			Integer.toString(cal.get(Calendar.YEAR)) + " " +
+			toTimeString(cal.get(Calendar.HOUR_OF_DAY)) + ":" +
+			toTimeString(cal.get(Calendar.MINUTE)) + ":" +
+			toTimeString(cal.get(Calendar.SECOND)) + " GMT";
+	}
+
+	////////////////////////////////////////////////
+	//	getTimeString
+	////////////////////////////////////////////////
+	
+	public String getTimeString()
+	{
+		// Thanks for Theo Beisch (10/20/04)
+		Calendar cal = getCalendar();
+		return
+			toDateString(cal.get(Calendar.HOUR_OF_DAY)) +
+			(((cal.get(Calendar.SECOND) % 2) == 0) ? ":" : " ") +
+			toDateString(cal.get(Calendar.MINUTE));
+	}
+		
+}
+
diff --git a/router/java/src/org/cybergarage/http/HTML.java b/router/java/src/org/cybergarage/http/HTML.java
index 0d06e7ca53862d1d237cbaf7544a5a688dda2ccb..0442494c16d945832786b49aa1b4de699742cdd2 100644
--- a/router/java/src/org/cybergarage/http/HTML.java
+++ b/router/java/src/org/cybergarage/http/HTML.java
@@ -1,22 +1,22 @@
-/******************************************************************
-*
-*	CyberHTTP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: HTML.java
-*
-*	Revision;
-*
-*	01/05/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.http;
-
-public class HTML 
-{
-	public static final String CONTENT_TYPE = "text/html; charset=\"utf-8\"";
-}
-
+/******************************************************************
+*
+*	CyberHTTP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: HTML.java
+*
+*	Revision;
+*
+*	01/05/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.http;
+
+public class HTML 
+{
+	public static final String CONTENT_TYPE = "text/html; charset=\"utf-8\"";
+}
+
diff --git a/router/java/src/org/cybergarage/http/HTTP.java b/router/java/src/org/cybergarage/http/HTTP.java
index 554da7f257f423ec711be699b4ddb895d0c1bcc6..9455436f729f13fdc7fd82f59a92f06fd4c90f61 100644
--- a/router/java/src/org/cybergarage/http/HTTP.java
+++ b/router/java/src/org/cybergarage/http/HTTP.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: HTTP.java
-*
-*	Revision:
-*
-*	11/18/02
-*		- first revision.
+*
+*	Revision:
+*
+*	11/18/02
+*		- first revision.
 *	08/30/03
 *		- Giordano Sassaroli <sassarol@cefriel.it>
 *		- Problem : the method getPort should return the default http port 80 when a port is not specified
@@ -27,58 +27,57 @@
 *		- Added Range and MYNAME;
 *	
 ******************************************************************/
-
+
 package org.cybergarage.http;
-
+
 import java.net.URL;
-
-public class HTTP 
-{
+
+public class HTTP 
+{
 	////////////////////////////////////////////////
 	// Constants
 	////////////////////////////////////////////////
 	
 	public static final String HOST = "HOST";
 	
-	public static final String VERSION = "1.1";
+	public static final String VERSION = "1.1";
 	public static final String VERSION_10 = "1.0";
 	public static final String VERSION_11 = "1.1";
 		
-	public static final String CRLF = "\r\n";
+	public static final String CRLF = "\r\n";
 	public static final byte CR = '\r';
 	public static final byte LF = '\n';
 	public static final String TAB = "\t";
-	
+	
 	public static final String SOAP_ACTION = "SOAPACTION";
 
 	public static final String M_SEARCH = "M-SEARCH";
 	public static final String NOTIFY = "NOTIFY";
-	public static final String POST = "POST";
-	public static final String GET = "GET";
+	public static final String POST = "POST";
+	public static final String GET = "GET";
 	public static final String HEAD = "HEAD";
 	public static final String SUBSCRIBE = "SUBSCRIBE";
 	public static final String UNSUBSCRIBE = "UNSUBSCRIBE";
-	
-	public static final String DATE = "Date";
+	
+	public static final String DATE = "Date";
 	public static final String CACHE_CONTROL = "Cache-Control";
 	public static final String NO_CACHE = "no-cache";
 	public static final String MAX_AGE = "max-age";
 	public static final String CONNECTION = "Connection";
 	public static final String CLOSE = "close";
 	public static final String KEEP_ALIVE = "Keep-Alive";
-	public static final String CONTENT_TYPE = "Content-Type";
+	public static final String CONTENT_TYPE = "Content-Type";
 	public static final String CHARSET = "charset";
-	public static final String CONTENT_LENGTH = "Content-Length";
+	public static final String CONTENT_LENGTH = "Content-Length";
+	public static final String CONTENT_LANGUAGE = "Content-Language";
 	public static final String CONTENT_RANGE = "Content-Range";
 	public static final String CONTENT_RANGE_BYTES = "bytes"; 
-	// Thanks for Brent Hills (10/20/04)
 	public static final String RANGE = "Range";
 	public static final String TRANSFER_ENCODING = "Transfer-Encoding";
 	public static final String CHUNKED = "Chunked";
 	public static final String LOCATION = "Location";
-	public static final String SERVER = "Server";
-
-		 
+	public static final String SERVER = "Server";
+	
 	public static final String ST = "ST";
 	public static final String MX = "MX";
 	public static final String MAN = "MAN";
@@ -90,13 +89,16 @@ public class HTTP
 	public static final String SEQ = "SEQ";
 	public final static String CALLBACK = "CALLBACK";
 	public final static String TIMEOUT = "TIMEOUT";
+	
+	public final static String BOOTID_UPNP_ORG = "BOOTID.UPNP.ORG";
+	
 	// Thanks for Brent Hills (10/20/04)
 	public final static String MYNAME = "MYNAME";
-
-	public static final String REQEST_LINE_DELIM = " ";
-	public static final String HEADER_LINE_DELIM = " :";
-	public static final String STATUS_LINE_DELIM = " ";
-
+
+	public static final String REQEST_LINE_DELIM = " ";
+	public static final String HEADER_LINE_DELIM = " :";
+	public static final String STATUS_LINE_DELIM = " ";
+
 	public static final int DEFAULT_PORT = 80;
 	public static final int DEFAULT_CHUNK_SIZE = 512 * 1024;
 	public static final int DEFAULT_TIMEOUT = 30;
@@ -105,53 +107,53 @@ public class HTTP
 	// URL
 	////////////////////////////////////////////////
 	
-	public static final boolean isAbsoluteURL(String urlStr)
-	{
-		try {
-			new URL(urlStr);
-			return true;
-		}
-		catch (Exception e) {
-			return false;
-		}
-	} 
-
-	public static final String getHost(String urlStr)
-	{
-		try {
-			URL url = new URL(urlStr);
-			return url.getHost();
-		}
-		catch (Exception e) {
-			return "";
-		}
-	}
-
-	public static final int getPort(String urlStr)
-	{
-		try {
-			URL url = new URL(urlStr);
+	public static final boolean isAbsoluteURL(String urlStr)
+	{
+		try {
+			new URL(urlStr);
+			return true;
+		}
+		catch (Exception e) {
+			return false;
+		}
+	} 
+
+	public static final String getHost(String urlStr)
+	{
+		try {
+			URL url = new URL(urlStr);
+			return url.getHost();
+		}
+		catch (Exception e) {
+			return "";
+		}
+	}
+
+	public static final int getPort(String urlStr)
+	{
+		try {
+			URL url = new URL(urlStr);
 			// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (08/30/03)
-			int port = url.getPort();
+			int port = url.getPort();
 			if (port <= 0)
 				port = DEFAULT_PORT;
 			return port;
-		}
-		catch (Exception e) {
-			return DEFAULT_PORT;
-		}
-	}
-
+		}
+		catch (Exception e) {
+			return DEFAULT_PORT;
+		}
+	}
+
 	public static final String getRequestHostURL(String host, int port)
 	{
 		String reqHost = "http://" + host + ":" + port;
 		return reqHost;
 	}
 	
-	public static final String toRelativeURL(String urlStr, boolean withParam)
+	public static final String toRelativeURL(String urlStr, boolean withParam)
 	{
 		String uri = urlStr;
-		if (isAbsoluteURL(urlStr) == false) {
+		if (isAbsoluteURL(urlStr) == false) {
 			if (0 < urlStr.length() && urlStr.charAt(0) != '/') 
 				uri = "/" + urlStr;
 		}
@@ -171,28 +173,28 @@ public class HTTP
 		}
 		return uri;
 	}
-	
+	
 	public static final String toRelativeURL(String urlStr)
 	{
 		return toRelativeURL(urlStr, true);
 	}
-	 	
-	public static final String getAbsoluteURL(String baseURLStr, String relURlStr)
-	{
-		try {
-			URL baseURL = new URL(baseURLStr);
-			String url = 
-				baseURL.getProtocol() + "://" +
-				baseURL.getHost() + ":" +
-				baseURL.getPort() +
-				toRelativeURL(relURlStr);
-			return url;
-		}
-		catch (Exception e) {
-			return "";
-		}
+	 	
+	public static final String getAbsoluteURL(String baseURLStr, String relURlStr)
+	{
+		try {
+			URL baseURL = new URL(baseURLStr);
+			String url = 
+				baseURL.getProtocol() + "://" +
+				baseURL.getHost() + ":" +
+				baseURL.getPort() +
+				toRelativeURL(relURlStr);
+			return url;
+		}
+		catch (Exception e) {
+			return "";
+		}
 	}
-	
+	
 	////////////////////////////////////////////////
 	// Chunk Size
 	////////////////////////////////////////////////
@@ -209,5 +211,5 @@ public class HTTP
 		return chunkSize;
 	}
 	
-}
+}
 
diff --git a/router/java/src/org/cybergarage/http/HTTPHeader.java b/router/java/src/org/cybergarage/http/HTTPHeader.java
index c6b28e17cff9af052d7eca3f8928f474a4b9a8dc..9f3849b0af1f1e18011fd1145b9226c71f48e593 100644
--- a/router/java/src/org/cybergarage/http/HTTPHeader.java
+++ b/router/java/src/org/cybergarage/http/HTTPHeader.java
@@ -5,37 +5,37 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: HTTPHeader.java
-*
-*	Revision;
-*
-*	11/19/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/19/02
+*		- first revision.
 *	05/26/04
 *		- Jan Newmarch <jan.newmarch@infotech.monash.edu.au> (05/26/04)
 *		- Fixed getValue() to compare using String::equals() instead of String::startWidth().
 *	
 ******************************************************************/
-
+
 package org.cybergarage.http;
-
+
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.StringReader;
 import java.util.Locale;
 
 import org.cybergarage.util.Debug;
-
-public class HTTPHeader 
+
+public class HTTPHeader 
 {
-	private static int MAX_LENGTH = 1024;
-	private String name;
-	private String value;
-
-	public HTTPHeader(String name, String value)
-	{
-		setName(name);
-		setValue(value);
-	}
+	private static int MAX_LENGTH = 1024;
+	private String name;
+	private String value;
+
+	public HTTPHeader(String name, String value)
+	{
+		setName(name);
+		setValue(value);
+	}
 
 	public HTTPHeader(String lineStr)
 	{
@@ -51,30 +51,30 @@ public class HTTPHeader
 		setName(name.trim());
 		setValue(value.trim());
 	}
-
+
 	////////////////////////////////////////////////
 	//	Member
 	////////////////////////////////////////////////
 	
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-		
-	public void setValue(String value)
-	{
-		this.value = value;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public String getValue()
-	{
-		return value;
-	}
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+		
+	public void setValue(String value)
+	{
+		this.value = value;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	public String getValue()
+	{
+		return value;
+	}
 
 	public boolean hasName()
 	{
@@ -82,68 +82,68 @@ public class HTTPHeader
 			return false;
 		return true;
 	}
-	
-	////////////////////////////////////////////////
-	//	static methods
-	////////////////////////////////////////////////
-	
-	public final static String getValue(LineNumberReader reader, String name)
-	{
-		String bigName = name.toUpperCase(Locale.US);
-		try {
-			String lineStr = reader.readLine();
-			while (lineStr != null && 0 < lineStr.length()) {
+	
+	////////////////////////////////////////////////
+	//	static methods
+	////////////////////////////////////////////////
+	
+	public final static String getValue(LineNumberReader reader, String name)
+	{
+		String bigName = name.toUpperCase(Locale.US);
+		try {
+			String lineStr = reader.readLine();
+			while (lineStr != null && 0 < lineStr.length()) {
 				HTTPHeader header = new HTTPHeader(lineStr);
-				if (header.hasName() == false) {
-					 lineStr = reader.readLine();
-					continue;
-				}
+				if (header.hasName() == false) {
+					 lineStr = reader.readLine();
+					continue;
+				}
 				String bigLineHeaderName = header.getName().toUpperCase(Locale.US);
-				// Thanks for Jan Newmarch <jan.newmarch@infotech.monash.edu.au> (05/26/04)
-				if (bigLineHeaderName.equals(bigName) == false) {
-					 lineStr = reader.readLine();
-					 continue;
-				}
-				return header.getValue();
-			}
-		}
+				// Thanks for Jan Newmarch <jan.newmarch@infotech.monash.edu.au> (05/26/04)
+				if (bigLineHeaderName.equals(bigName) == false) {
+					 lineStr = reader.readLine();
+					 continue;
+				}
+				return header.getValue();
+			}
+		}
 		catch (IOException e) {
-			Debug.warning(e);
-			return "";
-		}
-		return "";
-	}
-
-	public final static String getValue(String data, String name)
+			Debug.warning(e);
+			return "";
+		}
+		return "";
+	}
+
+	public final static String getValue(String data, String name)
 	{
-		/* Thanks for Stephan Mehlhase (2010-10-26) */
+		/* Thanks for Stephan Mehlhase (2010-10-26) */
 		StringReader strReader = new StringReader(data);
 		LineNumberReader lineReader = new LineNumberReader(strReader, Math.min(data.length(), MAX_LENGTH));
-		return getValue(lineReader, name);
-	}
-
-	public final static String getValue(byte[] data, String name)
-	{
-		return getValue(new String(data), name);
-	}
-
-	public final static int getIntegerValue(String data, String name)
+		return getValue(lineReader, name);
+	}
+
+	public final static String getValue(byte[] data, String name)
+	{
+		return getValue(new String(data), name);
+	}
+
+	public final static int getIntegerValue(String data, String name)
 	{
 		try {
 			return Integer.parseInt(getValue(data, name));
 		}
 		catch (Exception e) {
 			return 0;
-		}
-	}
-
-	public final static int getIntegerValue(byte[] data, String name)
-	{
+		}
+	}
+
+	public final static int getIntegerValue(byte[] data, String name)
+	{
 		try {
 			return Integer.parseInt(getValue(data, name));
 		}
 		catch (Exception e) {
 			return 0;
 		}
-	}
+	}
 }
diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java
index e90c9fd4b0134a602c9b76c653fba122bdd86164..5d26279f5dfc87d569789db5654b08ab0d66d4d3 100644
--- a/router/java/src/org/cybergarage/http/HTTPPacket.java
+++ b/router/java/src/org/cybergarage/http/HTTPPacket.java
@@ -610,6 +610,20 @@ public class HTTPPacket
 		return getHeaderValue(HTTP.CONTENT_TYPE);
 	}
 
+	////////////////////////////////////////////////
+	//	ContentLanguage
+	////////////////////////////////////////////////
+
+	public void setContentLanguage(String code)
+	{
+		setHeader(HTTP.CONTENT_LANGUAGE, code);
+	}
+
+	public String getContentLanguage()
+	{
+		return getHeaderValue(HTTP.CONTENT_LANGUAGE);
+	}
+	
 	////////////////////////////////////////////////
 	//	Charset
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/http/HTTPRequest.java b/router/java/src/org/cybergarage/http/HTTPRequest.java
index 21cde6b7889c7fd679a701be675e92c31ec1dbc0..990429f6781bf6fa7ff4cdb8440b0831b3ab41fb 100644
--- a/router/java/src/org/cybergarage/http/HTTPRequest.java
+++ b/router/java/src/org/cybergarage/http/HTTPRequest.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002-2004
 *
 *	File: HTTPRequest.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
 *	05/23/03
 *		- Giordano Sassaroli <sassarol@cefriel.it>
 *		- Add a relative URL check to setURI().
@@ -51,9 +51,9 @@
 *		- Fixed post() to output the chunk size as a hex string.
 *
 ******************************************************************/
-
+
 package org.cybergarage.http;
-
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -73,17 +73,17 @@ import org.cybergarage.util.Debug;
  * @author Stefano "Kismet" Lenzi
  * @version 1.8
  *
- */
-public class HTTPRequest extends HTTPPacket
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public HTTPRequest()
-	{
+ */
+public class HTTPRequest extends HTTPPacket
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public HTTPRequest()
+	{
 		setVersion(HTTP.VERSION_10);
-	}
+	}
 
 	public HTTPRequest(InputStream in)
 	{
@@ -96,23 +96,23 @@ public class HTTPRequest extends HTTPPacket
 		setSocket(httpSock);
 	}
 
-	////////////////////////////////////////////////
-	//	Method
-	////////////////////////////////////////////////
-
-	private String method = null;
-
-	public void setMethod(String value)
-	{
-		method = value;
-	}
-		
-	public String getMethod()
-	{
-		if (method != null)
+	////////////////////////////////////////////////
+	//	Method
+	////////////////////////////////////////////////
+
+	private String method = null;
+
+	public void setMethod(String value)
+	{
+		method = value;
+	}
+		
+	public String getMethod()
+	{
+		if (method != null)
 			return method;
-		return getFirstLineToken(0);
-	}
+		return getFirstLineToken(0);
+	}
 
 	public boolean isMethod(String method)
 	{
@@ -121,16 +121,16 @@ public class HTTPRequest extends HTTPPacket
 			return false;
 		return headerMethod.equalsIgnoreCase(method);
 	}
-
-	public boolean isGetRequest()
+
+	public boolean isGetRequest()
+	{
+		return isMethod(HTTP.GET);
+	}
+
+	public boolean isPostRequest()
 	{
-		return isMethod(HTTP.GET);
-	}
-
-	public boolean isPostRequest()
-	{
 		return isMethod(HTTP.POST);
-	}
+	}
 
 	public boolean isHeadRequest()
 	{
@@ -152,33 +152,33 @@ public class HTTPRequest extends HTTPPacket
 		return isMethod(HTTP.NOTIFY);
 	}
  
-	////////////////////////////////////////////////
-	//	URI
-	////////////////////////////////////////////////
-
-	private String uri = null;
-
-	public void setURI(String value, boolean isCheckRelativeURL)
-	{
+	////////////////////////////////////////////////
+	//	URI
+	////////////////////////////////////////////////
+
+	private String uri = null;
+
+	public void setURI(String value, boolean isCheckRelativeURL)
+	{
 		uri = value;
 		if (isCheckRelativeURL == false)
 			return;
 		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/02/03)
 		uri = HTTP.toRelativeURL(uri);
-	}
+	}
 
 	public void setURI(String value)
 	{
 		setURI(value, false);
 	}
 
-	public String getURI()
+	public String getURI()
 	{
-		if (uri != null)
-			return uri;
+		if (uri != null)
+			return uri;
 		return getFirstLineToken(1);
-	}
-
+	}
+
 	////////////////////////////////////////////////
 	//	URI Parameter
 	////////////////////////////////////////////////
@@ -247,21 +247,21 @@ public class HTTPRequest extends HTTPPacket
 		return requestPort;
 	}
 	
-	////////////////////////////////////////////////
-	//	Socket
-	////////////////////////////////////////////////
-
-	private HTTPSocket httpSocket = null;
-
-	public void setSocket(HTTPSocket value)
-	{
-		httpSocket = value;
-	}
-		
-	public HTTPSocket getSocket()
-	{
-		return httpSocket;
-	}
+	////////////////////////////////////////////////
+	//	Socket
+	////////////////////////////////////////////////
+
+	private HTTPSocket httpSocket = null;
+
+	public void setSocket(HTTPSocket value)
+	{
+		httpSocket = value;
+	}
+		
+	public HTTPSocket getSocket()
+	{
+		return httpSocket;
+	}
 
 	/////////////////////////// /////////////////////
 	//	local address/port
@@ -276,25 +276,25 @@ public class HTTPRequest extends HTTPPacket
 	{
 		return getSocket().getLocalPort();	
 	}
-
-	////////////////////////////////////////////////
-	//	parseRequest
-	////////////////////////////////////////////////
-
-	public boolean parseRequestLine(String lineStr)
-	{
-		StringTokenizer st = new StringTokenizer(lineStr, HTTP.REQEST_LINE_DELIM);
-		if (st.hasMoreTokens() == false)
-			return false;
-		setMethod(st.nextToken());
-		if (st.hasMoreTokens() == false)
-			return false;
-		setURI(st.nextToken());
-		if (st.hasMoreTokens() == false)
-			return false;
-		setVersion(st.nextToken());
-		return true;
-     }
+
+	////////////////////////////////////////////////
+	//	parseRequest
+	////////////////////////////////////////////////
+
+	public boolean parseRequestLine(String lineStr)
+	{
+		StringTokenizer st = new StringTokenizer(lineStr, HTTP.REQEST_LINE_DELIM);
+		if (st.hasMoreTokens() == false)
+			return false;
+		setMethod(st.nextToken());
+		if (st.hasMoreTokens() == false)
+			return false;
+		setURI(st.nextToken());
+		if (st.hasMoreTokens() == false)
+			return false;
+		setVersion(st.nextToken());
+		return true;
+     }
 
 	////////////////////////////////////////////////
 	//	First Line
@@ -312,22 +312,22 @@ public class HTTPRequest extends HTTPPacket
 		return getMethod() + " " + getURI() + " " + getHTTPVersion() + HTTP.CRLF;
 	}
 
-	////////////////////////////////////////////////
-	//	getHeader
-	////////////////////////////////////////////////
-	
-	public String getHeader()
-	{
-		StringBuffer str = new StringBuffer();
-		
-		str.append(getFirstLineString());
-		
+	////////////////////////////////////////////////
+	//	getHeader
+	////////////////////////////////////////////////
+	
+	public String getHeader()
+	{
+		StringBuffer str = new StringBuffer();
+		
+		str.append(getFirstLineString());
+		
 		String headerString  = getHeaderString();		
 		str.append(headerString);
-		
-		return str.toString();
-	}
-	
+		
+		return str.toString();
+	}
+	
 	////////////////////////////////////////////////
 	//	isKeepAlive
 	////////////////////////////////////////////////
@@ -354,9 +354,9 @@ public class HTTPRequest extends HTTPPacket
 		return super.read(getSocket());
 	}
 	
-	////////////////////////////////////////////////
-	//	POST (Response)
-	////////////////////////////////////////////////
+	////////////////////////////////////////////////
+	//	POST (Response)
+	////////////////////////////////////////////////
 
 	public boolean post(HTTPResponse httpRes)
 	{
@@ -381,15 +381,15 @@ public class HTTPRequest extends HTTPPacket
 		return httpSock.post(httpRes, offset, length, isHeadRequest());
 		//httpSock.close();
 	}
-
+
 	////////////////////////////////////////////////
 	//	POST (Request)
 	////////////////////////////////////////////////
 	
 	private Socket postSocket = null;
 	
-	public HTTPResponse post(String host, int port, boolean isKeepAlive)
-	{
+	public HTTPResponse post(String host, int port, boolean isKeepAlive)
+	{
 		HTTPResponse httpRes = new HTTPResponse();
 
 		setHost(host);
@@ -418,9 +418,9 @@ public class HTTPRequest extends HTTPPacket
 				postSocket.connect(sa, 3000);
 			}
 
-			out = postSocket.getOutputStream();
-			PrintStream pout = new PrintStream(out);
-			pout.print(getHeader());
+			out = postSocket.getOutputStream();
+			PrintStream pout = new PrintStream(out);
+			pout.print(getHeader());
 			pout.print(HTTP.CRLF);
 			
 			boolean isChunkedRequest = isChunked();
@@ -429,7 +429,7 @@ public class HTTPRequest extends HTTPPacket
 			int contentLength = 0;
 			if (content != null)
 				contentLength = content.length();
-			
+			
 			if (0 < contentLength) {
 				if (isChunkedRequest == true) {
 					// Thanks for Lee Peik Feng <pflee@users.sourceforge.net> (07/07/05)
@@ -447,7 +447,7 @@ public class HTTPRequest extends HTTPPacket
 				pout.print(HTTP.CRLF);
 			}
 			
-			pout.flush();
+			pout.flush();
 
 			in = postSocket.getInputStream();
 			httpRes.set(in, isHeaderRequest);		
@@ -477,7 +477,7 @@ public class HTTPRequest extends HTTPPacket
 		}
 		
 		return httpRes;
-	}
+	}
 
 	public HTTPResponse post(String host, int port)
 	{
@@ -516,20 +516,20 @@ public class HTTPRequest extends HTTPPacket
 		return returnResponse(HTTPStatus.BAD_REQUEST);
 	}
 
-	////////////////////////////////////////////////
-	//	toString
-	////////////////////////////////////////////////
-	
-	public String toString()
-	{
-		StringBuffer str = new StringBuffer();
-
-		str.append(getHeader());
-		str.append(HTTP.CRLF);
-		str.append(getContentString());
-		
-		return str.toString();
-	}
+	////////////////////////////////////////////////
+	//	toString
+	////////////////////////////////////////////////
+	
+	public String toString()
+	{
+		StringBuffer str = new StringBuffer();
+
+		str.append(getHeader());
+		str.append(HTTP.CRLF);
+		str.append(getContentString());
+		
+		return str.toString();
+	}
 
 	public void print()
 	{
diff --git a/router/java/src/org/cybergarage/http/HTTPRequestListener.java b/router/java/src/org/cybergarage/http/HTTPRequestListener.java
index 12fcf349ed4db18331ce073c10e3761a31894a95..2612a92830006353f5527a50390679076a9c3689 100644
--- a/router/java/src/org/cybergarage/http/HTTPRequestListener.java
+++ b/router/java/src/org/cybergarage/http/HTTPRequestListener.java
@@ -5,17 +5,17 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: HTTPRequestListener.java
-*
-*	Revision;
-*
-*	12/13/02
-*		- first revision.
+*
+*	Revision;
+*
+*	12/13/02
+*		- first revision.
 *	
 ******************************************************************/
-
-package org.cybergarage.http;
-
-public interface HTTPRequestListener
-{
-	public void httpRequestRecieved(HTTPRequest httpReq);
+
+package org.cybergarage.http;
+
+public interface HTTPRequestListener
+{
+	public void httpRequestRecieved(HTTPRequest httpReq);
 }
diff --git a/router/java/src/org/cybergarage/http/HTTPResponse.java b/router/java/src/org/cybergarage/http/HTTPResponse.java
index 8c9c2509140f5d0627a94d67d2356d72e068f0ed..32c42764e7a6d17ed02966de142b5e5df363f798 100644
--- a/router/java/src/org/cybergarage/http/HTTPResponse.java
+++ b/router/java/src/org/cybergarage/http/HTTPResponse.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002-2003
 *
 *	File: HTTPResponse.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
 *	10/22/03
 *		- Changed to initialize a content length header.
 *	10/22/04
@@ -17,24 +17,24 @@
 *	
 ******************************************************************/
 
-package org.cybergarage.http;
+package org.cybergarage.http;
 
 import java.io.InputStream;
 import org.cybergarage.util.Debug;
-
-public class HTTPResponse extends HTTPPacket
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public HTTPResponse()
-	{
+
+public class HTTPResponse extends HTTPPacket
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public HTTPResponse()
+	{
 		setVersion(HTTP.VERSION_11);
 		setContentType(HTML.CONTENT_TYPE);
 		setServer(HTTPServer.getName());
 		setContent("");
-	}
+	}
 
 	public HTTPResponse(HTTPResponse httpRes)
 	{
@@ -50,25 +50,25 @@ public class HTTPResponse extends HTTPPacket
 	{
 		this(httpSock.getInputStream());
 	}
-
-	////////////////////////////////////////////////
-	//	Status Line
-	////////////////////////////////////////////////
+
+	////////////////////////////////////////////////
+	//	Status Line
+	////////////////////////////////////////////////
 
 	private int statusCode = 0;
-	
-	public void setStatusCode(int code)
+	
+	public void setStatusCode(int code)
 	{
-		statusCode = code;
-	}
-
-	public int getStatusCode()
+		statusCode = code;
+	}
+
+	public int getStatusCode()
 	{
 		if (statusCode != 0)
-			return statusCode;
+			return statusCode;
 		HTTPStatus httpStatus = new HTTPStatus(getFirstLine());
-		return httpStatus.getStatusCode();
-	}
+		return httpStatus.getStatusCode();
+	}
 
 	public boolean isSuccessful()
 	{
@@ -79,20 +79,20 @@ public class HTTPResponse extends HTTPPacket
 	{
 		return "HTTP/" + getVersion() + " " + getStatusCode() + " " + HTTPStatus.code2String(statusCode) + HTTP.CRLF;
 	}
-	
-	////////////////////////////////////////////////
-	//	getHeader
-	////////////////////////////////////////////////
-	
-	public String getHeader()
-	{
-		StringBuffer str = new StringBuffer();
-	
-		str.append(getStatusLineString());
+	
+	////////////////////////////////////////////////
+	//	getHeader
+	////////////////////////////////////////////////
+	
+	public String getHeader()
+	{
+		StringBuffer str = new StringBuffer();
+	
+		str.append(getStatusLineString());
 		str.append(getHeaderString());
-		
-		return str.toString();
-	}
+		
+		return str.toString();
+	}
 
 	////////////////////////////////////////////////
 	//	toString
diff --git a/router/java/src/org/cybergarage/http/HTTPServerThread.java b/router/java/src/org/cybergarage/http/HTTPServerThread.java
index 70524edbe3ec9e0c90d95ed083d989746eaee0bb..7ce1941b5a4842fefbbbefd4d097a5fcbdca8f1e 100644
--- a/router/java/src/org/cybergarage/http/HTTPServerThread.java
+++ b/router/java/src/org/cybergarage/http/HTTPServerThread.java
@@ -1,54 +1,54 @@
-/******************************************************************
-*
-*	CyberHTTP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: HTTPServerThread.java
-*
-*	Revision;
-*
-*	10/10/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.http;
-
-import java.net.Socket;
-
-public class HTTPServerThread extends Thread
-{
-	private HTTPServer httpServer;
-	private Socket sock;
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public HTTPServerThread(HTTPServer httpServer, Socket sock)
-	{
-        super("Cyber.HTTPServerThread");
-		this.httpServer = httpServer;
-		this.sock = sock;
-	}
-
-	////////////////////////////////////////////////
-	//	run	
-	////////////////////////////////////////////////
-
-	public void run()
-	{
-		HTTPSocket httpSock = new HTTPSocket(sock);
-		if (httpSock.open() == false)
-			return;
-		HTTPRequest httpReq = new HTTPRequest();
-		httpReq.setSocket(httpSock);
-		while (httpReq.read() == true) {
-			httpServer.performRequestListener(httpReq);
-			if (httpReq.isKeepAlive() == false)
-				break;
-		}
-		httpSock.close();
-	}
-}
+/******************************************************************
+*
+*	CyberHTTP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: HTTPServerThread.java
+*
+*	Revision;
+*
+*	10/10/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.http;
+
+import java.net.Socket;
+
+public class HTTPServerThread extends Thread
+{
+	private HTTPServer httpServer;
+	private Socket sock;
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public HTTPServerThread(HTTPServer httpServer, Socket sock)
+	{
+        super("Cyber.HTTPServerThread");
+		this.httpServer = httpServer;
+		this.sock = sock;
+	}
+
+	////////////////////////////////////////////////
+	//	run	
+	////////////////////////////////////////////////
+
+	public void run()
+	{
+		HTTPSocket httpSock = new HTTPSocket(sock);
+		if (httpSock.open() == false)
+			return;
+		HTTPRequest httpReq = new HTTPRequest();
+		httpReq.setSocket(httpSock);
+		while (httpReq.read() == true) {
+			httpServer.performRequestListener(httpReq);
+			if (httpReq.isKeepAlive() == false)
+				break;
+		}
+		httpSock.close();
+	}
+}
diff --git a/router/java/src/org/cybergarage/http/HTTPStatus.java b/router/java/src/org/cybergarage/http/HTTPStatus.java
index 651fecb34b974a5eee27061c2eaf5f35d5653736..50af3cbd6e835bac11fde91ad3a14c5996af308e 100644
--- a/router/java/src/org/cybergarage/http/HTTPStatus.java
+++ b/router/java/src/org/cybergarage/http/HTTPStatus.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: HTTPStatus.java
-*
-*	Revision;
-*
-*	12/17/02
-*		- first revision.
+*
+*	Revision;
+*
+*	12/17/02
+*		- first revision.
 *	09/03/03
 *		- Added CONTINUE_STATUS.
 *	10/20/04 
@@ -22,105 +22,105 @@
 *		- Fixed set() to read multi words of the response sring such as Not Found.
 *	
 ******************************************************************/
-
+
 package org.cybergarage.http;
-
+
 import java.util.StringTokenizer;
 
 import org.cybergarage.util.Debug;
-
-public class HTTPStatus 
-{
-	////////////////////////////////////////////////
-	//	Code
-	////////////////////////////////////////////////
-	
+
+public class HTTPStatus 
+{
+	////////////////////////////////////////////////
+	//	Code
+	////////////////////////////////////////////////
+	
 	public static final int CONTINUE = 100;
-	public static final int OK = 200;
+	public static final int OK = 200;
 	//	Thanks for Brent Hills (10/20/04)
 	public static final int PARTIAL_CONTENT = 206;
-	public static final int BAD_REQUEST = 400;
+	public static final int BAD_REQUEST = 400;
 	public static final int NOT_FOUND = 404;
 	public static final int PRECONDITION_FAILED = 412;
 	//	Thanks for Brent Hills (10/20/04)
 	public static final int INVALID_RANGE = 416;
 	public static final int INTERNAL_SERVER_ERROR = 500;
 
-	public static final String code2String(int code)
-	{
-		switch (code) {
+	public static final String code2String(int code)
+	{
+		switch (code) {
 		case CONTINUE: return "Continue";
-		case OK: return "OK";
+		case OK: return "OK";
 		case PARTIAL_CONTENT: return "Partial Content";
 		case BAD_REQUEST: return "Bad Request";
 		case NOT_FOUND: return "Not Found";
 		case PRECONDITION_FAILED: return "Precondition Failed";
 		case INVALID_RANGE: return "Invalid Range";
 		case INTERNAL_SERVER_ERROR: return "Internal Server Error";
-		}
-		 return "";
-	}
- 	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public HTTPStatus()
-	{
-		setVersion("");
-		setStatusCode(0);
-		setReasonPhrase("");
-	}
-	
-	public HTTPStatus(String ver, int code, String reason)
-	{
-		setVersion(ver);
-		setStatusCode(code);
-		setReasonPhrase(reason);
-	}
+		}
+		 return "";
+	}
+ 	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public HTTPStatus()
+	{
+		setVersion("");
+		setStatusCode(0);
+		setReasonPhrase("");
+	}
+	
+	public HTTPStatus(String ver, int code, String reason)
+	{
+		setVersion(ver);
+		setStatusCode(code);
+		setReasonPhrase(reason);
+	}
 
 	public HTTPStatus(String lineStr)
 	{
 		set(lineStr);
 	}
 	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private String version = "";
-	private int statusCode = 0;
-	private String reasonPhrase = "";
-
-	public void setVersion(String value)
-	{
-		version = value;
-	}
-	
-	public void setStatusCode(int value)
-	{
-		statusCode = value;
-	}
-	
-	public void setReasonPhrase(String value)
-	{
-		reasonPhrase = value;
-	}
-	
-	public String getVersion()
-	{
-		return version;
-	}
-	
-	public int getStatusCode()
-	{
-		return statusCode;
-	}
-	
-	public String getReasonPhrase()
-	{
-		return reasonPhrase;
-	}
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private String version = "";
+	private int statusCode = 0;
+	private String reasonPhrase = "";
+
+	public void setVersion(String value)
+	{
+		version = value;
+	}
+	
+	public void setStatusCode(int value)
+	{
+		statusCode = value;
+	}
+	
+	public void setReasonPhrase(String value)
+	{
+		reasonPhrase = value;
+	}
+	
+	public String getVersion()
+	{
+		return version;
+	}
+	
+	public int getStatusCode()
+	{
+		return statusCode;
+	}
+	
+	public String getReasonPhrase()
+	{
+		return reasonPhrase;
+	}
 
 	////////////////////////////////////////////////
 	//	Status
diff --git a/router/java/src/org/cybergarage/http/Parameter.java b/router/java/src/org/cybergarage/http/Parameter.java
index fb29ae994fe07ca3cabd5f59487aa1f9c247fd07..2ad834070450d180b90651c1c2904e1aa7138345 100644
--- a/router/java/src/org/cybergarage/http/Parameter.java
+++ b/router/java/src/org/cybergarage/http/Parameter.java
@@ -1,61 +1,61 @@
-/******************************************************************
-*
-*	CyberHTTP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: Parameter.java
-*
-*	Revision;
-*
-*	02/01/04
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.http;
-
-public class Parameter 
-{
-	private String name = new String(); 
-	private String value = new String(); 
-
-	public Parameter() 
-	{
-	}
-
-	public Parameter(String name, String value) 
-	{
-		setName(name);
-		setValue(value);
-	}
-
-	////////////////////////////////////////////////
-	//	name
-	////////////////////////////////////////////////
-
-	public void setName(String name) 
-	{
-		this.name = name;
-	}
-
-	public String getName() 
-	{
-		return name;
-	}
-
-	////////////////////////////////////////////////
-	//	value
-	////////////////////////////////////////////////
-
-	public void setValue(String value) 
-	{
-		this.value = value;
-	}
-
-	public String getValue() 
-	{
-		return value;
-	}
-}
-
+/******************************************************************
+*
+*	CyberHTTP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: Parameter.java
+*
+*	Revision;
+*
+*	02/01/04
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.http;
+
+public class Parameter 
+{
+	private String name = new String(); 
+	private String value = new String(); 
+
+	public Parameter() 
+	{
+	}
+
+	public Parameter(String name, String value) 
+	{
+		setName(name);
+		setValue(value);
+	}
+
+	////////////////////////////////////////////////
+	//	name
+	////////////////////////////////////////////////
+
+	public void setName(String name) 
+	{
+		this.name = name;
+	}
+
+	public String getName() 
+	{
+		return name;
+	}
+
+	////////////////////////////////////////////////
+	//	value
+	////////////////////////////////////////////////
+
+	public void setValue(String value) 
+	{
+		this.value = value;
+	}
+
+	public String getValue() 
+	{
+		return value;
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/http/ParameterList.java b/router/java/src/org/cybergarage/http/ParameterList.java
index b629c11ebd4bb5a15f643582a8fea8d8485b2d02..9c1ad484827f01d2733dd59515bcd09e5f7ff84f 100644
--- a/router/java/src/org/cybergarage/http/ParameterList.java
+++ b/router/java/src/org/cybergarage/http/ParameterList.java
@@ -1,58 +1,58 @@
-/******************************************************************
-*
-*	CyberHTTP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: ParameterList.java
-*
-*	Revision;
-*
-*	02/01/04
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.http;
-
-import java.util.Vector;
-
-public class ParameterList extends Vector<Parameter> 
-{
-	public ParameterList() 
-	{
-	}
-	
-	public Parameter at(int n)
-	{
-		return (Parameter)get(n);
-	}
-
-	public Parameter getParameter(int n)
-	{
-		return (Parameter)get(n);
-	}
-	
-	public Parameter getParameter(String name) 
-	{
-		if (name == null)
-			return null;
-		
-		int nLists = size(); 
-		for (int n=0; n<nLists; n++) {
-			Parameter param = at(n);
-			if (name.compareTo(param.getName()) == 0)
-				return param;
-		}
-		return null;
-	}
-
-	public String getValue(String name) 
-	{
-		Parameter param = getParameter(name);
-		if (param == null)
-			return "";
-		return param.getValue();
-	}
-}
-
+/******************************************************************
+*
+*	CyberHTTP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: ParameterList.java
+*
+*	Revision;
+*
+*	02/01/04
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.http;
+
+import java.util.Vector;
+
+public class ParameterList extends Vector<Parameter> 
+{
+	public ParameterList() 
+	{
+	}
+	
+	public Parameter at(int n)
+	{
+		return (Parameter)get(n);
+	}
+
+	public Parameter getParameter(int n)
+	{
+		return (Parameter)get(n);
+	}
+	
+	public Parameter getParameter(String name) 
+	{
+		if (name == null)
+			return null;
+		
+		int nLists = size(); 
+		for (int n=0; n<nLists; n++) {
+			Parameter param = at(n);
+			if (name.compareTo(param.getName()) == 0)
+				return param;
+		}
+		return null;
+	}
+
+	public String getValue(String name) 
+	{
+		Parameter param = getParameter(name);
+		if (param == null)
+			return "";
+		return param.getValue();
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/net/HostInterface.java b/router/java/src/org/cybergarage/net/HostInterface.java
index 8a909016d32666f62978b6b1402e6d669f3aa953..4b308d8ce5d457a67219092dc0bef3b7064cb406 100644
--- a/router/java/src/org/cybergarage/net/HostInterface.java
+++ b/router/java/src/org/cybergarage/net/HostInterface.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002-2003
 *
 *	File: HostInterface.java
-*
-*	Revision;
-*
-*	05/12/03
-*		- first revision.
+*
+*	Revision;
+*
+*	05/12/03
+*		- first revision.
 *	05/13/03
 *		- Added support for IPv6 and loopback address.
 *	02/15/04
@@ -22,9 +22,9 @@
 *		- Changed isUseAddress() to isUsableAddress().
 *	
 ******************************************************************/
-
-package org.cybergarage.net;
-
+
+package org.cybergarage.net;
+
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -35,9 +35,9 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 import org.cybergarage.util.Debug;
-
-public class HostInterface
-{
+
+public class HostInterface
+{
 	////////////////////////////////////////////////
 	//	Constants
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/package.html b/router/java/src/org/cybergarage/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..379ce53a040f12009fee34598871295f3cc69b79
--- /dev/null
+++ b/router/java/src/org/cybergarage/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+The cybergarage cyberlink UPnP library version 3.0, with minor mods for I2P.
+</p>
+</body>
+</html>
diff --git a/router/java/src/org/cybergarage/soap/SOAP.java b/router/java/src/org/cybergarage/soap/SOAP.java
index bc44b35a8205644985eb011a0b8478b4c2224dcb..e3e46fa0ed9da0356c5c9ee9f518df772ffc47e1 100644
--- a/router/java/src/org/cybergarage/soap/SOAP.java
+++ b/router/java/src/org/cybergarage/soap/SOAP.java
@@ -5,45 +5,45 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: SOAP.java
-*
-*	Revision;
-*
-*	12/11/02
-*		- first revision.
+*
+*	Revision;
+*
+*	12/11/02
+*		- first revision.
 *	
 ******************************************************************/
-
-package org.cybergarage.soap;
+
+package org.cybergarage.soap;
 
 import org.cybergarage.xml.Node;
 import org.cybergarage.xml.Parser;
-
-public class SOAP
-{
-	public static final String ENVELOPE = "Envelope";
-	public static final String BODY = "Body";
-	public static final String RESPONSE = "Response";
-	public static final String FAULT = "Fault";
-	public static final String FAULT_CODE = "faultcode";
-	public static final String FAULT_STRING = "faultstring";
-	public static final String FAULTACTOR = "faultactor";
-	public static final String DETAIL = "detail";
-		
-	public static final String RESULTSTATUS = "ResultStatus";
-	public static final String UPNP_ERROR = "UPnPError";
-	public static final String ERROR_CODE = "errorCode";
-	public static final String ERROR_DESCRIPTION = "errorDescription";
-
-	//public static final String XMLNS = "SOAP-ENV";
-	public static final String XMLNS = "s";
-	public static final String METHODNS = "u";
+
+public class SOAP
+{
+	public static final String ENVELOPE = "Envelope";
+	public static final String BODY = "Body";
+	public static final String RESPONSE = "Response";
+	public static final String FAULT = "Fault";
+	public static final String FAULT_CODE = "faultcode";
+	public static final String FAULT_STRING = "faultstring";
+	public static final String FAULTACTOR = "faultactor";
+	public static final String DETAIL = "detail";
+		
+	public static final String RESULTSTATUS = "ResultStatus";
+	public static final String UPNP_ERROR = "UPnPError";
+	public static final String ERROR_CODE = "errorCode";
+	public static final String ERROR_DESCRIPTION = "errorDescription";
+
+	//public static final String XMLNS = "SOAP-ENV";
+	public static final String XMLNS = "s";
+	public static final String METHODNS = "u";
 	public static final String DELIM = ":";
-	
-	public static final String XMLNS_URL = "http://schemas.xmlsoap.org/soap/envelope/";
-	public static final String ENCSTYLE_URL = "http://schemas.xmlsoap.org/soap/encoding/";
-	
-	public static final String CONTENT_TYPE = "text/xml; charset=\"utf-8\"";
-	public static final String VERSION_HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+	
+	public static final String XMLNS_URL = "http://schemas.xmlsoap.org/soap/envelope/";
+	public static final String ENCSTYLE_URL = "http://schemas.xmlsoap.org/soap/encoding/";
+	
+	public static final String CONTENT_TYPE = "text/xml; charset=\"utf-8\"";
+	public static final String VERSION_HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 
 	////////////////////////////////////////////////
 	//	createEnvelopeBodyNode
@@ -78,5 +78,5 @@ public class SOAP
 	{
 		return xmlParser;
 	}
-}
+}
 
diff --git a/router/java/src/org/cybergarage/soap/SOAPRequest.java b/router/java/src/org/cybergarage/soap/SOAPRequest.java
index f355b0a92e28280684837f452c73320a8ea97a45..06448ffc2db5b4a3f1b031c3bd7b9b7264b0b894 100644
--- a/router/java/src/org/cybergarage/soap/SOAPRequest.java
+++ b/router/java/src/org/cybergarage/soap/SOAPRequest.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: SOAPRequest.java
-*
-*	Revision;
-*
-*	12/11/02
-*		- first revision.
+*
+*	Revision;
+*
+*	12/11/02
+*		- first revision.
 *	02/13/04
 *		- Ralf G. R. Bergs <Ralf@Ber.gs>, Inma Marin Lopez <inma@dif.um.es>.
 *		- Added XML header, <?xml version=\"1.0\"?> to setContent().
@@ -17,9 +17,9 @@
 *		- Changed the XML header to <?xml version="1.0" encoding="utf-8"?> in setContent().
 *	
 ******************************************************************/
-
-package org.cybergarage.soap;
-
+
+package org.cybergarage.soap;
+
 import java.io.ByteArrayInputStream;
 
 import org.cybergarage.http.HTTP;
@@ -29,20 +29,20 @@ import org.cybergarage.util.Debug;
 import org.cybergarage.xml.Node;
 import org.cybergarage.xml.Parser;
 import org.cybergarage.xml.ParserException;
-
-public class SOAPRequest extends HTTPRequest
+
+public class SOAPRequest extends HTTPRequest
 {
 	private final static String SOAPACTION = "SOAPACTION";
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SOAPRequest()
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SOAPRequest()
 	{
-		setContentType(SOAP.CONTENT_TYPE);
-		setMethod(HTTP.POST);
-	}
+		setContentType(SOAP.CONTENT_TYPE);
+		setMethod(HTTP.POST);
+	}
 
 	public SOAPRequest(HTTPRequest httpReq)
 	{
@@ -75,33 +75,33 @@ public class SOAPRequest extends HTTPRequest
 			return false;
 		return soapAction.equals(value);
 	}
- 
-	////////////////////////////////////////////////
-	//	post
-	////////////////////////////////////////////////
-
-	public SOAPResponse postMessage(String host, int port)
-	{
-		HTTPResponse httpRes = post(host, port);
+ 
+	////////////////////////////////////////////////
+	//	post
+	////////////////////////////////////////////////
+
+	public SOAPResponse postMessage(String host, int port)
+	{
+		HTTPResponse httpRes = post(host, port);
 		
-		 SOAPResponse soapRes = new SOAPResponse(httpRes);
-
-		byte content[] = soapRes.getContent();
-		if (content.length <= 0)
-			return soapRes;
-		
-		try {
-			ByteArrayInputStream byteIn = new ByteArrayInputStream(content);
-			Parser xmlParser = SOAP.getXMLParser();
-			Node rootNode = xmlParser.parse(byteIn);
-			soapRes.setEnvelopeNode(rootNode);
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-		}
-			
-		 return soapRes;
-	}
+		 SOAPResponse soapRes = new SOAPResponse(httpRes);
+
+		byte content[] = soapRes.getContent();
+		if (content.length <= 0)
+			return soapRes;
+		
+		try {
+			ByteArrayInputStream byteIn = new ByteArrayInputStream(content);
+			Parser xmlParser = SOAP.getXMLParser();
+			Node rootNode = xmlParser.parse(byteIn);
+			soapRes.setEnvelopeNode(rootNode);
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+		}
+			
+		 return soapRes;
+	}
 
 	////////////////////////////////////////////////
 	//	Node
diff --git a/router/java/src/org/cybergarage/soap/SOAPResponse.java b/router/java/src/org/cybergarage/soap/SOAPResponse.java
index 4326cd2cc87c4e285beca85ad7eac6ade2b1bd95..4ee8341a39a0180f9bea735e360889bf835ec8c4 100644
--- a/router/java/src/org/cybergarage/soap/SOAPResponse.java
+++ b/router/java/src/org/cybergarage/soap/SOAPResponse.java
@@ -34,21 +34,21 @@ public class SOAPResponse extends HTTPResponse
 	public SOAPResponse()
 	{
 		setRootNode(SOAP.createEnvelopeBodyNode());
-		setContentType(XML.CONTENT_TYPE);
+		setContentType(XML.DEFAULT_CONTENT_TYPE);
 	}
 
 	public SOAPResponse(HTTPResponse httpRes)
 	{
 		super(httpRes);
 		setRootNode(SOAP.createEnvelopeBodyNode());
-		setContentType(XML.CONTENT_TYPE);
+		setContentType(XML.DEFAULT_CONTENT_TYPE);
 	}
 
 	public SOAPResponse(SOAPResponse soapRes)
 	{
 		super(soapRes);
 		setEnvelopeNode(soapRes.getEnvelopeNode());
-		setContentType(XML.CONTENT_TYPE);
+		setContentType(XML.DEFAULT_CONTENT_TYPE);
 	}
 
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/upnp/ActionList.java b/router/java/src/org/cybergarage/upnp/ActionList.java
index ad273a21baa2089b750c612be151833bb9c32144..a6e4eaeed6c21f423ba05c64c1132fbcfc1a9cc5 100644
--- a/router/java/src/org/cybergarage/upnp/ActionList.java
+++ b/router/java/src/org/cybergarage/upnp/ActionList.java
@@ -1,45 +1,45 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: ActionList.java
-*
-*	Revision:
-*
-*	12/05/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ActionList.java
+*
+*	Revision:
+*
+*	12/05/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp;
+
+import java.util.Vector;
+
+public class ActionList extends Vector<Action>
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "actionList";
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ActionList() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public Action getAction(int n)
+	{
+		return (Action)get(n);
+	}
+}
 
-package org.cybergarage.upnp;
-
-import java.util.Vector;
-
-public class ActionList extends Vector<Action> 
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "actionList";
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ActionList() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public Action getAction(int n)
-	{
-		return (Action)get(n);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/Device.java b/router/java/src/org/cybergarage/upnp/Device.java
index ba1f26eeeeb72eaa2b2273245f1ddc6df896b80f..18dc6126e18503a9cf95f6947b95eae339b399f8 100644
--- a/router/java/src/org/cybergarage/upnp/Device.java
+++ b/router/java/src/org/cybergarage/upnp/Device.java
@@ -1,98 +1,98 @@
 /******************************************************************
-*
-*	CyberLink for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: Device.java
-*
-*	Revision:
-*
-*	11/28/02
-*		- first revision.
-*	02/26/03
-*		- URLBase is updated automatically.
-* 		- Description of a root device is returned from the XML node tree.
-*	05/13/03
-*		- URLBase is updated when the request is received.
-*		- Changed to create socket threads each local interfaces.
-*		  (HTTP, SSDPSearch)
-*	06/17/03
-*		- Added notify all state variables when a new subscription is received.
-*	06/18/03
-*		- Fixed a announce bug when the bind address is null on J2SE v 1.4.1_02 and Redhat 9.
-*	09/02/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : bad request response sent even with successful subscriptions
-*		- Error : a return statement is missing in the httpRequestRecieved method
-*	10/21/03
-*		- Updated a udn field by a original uuid.
-*	10/22/03
-*		- Added setActionListener().
-*		- Added setQueryListener().
-*	12/12/03
-*		- Added a static() to initialize UPnP class.
-*	12/25/03
-*		- Added advertiser functions.
-*	01/05/04
-*		- Added isExpired().
-*	03/23/04
-*		- Oliver Newell <newell@media-rush.com>
-*		- Changed to update the UDN only when the field is null.
-*	04/21/04
-*		- Added isDeviceType().
-*	06/18/04
-*		- Added setNMPRMode() and isNMPRMode().
-*		- Changed getDescriptionData() to update only when the NMPR mode is false.
-*	06/21/04
-*		- Changed start() to send a bye-bye before the announce.
-*		- Changed annouce(), byebye() and deviceSearchReceived() to send the SSDP
-*		  messsage four times when the NMPR and the Wireless mode are true.
-*	07/02/04
-*		- Fixed announce() and byebye() to send the upnp::rootdevice message despite embedded devices.
-*		- Fixed getRootNode() to return the root node when the device is embedded.
-*	07/24/04
-*		- Thanks for Stefano Lenzi <kismet-sl@users.sourceforge.net>
-*		- Added getParentDevice().
-*	10/20/04 
-*		- Brent Hills <bhills@openshores.com>
-*		- Changed postSearchResponse() to add MYNAME header.
-*	11/19/04
-*		- Theo Beisch <theo.beisch@gmx.de>
-*		- Added getStateVariable(String serviceType, String name).
-*	03/22/05
-*		- Changed httpPostRequestRecieved() to return the bad request when the post request isn't the soap action.
-*	03/23/05
-*		- Added loadDescription(String) to load the description from memory.
-*	03/30/05
-*		- Added getDeviceByDescriptionURI().
-*		- Added getServiceBySCPDURL().
-*	03/31/05
-*		- Changed httpGetRequestRecieved() to return the description stream using
-*		  Device::getDescriptionData() and Service::getSCPDData() at first.
-*	04/25/05
-*		- Thanks for Mikael Hakman <mhakman@dkab.net>
-*		  Changed announce() and byebye() to close the socket after the posting.
-*	04/25/05
-*		- Thanks for Mikael Hakman <mhakman@dkab.net>
-*		  Changed deviceSearchResponse() answer with USN:UDN::<device-type> when request ST is device type.
-* 	04/25/05
-*		- Thanks for Mikael Hakman <mhakman@dkab.net>
-* 		- Changed getDescriptionData() to add a XML declaration at first line.
-* 	04/25/05
-*		- Thanks for Mikael Hakman <mhakman@dkab.net>
-*		- Added a new setActionListener() and serQueryListner() to include the sub devices. 
-*	07/24/05
-*		- Thanks for Stefano Lenzi <kismet-sl@users.sourceforge.net>
-*		- Fixed a bug of getParentDevice() to return the parent device normally.
-*	02/21/06
-*		- Changed httpRequestRecieved() not to ignore HEAD requests.
-*	04/12/06
-*		- Added setUserData() and getUserData() to set a user original data object.
-*	03/29/08
-*		- Added isRunning() to know whether the device is running.
-* 
-******************************************************************/
+ *
+ *	CyberLink for Java
+ *
+ *	Copyright (C) Satoshi Konno 2002-2004
+ *
+ *	File: Device.java
+ *
+ *	Revision:
+ *
+ *	11/28/02
+ *		- first revision.
+ *	02/26/03
+ *		- URLBase is updated automatically.
+ * 		- Description of a root device is returned from the XML node tree.
+ *	05/13/03
+ *		- URLBase is updated when the request is received.
+ *		- Changed to create socket threads each local interfaces.
+ *		  (HTTP, SSDPSearch)
+ *	06/17/03
+ *		- Added notify all state variables when a new subscription is received.
+ *	06/18/03
+ *		- Fixed a announce bug when the bind address is null on J2SE v 1.4.1_02 and Redhat 9.
+ *	09/02/03
+ *		- Giordano Sassaroli <sassarol@cefriel.it>
+ *		- Problem : bad request response sent even with successful subscriptions
+ *		- Error : a return statement is missing in the httpRequestRecieved method
+ *	10/21/03
+ *		- Updated a udn field by a original uuid.
+ *	10/22/03
+ *		- Added setActionListener().
+ *		- Added setQueryListener().
+ *	12/12/03
+ *		- Added a static() to initialize UPnP class.
+ *	12/25/03
+ *		- Added advertiser functions.
+ *	01/05/04
+ *		- Added isExpired().
+ *	03/23/04
+ *		- Oliver Newell <newell@media-rush.com>
+ *		- Changed to update the UDN only when the field is null.
+ *	04/21/04
+ *		- Added isDeviceType().
+ *	06/18/04
+ *		- Added setNMPRMode() and isNMPRMode().
+ *		- Changed getDescriptionData() to update only when the NMPR mode is false.
+ *	06/21/04
+ *		- Changed start() to send a bye-bye before the announce.
+ *		- Changed annouce(), byebye() and deviceSearchReceived() to send the SSDP
+ *		  messsage four times when the NMPR and the Wireless mode are true.
+ *	07/02/04
+ *		- Fixed announce() and byebye() to send the upnp::rootdevice message despite embedded devices.
+ *		- Fixed getRootNode() to return the root node when the device is embedded.
+ *	07/24/04
+ *		- Thanks for Stefano Lenzi <kismet-sl@users.sourceforge.net>
+ *		- Added getParentDevice().
+ *	10/20/04 
+ *		- Brent Hills <bhills@openshores.com>
+ *		- Changed postSearchResponse() to add MYNAME header.
+ *	11/19/04
+ *		- Theo Beisch <theo.beisch@gmx.de>
+ *		- Added getStateVariable(String serviceType, String name).
+ *	03/22/05
+ *		- Changed httpPostRequestRecieved() to return the bad request when the post request isn't the soap action.
+ *	03/23/05
+ *		- Added loadDescription(String) to load the description from memory.
+ *	03/30/05
+ *		- Added getDeviceByDescriptionURI().
+ *		- Added getServiceBySCPDURL().
+ *	03/31/05
+ *		- Changed httpGetRequestRecieved() to return the description stream using
+ *		  Device::getDescriptionData() and Service::getSCPDData() at first.
+ *	04/25/05
+ *		- Thanks for Mikael Hakman <mhakman@dkab.net>
+ *		  Changed announce() and byebye() to close the socket after the posting.
+ *	04/25/05
+ *		- Thanks for Mikael Hakman <mhakman@dkab.net>
+ *		  Changed deviceSearchResponse() answer with USN:UDN::<device-type> when request ST is device type.
+ * 	04/25/05
+ *		- Thanks for Mikael Hakman <mhakman@dkab.net>
+ * 		- Changed getDescriptionData() to add a XML declaration at first line.
+ * 	04/25/05
+ *		- Thanks for Mikael Hakman <mhakman@dkab.net>
+ *		- Added a new setActionListener() and serQueryListner() to include the sub devices. 
+ *	07/24/05
+ *		- Thanks for Stefano Lenzi <kismet-sl@users.sourceforge.net>
+ *		- Fixed a bug of getParentDevice() to return the parent device normally.
+ *	02/21/06
+ *		- Changed httpRequestRecieved() not to ignore HEAD requests.
+ *	04/12/06
+ *		- Added setUserData() and getUserData() to set a user original data object.
+ *	03/29/08
+ *		- Added isRunning() to know whether the device is running.
+ * 
+ ******************************************************************/
 
 package org.cybergarage.upnp;
 
@@ -101,6 +101,7 @@ import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URL;
 import java.util.Calendar;
+import java.util.HashMap;
 
 import org.cybergarage.http.HTTP;
 import org.cybergarage.http.HTTPRequest;
@@ -123,6 +124,7 @@ import org.cybergarage.upnp.device.NTS;
 import org.cybergarage.upnp.device.ST;
 import org.cybergarage.upnp.device.SearchListener;
 import org.cybergarage.upnp.device.USN;
+import org.cybergarage.upnp.device.PresentationListener;
 import org.cybergarage.upnp.event.Subscriber;
 import org.cybergarage.upnp.event.Subscription;
 import org.cybergarage.upnp.event.SubscriptionRequest;
@@ -143,12 +145,12 @@ import org.cybergarage.xml.Parser;
 import org.cybergarage.xml.ParserException;
 import org.cybergarage.xml.XML;
 
-public class Device implements org.cybergarage.http.HTTPRequestListener, SearchListener
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
+public class Device implements org.cybergarage.http.HTTPRequestListener,
+		SearchListener {
+	// //////////////////////////////////////////////
+	// Constants
+	// //////////////////////////////////////////////
+
 	public final static String ELEM_NAME = "device";
 	public final static String UPNP_ROOTDEVICE = "upnp:rootdevice";
 
@@ -159,16 +161,16 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	public final static int HTTP_DEFAULT_PORT = 4004;
 
 	public final static String DEFAULT_DESCRIPTION_URI = "/description.xml";
-	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
+	public final static String DEFAULT_PRESENTATION_URI = "/presentation";
+
+	// //////////////////////////////////////////////
+	// Member
+	// //////////////////////////////////////////////
 
 	private Node rootNode;
 	private Node deviceNode;
 
-	public Node getRootNode()
-	{
+	public Node getRootNode() {
 		if (rootNode != null)
 			return rootNode;
 		if (deviceNode == null)
@@ -176,54 +178,46 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		return deviceNode.getRootNode();
 	}
 
-	public Node getDeviceNode()
-	{
+	public Node getDeviceNode() {
 		return deviceNode;
 	}
 
-	public void setRootNode(Node node)
-	{
+	public void setRootNode(Node node) {
 		rootNode = node;
 	}
 
-	public void setDeviceNode(Node node)
-	{
+	public void setDeviceNode(Node node) {
 		deviceNode = node;
 	}
-				
-	////////////////////////////////////////////////
-	//	Initialize
-	////////////////////////////////////////////////
-	
-	static 
-	{
+
+	// //////////////////////////////////////////////
+	// Initialize
+	// //////////////////////////////////////////////
+
+	static {
 		UPnP.initialize();
 	}
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
 
-	public Device(Node root, Node device)
-	{
+	// //////////////////////////////////////////////
+	// Constructor
+	// //////////////////////////////////////////////
+
+	public Device(Node root, Node device) {
 		rootNode = root;
 		deviceNode = device;
 		setUUID(UPnP.createUUID());
 		setWirelessMode(false);
 	}
 
-	public Device()
-	{
+	public Device() {
 		this(null, null);
 	}
-	
-	public Device(Node device)
-	{
+
+	public Device(Node device) {
 		this(null, device);
 	}
 
-	public Device(File descriptionFile) throws InvalidDescriptionException
-	{
+	public Device(File descriptionFile) throws InvalidDescriptionException {
 		this(null, null);
 		loadDescription(descriptionFile);
 	}
@@ -231,154 +225,271 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	/**
 	 * @since 1.8.0
 	 */
-	public Device(InputStream input) throws InvalidDescriptionException
-	{
+	public Device(InputStream input) throws InvalidDescriptionException {
 		this(null, null);
 		loadDescription(input);
 	}
 
-	
-	public Device(String descriptionFileName) throws InvalidDescriptionException
-	{
+	public Device(String descriptionFileName)
+			throws InvalidDescriptionException {
 		this(new File(descriptionFileName));
 	}
 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
 	// Mutex
-	////////////////////////////////////////////////
-	
+	// //////////////////////////////////////////////
+
 	private Mutex mutex = new Mutex();
-	
-	public void lock()
-	{
+
+	public void lock() {
 		mutex.lock();
 	}
-	
-	public void unlock()
-	{
+
+	public void unlock() {
 		mutex.unlock();
 	}
-	
-	////////////////////////////////////////////////
-	//	getAbsoluteURL
-	////////////////////////////////////////////////
-	
-	public String getAbsoluteURL(String urlString)
-	{
+
+	// //////////////////////////////////////////////
+	// getAbsoluteURL
+	// //////////////////////////////////////////////
+
+	public String getAbsoluteURL(String urlString, String baseURLStr,
+			String locationURLStr) {
+		//Debug.warning("GAURL \"" + urlString + "\" \"" + baseURLStr + "\" \"" + locationURLStr + '"');
+		if ((urlString == null) || (urlString.length() <= 0))
+			return "";
+
 		try {
 			URL url = new URL(urlString);
+			//Debug.warning("Return 0: " + url);
 			return url.toString();
+		} catch (Exception e) {
+		}
+
+		if ((baseURLStr == null) || (baseURLStr.length() <= 0)) {
+			if ((locationURLStr != null) && (0 < locationURLStr.length())) {
+				if (!locationURLStr.endsWith("/") || !urlString.startsWith("/")) {
+					String absUrl;
+					// I2P - getAbsoluteURL("/WANIPCn.xml", "", "http://192.168.1.1:5555/rootDesc.xml")
+					// returns here as  "http://192.168.1.1:5555/rootDesc.xml/WANIPCn.xml" which is horribly wrong
+					// So back up to last slash
+					if (!locationURLStr.endsWith("/")) {
+						if (urlString.startsWith("/"))
+						      absUrl = locationURLStr.substring(0, locationURLStr.lastIndexOf('/')) + urlString;
+						else
+						      absUrl = locationURLStr.substring(0, locationURLStr.lastIndexOf('/') + 1) + urlString;
+					} else {
+						absUrl = locationURLStr + urlString;
+					}
+					try {
+						URL url = new URL(absUrl);
+						//Debug.warning("Return 1: " + url);
+						return url.toString();
+					} catch (Exception e) {
+					}
+				} else {
+					String absUrl = locationURLStr + urlString.substring(1);
+					try {
+						URL url = new URL(absUrl);
+						//Debug.warning("Return 2: " + url);
+						return url.toString();
+					} catch (Exception e) {
+					}
+				}
+
+				String absUrl = HTTP.getAbsoluteURL(locationURLStr, urlString);
+				try {
+					URL url = new URL(absUrl);
+					//Debug.warning("Return 3: " + url);
+					return url.toString();
+				} catch (Exception e) {
+				}
+
+				// Thanks for Steven Yen (2003/09/03)
+				Device rootDev = getRootDevice();
+				if (rootDev != null) {
+					String location = rootDev.getLocation();
+					String locationHost = HTTP.getHost(location);
+					int locationPort = HTTP.getPort(location);
+					baseURLStr = HTTP.getRequestHostURL(locationHost,
+							locationPort);
+				}
+			}
 		}
-		catch (Exception e) {}
-		
-		Device rootDev = getRootDevice();
-		String urlBaseStr = rootDev.getURLBase();
-		
-		// Thanks for Steven Yen (2003/09/03)
-		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
-			String location = rootDev.getLocation();
-			String locationHost = HTTP.getHost(location);
-			int locationPort = HTTP.getPort(location);
-			urlBaseStr = HTTP.getRequestHostURL(locationHost, locationPort);
-		}
-
-		urlString = HTTP.toRelativeURL(urlString);
-		// I2P fix for devices that return a base URL with trailing /
-		if (urlBaseStr.endsWith("/") && urlString.startsWith("/"))
-			urlString = urlString.substring(1);
-		String absUrl = urlBaseStr + urlString;
-		try {
-			URL url = new URL(absUrl);
-			return url.toString();
+
+		if ((baseURLStr != null) && (0 < baseURLStr.length())) {
+			if (!baseURLStr.endsWith("/") || !urlString.startsWith("/")) {
+				String absUrl = baseURLStr + urlString;
+				try {
+					URL url = new URL(absUrl);
+					//Debug.warning("Return 4: " + url);
+					return url.toString();
+				} catch (Exception e) {
+				}
+			} else {
+				String absUrl = baseURLStr + urlString.substring(1);
+				try {
+					URL url = new URL(absUrl);
+					//Debug.warning("Return 5: " + url);
+					return url.toString();
+				} catch (Exception e) {
+				}
+			}
+
+			String absUrl = HTTP.getAbsoluteURL(baseURLStr, urlString);
+			try {
+				URL url = new URL(absUrl);
+				//Debug.warning("Return 6: " + url);
+				return url.toString();
+			} catch (Exception e) {
+			}
 		}
-		catch (Exception e) {}
-			
-		absUrl = HTTP.getAbsoluteURL(urlBaseStr, urlString);
-		try {
-			URL url = new URL(absUrl);
-			return url.toString();
+
+		//Debug.warning("Return 7: " + urlString);
+		return urlString;
+	}
+
+	public String getAbsoluteURL(String urlString) {
+		String baseURLStr = null;
+		String locationURLStr = null;
+
+		Device rootDev = getRootDevice();
+		if (rootDev != null) {
+			baseURLStr = rootDev.getURLBase();
+			locationURLStr = rootDev.getLocation();
 		}
-		catch (Exception e) {}
-		
-		return "";
+
+		return getAbsoluteURL(urlString, baseURLStr, locationURLStr);
 	}
 
-	////////////////////////////////////////////////
-	//	NMPR
-	////////////////////////////////////////////////
-	
-	public void setNMPRMode(boolean flag)
-	{
+	// //////////////////////////////////////////////
+	// NMPR
+	// //////////////////////////////////////////////
+
+	public void setNMPRMode(boolean flag) {
 		Node devNode = getDeviceNode();
 		if (devNode == null)
 			return;
 		if (flag == true) {
 			devNode.setNode(UPnP.INMPR03, UPnP.INMPR03_VERSION);
 			devNode.removeNode(Device.URLBASE_NAME);
-		}
-		else {
+		} else {
 			devNode.removeNode(UPnP.INMPR03);
 		}
 	}
 
-	public boolean isNMPRMode()
-	{
+	public boolean isNMPRMode() {
 		Node devNode = getDeviceNode();
 		if (devNode == null)
 			return false;
 		return (devNode.getNode(UPnP.INMPR03) != null) ? true : false;
 	}
-	
-	////////////////////////////////////////////////
-	//	Wireless
-	////////////////////////////////////////////////
-	
+
+	// //////////////////////////////////////////////
+	// Wireless
+	// //////////////////////////////////////////////
+
 	private boolean wirelessMode;
-	
-	public void setWirelessMode(boolean flag)
-	{
+
+	public void setWirelessMode(boolean flag) {
 		wirelessMode = flag;
 	}
 
-	public boolean isWirelessMode()
-	{
+	public boolean isWirelessMode() {
 		return wirelessMode;
 	}
 
-	public int getSSDPAnnounceCount()
-	{
+	public int getSSDPAnnounceCount() {
 		if (isNMPRMode() == true && isWirelessMode() == true)
 			return UPnP.INMPR03_DISCOVERY_OVER_WIRELESS_COUNT;
 		return 1;
 	}
 
-	////////////////////////////////////////////////
-	//	Device UUID
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// Device UUID
+	// //////////////////////////////////////////////
 
 	private String devUUID;
-	
-	private void setUUID(String uuid)
-	{
-		devUUID = uuid;
-	}
-	
-	private String getUUID() 
-	{
-		return devUUID;
-	}
-	
-	private void updateUDN()
-	{
-		setUDN("uuid:" + getUUID());	
-	}
-	
-	////////////////////////////////////////////////
-	//	Root Device
-	////////////////////////////////////////////////
-	
-	public Device getRootDevice()
-	{
+
+	private void setUUID(String uuid) {
+		this.devUUID = uuid;
+	}
+
+	public String getUUID() {
+		return this.devUUID;
+	}
+
+	private void updateUDN() {
+		setUDN("uuid:" + getUUID());
+	}
+
+	// //////////////////////////////////////////////
+	// BootId
+	// //////////////////////////////////////////////
+
+	private int bootId;
+
+	private void updateBootId() {
+		this.bootId = UPnP.createBootId();
+	}
+
+	public int getBootId() {
+		return this.bootId;
+	}
+
+	// //////////////////////////////////////////////
+	// configID
+	// //////////////////////////////////////////////
+
+	private final static String CONFIG_ID = "configId";
+
+	private void updateConfigId(Device dev) {
+		int configId = 0;
+
+		DeviceList cdevList = dev.getDeviceList();
+		int cdevCnt = cdevList.size();
+		for (int n = 0; n < cdevCnt; n++) {
+			Device cdev = cdevList.getDevice(n);
+			updateConfigId(cdev);
+			configId += cdev.getConfigId();
+			configId &= UPnP.CONFIGID_UPNP_ORG_MAX;
+		}
+
+		ServiceList serviceList = dev.getServiceList();
+		int serviceCnt = serviceList.size();
+		for (int n = 0; n < serviceCnt; n++) {
+			Service service = serviceList.getService(n);
+			service.updateConfigId();
+			configId += service.getConfigId();
+			configId &= UPnP.CONFIGID_UPNP_ORG_MAX;
+		}
+
+		Node devNode = getDeviceNode();
+		if (devNode == null)
+			return;
+
+		String devDescXml = devNode.toString();
+		configId += UPnP.caluculateConfigId(devDescXml);
+		configId &= UPnP.CONFIGID_UPNP_ORG_MAX;
+		devNode.setAttribute(CONFIG_ID, configId);
+	}
+
+	public void updateConfigId() {
+		updateConfigId(this);
+	}
+
+	public int getConfigId() {
+		Node devNode = getDeviceNode();
+		if (devNode == null)
+			return 0;
+		return devNode.getAttributeIntegerValue(CONFIG_ID);
+	}
+
+	// //////////////////////////////////////////////
+	// Root Device
+	// //////////////////////////////////////////////
+
+	public Device getRootDevice() {
 		Node rootNode = getRootNode();
 		if (rootNode == null)
 			return null;
@@ -388,30 +499,32 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		return new Device(rootNode, devNode);
 	}
 
-	////////////////////////////////////////////////
-	//	Parent Device
-	////////////////////////////////////////////////
-	
+	// //////////////////////////////////////////////
+	// Parent Device
+	// //////////////////////////////////////////////
+
 	// Thanks for Stefano Lenzi (07/24/04)
 
 	/**
 	 * 
 	 * @return A Device that contain this object.<br>
-	 * 	Return <code>null</code> if this is a root device.
+	 *         Return <code>null</code> if this is a root device.
 	 */
-	public Device getParentDevice()	{ 
-		if(isRootDevice())
+	public Device getParentDevice() {
+		if (isRootDevice())
 			return null;
 		Node devNode = getDeviceNode();
 		Node aux = null;
-		//<device><deviceList><device>
+		// <device><deviceList><device>
 		aux = devNode.getParentNode().getParentNode();
 		return new Device(aux);
 	}
+
 	/**
 	 * Add a Service to device without checking for duplicate or syntax error
 	 * 
-	 * @param s Add Service s to the Device
+	 * @param s
+	 *            Add Service s to the Device
 	 */
 	public void addService(Service s) {
 		Node serviceListNode = getDeviceNode().getNode(ServiceList.ELEM_NAME);
@@ -427,43 +540,42 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	 * This method set or reset the root node of the Device and itself<br>
 	 * <br>
 	 * Note: This method should be used to create a dynamic<br>
-	 * Device withtout writing any XML that describe the device<br>.
+	 * Device withtout writing any XML that describe the device<br>
 	 * 
 	 * @param d Add Device d to the Device
 	 */
 	public void addDevice(Device d) {
 		Node deviceListNode = getDeviceNode().getNode(DeviceList.ELEM_NAME);
 		if (deviceListNode == null) {
-			//deviceListNode = new Node(ServiceList.ELEM_NAME); twa wrong ELEM_NAME;
+			// deviceListNode = new Node(ServiceList.ELEM_NAME); twa wrong
+			// ELEM_NAME;
 			deviceListNode = new Node(DeviceList.ELEM_NAME);
 			getDeviceNode().addNode(deviceListNode);
 		}
 		deviceListNode.addNode(d.getDeviceNode());
 		d.setRootNode(null);
-		if(getRootNode()==null){
+		if (getRootNode() == null) {
 			Node root = new Node(RootDescription.ROOT_ELEMENT);
-			root.setNameSpace("",RootDescription.ROOT_ELEMENT_NAMESPACE);
+			root.setNameSpace("", RootDescription.ROOT_ELEMENT_NAMESPACE);
 			Node spec = new Node(RootDescription.SPECVERSION_ELEMENT);
-			Node maj =new Node(RootDescription.MAJOR_ELEMENT);
+			Node maj = new Node(RootDescription.MAJOR_ELEMENT);
 			maj.setValue("1");
-			Node min =new Node(RootDescription.MINOR_ELEMENT);
+			Node min = new Node(RootDescription.MINOR_ELEMENT);
 			min.setValue("0");
 			spec.addNode(maj);
 			spec.addNode(min);
-			root.addNode(spec);		
+			root.addNode(spec);
 			setRootNode(root);
-		}			
-	}	
-	
+		}
+	}
 
-	////////////////////////////////////////////////
-	//	UserData
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// UserData
+	// //////////////////////////////////////////////
 
-	private DeviceData getDeviceData()
-	{
+	private DeviceData getDeviceData() {
 		Node node = getDeviceNode();
-		DeviceData userData = (DeviceData)node.getUserData();
+		DeviceData userData = (DeviceData) node.getUserData();
 		if (userData == null) {
 			userData = new DeviceData();
 			node.setUserData(userData);
@@ -471,121 +583,117 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 		return userData;
 	}
-	
-	////////////////////////////////////////////////
-	//	Description
-	////////////////////////////////////////////////
 
-	private void setDescriptionFile(File file)
-	{
+	// //////////////////////////////////////////////
+	// Description
+	// //////////////////////////////////////////////
+
+	private void setDescriptionFile(File file) {
 		getDeviceData().setDescriptionFile(file);
 	}
 
-	public File getDescriptionFile()
-	{
+	public File getDescriptionFile() {
 		return getDeviceData().getDescriptionFile();
 	}
 
-	private void setDescriptionURI(String uri)
-	{
+	private void setDescriptionURI(String uri) {
 		getDeviceData().setDescriptionURI(uri);
 	}
 
-	private String getDescriptionURI()
-	{
+	private String getDescriptionURI() {
 		return getDeviceData().getDescriptionURI();
 	}
 
-	private boolean isDescriptionURI(String uri)
-	{
+	private boolean isDescriptionURI(String uri) {
 		String descriptionURI = getDescriptionURI();
 		if (uri == null || descriptionURI == null)
 			return false;
 		return descriptionURI.equals(uri);
 	}
 
-	public String getDescriptionFilePath()
-	{
+	public String getDescriptionFilePath() {
 		File descriptionFile = getDescriptionFile();
 		if (descriptionFile == null)
 			return "";
 		return descriptionFile.getAbsoluteFile().getParent();
 	}
-	
+
 	/**
 	 * @since 1.8.0
 	 */
-	public boolean loadDescription(InputStream input) throws InvalidDescriptionException
-	{
+	public boolean loadDescription(InputStream input)
+			throws InvalidDescriptionException {
 		try {
 			Parser parser = UPnP.getXMLParser();
 			rootNode = parser.parse(input);
 			if (rootNode == null)
-				throw new InvalidDescriptionException(Description.NOROOT_EXCEPTION);
+				throw new InvalidDescriptionException(
+						Description.NOROOT_EXCEPTION);
 			deviceNode = rootNode.getNode(Device.ELEM_NAME);
 			if (deviceNode == null)
-				throw new InvalidDescriptionException(Description.NOROOTDEVICE_EXCEPTION);
-		}
-		catch (ParserException e) {
+				throw new InvalidDescriptionException(
+						Description.NOROOTDEVICE_EXCEPTION);
+		} catch (ParserException e) {
 			throw new InvalidDescriptionException(e);
 		}
-		
+
 		if (initializeLoadedDescription() == false)
 			return false;
 
 		setDescriptionFile(null);
-				
+
 		return true;
-	}	
+	}
 
-	public boolean loadDescription(String descString) throws InvalidDescriptionException
-	{
+	public boolean loadDescription(String descString)
+			throws InvalidDescriptionException {
 		try {
 			Parser parser = UPnP.getXMLParser();
 			rootNode = parser.parse(descString);
 			if (rootNode == null)
-				throw new InvalidDescriptionException(Description.NOROOT_EXCEPTION);
+				throw new InvalidDescriptionException(
+						Description.NOROOT_EXCEPTION);
 			deviceNode = rootNode.getNode(Device.ELEM_NAME);
 			if (deviceNode == null)
-				throw new InvalidDescriptionException(Description.NOROOTDEVICE_EXCEPTION);
-		}
-		catch (ParserException e) {
+				throw new InvalidDescriptionException(
+						Description.NOROOTDEVICE_EXCEPTION);
+		} catch (ParserException e) {
 			throw new InvalidDescriptionException(e);
 		}
-		
+
 		if (initializeLoadedDescription() == false)
 			return false;
 
 		setDescriptionFile(null);
-				
+
 		return true;
 	}
-	
-	public boolean loadDescription(File file) throws InvalidDescriptionException
-	{
+
+	public boolean loadDescription(File file)
+			throws InvalidDescriptionException {
 		try {
 			Parser parser = UPnP.getXMLParser();
 			rootNode = parser.parse(file);
 			if (rootNode == null)
-				throw new InvalidDescriptionException(Description.NOROOT_EXCEPTION, file);
+				throw new InvalidDescriptionException(
+						Description.NOROOT_EXCEPTION, file);
 			deviceNode = rootNode.getNode(Device.ELEM_NAME);
 			if (deviceNode == null)
-				throw new InvalidDescriptionException(Description.NOROOTDEVICE_EXCEPTION, file);
-		}
-		catch (ParserException e) {
+				throw new InvalidDescriptionException(
+						Description.NOROOTDEVICE_EXCEPTION, file);
+		} catch (ParserException e) {
 			throw new InvalidDescriptionException(e);
 		}
-		
+
 		if (initializeLoadedDescription() == false)
 			return false;
 
 		setDescriptionFile(file);
-				
+
 		return true;
 	}
 
-	private boolean initializeLoadedDescription()
-	{
+	private boolean initializeLoadedDescription() {
 		setDescriptionURI(DEFAULT_DESCRIPTION_URI);
 		setLeaseTime(DEFAULT_LEASE_TIME);
 		setHTTPPort(HTTP_DEFAULT_PORT);
@@ -593,66 +701,61 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		// Thanks for Oliver Newell (03/23/04)
 		if (hasUDN() == false)
 			updateUDN();
-				
+
 		return true;
 	}
-	
-	////////////////////////////////////////////////
-	//	isDeviceNode
-	////////////////////////////////////////////////
 
-	public static boolean isDeviceNode(Node node)
-	{
+	// //////////////////////////////////////////////
+	// isDeviceNode
+	// //////////////////////////////////////////////
+
+	public static boolean isDeviceNode(Node node) {
 		return Device.ELEM_NAME.equals(node.getName());
 	}
-	
-	////////////////////////////////////////////////
-	//	Root Device
-	////////////////////////////////////////////////
 
-	public boolean isRootDevice(){
-		return getRootNode().getNode("device").getNodeValue(UDN).equals(getUDN());
+	// //////////////////////////////////////////////
+	// Root Device
+	// //////////////////////////////////////////////
+
+	public boolean isRootDevice() {
+		return getRootNode().getNode("device").getNodeValue(UDN)
+				.equals(getUDN());
 	}
-	
-	////////////////////////////////////////////////
-	//	Root Device
-	////////////////////////////////////////////////
 
-	public void setSSDPPacket(SSDPPacket packet)
-	{
+	// //////////////////////////////////////////////
+	// Root Device
+	// //////////////////////////////////////////////
+
+	public void setSSDPPacket(SSDPPacket packet) {
 		getDeviceData().setSSDPPacket(packet);
 	}
 
-	public SSDPPacket getSSDPPacket()
-	{
+	public SSDPPacket getSSDPPacket() {
 		if (isRootDevice() == false)
 			return null;
 		return getDeviceData().getSSDPPacket();
 	}
-	
-	////////////////////////////////////////////////
-	//	Location 
-	////////////////////////////////////////////////
 
-	public void setLocation(String value)
-	{
+	// //////////////////////////////////////////////
+	// Location
+	// //////////////////////////////////////////////
+
+	public void setLocation(String value) {
 		getDeviceData().setLocation(value);
 	}
 
-	public String getLocation()
-	{
+	public String getLocation() {
 		SSDPPacket packet = getSSDPPacket();
 		if (packet != null)
 			return packet.getLocation();
 		return getDeviceData().getLocation();
 	}
 
-	////////////////////////////////////////////////
-	//	LeaseTime 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// LeaseTime
+	// //////////////////////////////////////////////
 
-	public void setLeaseTime(int value)
-	{
+	public void setLeaseTime(int value) {
 		getDeviceData().setLeaseTime(value);
 		Advertiser adv = getAdvertiser();
 		if (adv != null) {
@@ -661,48 +764,44 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 	}
 
-	public int getLeaseTime()
-	{
+	public int getLeaseTime() {
 		SSDPPacket packet = getSSDPPacket();
 		if (packet != null)
-			return packet.getLeaseTime();	
+			return packet.getLeaseTime();
 		return getDeviceData().getLeaseTime();
 	}
 
-	////////////////////////////////////////////////
-	//	TimeStamp 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// TimeStamp
+	// //////////////////////////////////////////////
 
-	public long getTimeStamp()
-	{
+	public long getTimeStamp() {
 		SSDPPacket packet = getSSDPPacket();
 		if (packet != null)
-			return packet.getTimeStamp();		
+			return packet.getTimeStamp();
 		return 0;
 	}
 
-	public long getElapsedTime()
-	{
+	public long getElapsedTime() {
 		return (System.currentTimeMillis() - getTimeStamp()) / 1000;
 	}
 
-	public boolean isExpired()
-	{
+	public boolean isExpired() {
 		long elipsedTime = getElapsedTime();
-		long leaseTime = getLeaseTime() + UPnP.DEFAULT_EXPIRED_DEVICE_EXTRA_TIME;
+		long leaseTime = getLeaseTime()
+				+ UPnP.DEFAULT_EXPIRED_DEVICE_EXTRA_TIME;
 		if (leaseTime < elipsedTime)
 			return true;
 		return false;
 	}
-	
-	////////////////////////////////////////////////
-	//	URL Base
-	////////////////////////////////////////////////
+
+	// //////////////////////////////////////////////
+	// URL Base
+	// //////////////////////////////////////////////
 
 	private final static String URLBASE_NAME = "URLBase";
-	
-	private void setURLBase(String value)
-	{
+
+	private void setURLBase(String value) {
 		if (isRootDevice() == true) {
 			Node node = getRootNode().getNode(URLBASE_NAME);
 			if (node != null) {
@@ -718,249 +817,254 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 	}
 
-	private void updateURLBase(String host)
-	{
+	private void updateURLBase(String host) {
 		String urlBase = HostInterface.getHostURL(host, getHTTPPort(), "");
 		setURLBase(urlBase);
 	}
-  
-	public String getURLBase()
-	{
+
+	public String getURLBase() {
 		if (isRootDevice() == true)
 			return getRootNode().getNodeValue(URLBASE_NAME);
 		return "";
 	}
 
-	////////////////////////////////////////////////
-	//	deviceType
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// deviceType
+	// //////////////////////////////////////////////
 
 	private final static String DEVICE_TYPE = "deviceType";
-	
-	public void setDeviceType(String value)
-	{
+
+	public void setDeviceType(String value) {
 		getDeviceNode().setNode(DEVICE_TYPE, value);
 	}
 
-	public String getDeviceType()
-	{
+	public String getDeviceType() {
 		return getDeviceNode().getNodeValue(DEVICE_TYPE);
 	}
 
-	public boolean isDeviceType(String value)
-	{
+	public boolean isDeviceType(String value) {
 		if (value == null)
 			return false;
 		return value.equals(getDeviceType());
 	}
 
-	////////////////////////////////////////////////
-	//	friendlyName
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// friendlyName
+	// //////////////////////////////////////////////
 
 	private final static String FRIENDLY_NAME = "friendlyName";
-	
-	public void setFriendlyName(String value)
-	{
+
+	public void setFriendlyName(String value) {
 		getDeviceNode().setNode(FRIENDLY_NAME, value);
 	}
 
-	public String getFriendlyName()
-	{
+	public String getFriendlyName() {
 		return getDeviceNode().getNodeValue(FRIENDLY_NAME);
 	}
 
-	////////////////////////////////////////////////
-	//	manufacture
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// manufacture
+	// //////////////////////////////////////////////
 
 	private final static String MANUFACTURE = "manufacturer";
-	
-	public void setManufacture(String value)
-	{
+
+	public void setManufacture(String value) {
 		getDeviceNode().setNode(MANUFACTURE, value);
 	}
 
-	public String getManufacture()
-	{
+	public String getManufacture() {
 		return getDeviceNode().getNodeValue(MANUFACTURE);
 	}
 
-	////////////////////////////////////////////////
-	//	manufactureURL
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// manufactureURL
+	// //////////////////////////////////////////////
 
 	private final static String MANUFACTURE_URL = "manufacturerURL";
-	
-	public void setManufactureURL(String value)
-	{
+
+	public void setManufactureURL(String value) {
 		getDeviceNode().setNode(MANUFACTURE_URL, value);
 	}
 
-	public String getManufactureURL()
-	{
+	public String getManufactureURL() {
 		return getDeviceNode().getNodeValue(MANUFACTURE_URL);
 	}
 
-	////////////////////////////////////////////////
-	//	modelDescription
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// modelDescription
+	// //////////////////////////////////////////////
 
 	private final static String MODEL_DESCRIPTION = "modelDescription";
-	
-	public void setModelDescription(String value)
-	{
+
+	public void setModelDescription(String value) {
 		getDeviceNode().setNode(MODEL_DESCRIPTION, value);
 	}
 
-	public String getModelDescription()
-	{
+	public String getModelDescription() {
 		return getDeviceNode().getNodeValue(MODEL_DESCRIPTION);
 	}
 
-	////////////////////////////////////////////////
-	//	modelName
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// modelName
+	// //////////////////////////////////////////////
 
 	private final static String MODEL_NAME = "modelName";
-	
-	public void setModelName(String value)
-	{
+
+	public void setModelName(String value) {
 		getDeviceNode().setNode(MODEL_NAME, value);
 	}
 
-	public String getModelName()
-	{
+	public String getModelName() {
 		return getDeviceNode().getNodeValue(MODEL_NAME);
 	}
 
-	////////////////////////////////////////////////
-	//	modelNumber
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// modelNumber
+	// //////////////////////////////////////////////
 
 	private final static String MODEL_NUMBER = "modelNumber";
-	
-	public void setModelNumber(String value)
-	{
+
+	public void setModelNumber(String value) {
 		getDeviceNode().setNode(MODEL_NUMBER, value);
 	}
 
-	public String getModelNumber()
-	{
+	public String getModelNumber() {
 		return getDeviceNode().getNodeValue(MODEL_NUMBER);
 	}
 
-	////////////////////////////////////////////////
-	//	modelURL
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// modelURL
+	// //////////////////////////////////////////////
 
 	private final static String MODEL_URL = "modelURL";
-	
-	public void setModelURL(String value)
-	{
+
+	public void setModelURL(String value) {
 		getDeviceNode().setNode(MODEL_URL, value);
 	}
 
-	public String getModelURL()
-	{
+	public String getModelURL() {
 		return getDeviceNode().getNodeValue(MODEL_URL);
 	}
 
-	////////////////////////////////////////////////
-	//	serialNumber
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// serialNumber
+	// //////////////////////////////////////////////
 
 	private final static String SERIAL_NUMBER = "serialNumber";
-	
-	public void setSerialNumber(String value)
-	{
+
+	public void setSerialNumber(String value) {
 		getDeviceNode().setNode(SERIAL_NUMBER, value);
 	}
 
-	public String getSerialNumber()
-	{
+	public String getSerialNumber() {
 		return getDeviceNode().getNodeValue(SERIAL_NUMBER);
 	}
 
-	////////////////////////////////////////////////
-	//	UDN
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// UDN
+	// //////////////////////////////////////////////
 
 	private final static String UDN = "UDN";
-	
-	public void setUDN(String value)
-	{
+
+	public void setUDN(String value) {
 		getDeviceNode().setNode(UDN, value);
 	}
 
-	public String getUDN()
-	{
+	public String getUDN() {
 		return getDeviceNode().getNodeValue(UDN);
 	}
 
-	public boolean hasUDN()
-	{
+	public boolean hasUDN() {
 		String udn = getUDN();
 		if (udn == null || udn.length() <= 0)
 			return false;
 		return true;
 	}
-	
-	////////////////////////////////////////////////
-	//	UPC
-	////////////////////////////////////////////////
+
+	// //////////////////////////////////////////////
+	// UPC
+	// //////////////////////////////////////////////
 
 	private final static String UPC = "UPC";
-	
-	public void setUPC(String value)
-	{
+
+	public void setUPC(String value) {
 		getDeviceNode().setNode(UPC, value);
 	}
 
-	public String getUPC()
-	{
+	public String getUPC() {
 		return getDeviceNode().getNodeValue(UPC);
 	}
 
-	////////////////////////////////////////////////
-	//	presentationURL
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// presentationURL
+	// //////////////////////////////////////////////
 
 	private final static String presentationURL = "presentationURL";
-	
-	public void setPresentationURL(String value)
-	{
+	private PresentationListener presentationListener;
+
+	public void setPresentationURL(String value) {
 		getDeviceNode().setNode(presentationURL, value);
 	}
 
-	public String getPresentationURL()
-	{
+	public String getPresentationURL() {
 		return getDeviceNode().getNodeValue(presentationURL);
 	}
 
-	////////////////////////////////////////////////
-	//	deviceList
-	////////////////////////////////////////////////
+	public boolean removePresentationURL() {
+		return getDeviceNode().removeNode(presentationURL);
+	}
+
+	private boolean isPresentationRequest(HTTPRequest httpReq) {
+		if (!httpReq.isGetRequest())
+			return false;
+		String urlPath = httpReq.getURI();
+		if (urlPath == null)
+			return false;
+		String presentationURL = getPresentationURL();
+		if (presentationURL == null)
+			return false;
+		return urlPath.startsWith(presentationURL);
+	}
+
+	public void setPresentationListener(PresentationListener listener) {
+		this.presentationListener = listener;
 
-	public DeviceList getDeviceList()
-	{
+		if (listener != null) {
+			setPresentationURL(DEFAULT_PRESENTATION_URI);
+		} else {
+			removePresentationURL();
+		}
+	}
+
+	public boolean hasPresentationListener() {
+		return (this.presentationListener != null) ? true : false;
+	}
+
+	public PresentationListener getPresentationListener() {
+		return this.presentationListener;
+	}
+
+	// //////////////////////////////////////////////
+	// deviceList
+	// //////////////////////////////////////////////
+
+	public DeviceList getDeviceList() {
 		DeviceList devList = new DeviceList();
 		Node devListNode = getDeviceNode().getNode(DeviceList.ELEM_NAME);
 		if (devListNode == null)
 			return devList;
 		int nNode = devListNode.getNNodes();
-		for (int n=0; n<nNode; n++) {
+		for (int n = 0; n < nNode; n++) {
 			Node node = devListNode.getNode(n);
 			if (Device.isDeviceNode(node) == false)
 				continue;
 			Device dev = new Device(node);
 			devList.add(dev);
-		} 
+		}
 		return devList;
 	}
 
-	public boolean isDevice(String name)
-	{
+	public boolean isDevice(String name) {
 		if (name == null)
 			return false;
 		if (name.endsWith(getUDN()) == true)
@@ -971,12 +1075,11 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			return true;
 		return false;
 	}
-	
-	public Device getDevice(String name)
-	{
+
+	public Device getDevice(String name) {
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			if (dev.isDevice(name) == true)
 				return dev;
@@ -986,12 +1089,11 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 		return null;
 	}
-	
-	public Device getDeviceByDescriptionURI(String uri)
-	{
+
+	public Device getDeviceByDescriptionURI(String uri) {
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			if (dev.isDescriptionURI(uri) == true)
 				return dev;
@@ -1001,151 +1103,144 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 		return null;
 	}
-	
-	////////////////////////////////////////////////
-	//	serviceList
-	////////////////////////////////////////////////
 
-	public ServiceList getServiceList()
-	{
+	// //////////////////////////////////////////////
+	// serviceList
+	// //////////////////////////////////////////////
+
+	public ServiceList getServiceList() {
 		ServiceList serviceList = new ServiceList();
 		Node serviceListNode = getDeviceNode().getNode(ServiceList.ELEM_NAME);
 		if (serviceListNode == null)
 			return serviceList;
 		int nNode = serviceListNode.getNNodes();
-		for (int n=0; n<nNode; n++) {
+		for (int n = 0; n < nNode; n++) {
 			Node node = serviceListNode.getNode(n);
 			if (Service.isServiceNode(node) == false)
 				continue;
 			Service service = new Service(node);
 			serviceList.add(service);
-		} 
+		}
 		return serviceList;
 	}
 
-	public Service getService(String name)
-	{
+	public Service getService(String name) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			if (service.isService(name) == true)
 				return service;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Service service = dev.getService(name);
 			if (service != null)
 				return service;
 		}
-		
+
 		return null;
 	}
 
-	public Service getServiceBySCPDURL(String searchUrl)
-	{
+	public Service getServiceBySCPDURL(String searchUrl) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			if (service.isSCPDURL(searchUrl) == true)
 				return service;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Service service = dev.getServiceBySCPDURL(searchUrl);
 			if (service != null)
 				return service;
 		}
-		
+
 		return null;
 	}
 
-	public Service getServiceByControlURL(String searchUrl)
-	{
+	public Service getServiceByControlURL(String searchUrl) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			if (service.isControlURL(searchUrl) == true)
 				return service;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Service service = dev.getServiceByControlURL(searchUrl);
 			if (service != null)
 				return service;
 		}
-		
+
 		return null;
 	}
 
-	public Service getServiceByEventSubURL(String searchUrl)
-	{
+	public Service getServiceByEventSubURL(String searchUrl) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			if (service.isEventSubURL(searchUrl) == true)
 				return service;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Service service = dev.getServiceByEventSubURL(searchUrl);
 			if (service != null)
 				return service;
 		}
-		
+
 		return null;
 	}
 
-	public Service getSubscriberService(String uuid)
-	{
+	public Service getSubscriberService(String uuid) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			String sid = service.getSID();
 			if (uuid.equals(sid) == true)
 				return service;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Service service = dev.getSubscriberService(uuid);
 			if (service != null)
 				return service;
 		}
-		
+
 		return null;
 	}
 
-	////////////////////////////////////////////////
-	//	StateVariable
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// StateVariable
+	// //////////////////////////////////////////////
 
-	public StateVariable getStateVariable(String serviceType, String name)
-	{
+	public StateVariable getStateVariable(String serviceType, String name) {
 		if (serviceType == null && name == null)
 			return null;
-		
+
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			// Thanks for Theo Beisch (11/09/04)
 			if (serviceType != null) {
@@ -1156,38 +1251,36 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			if (stateVar != null)
 				return stateVar;
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			StateVariable stateVar = dev.getStateVariable(serviceType, name);
 			if (stateVar != null)
 				return stateVar;
 		}
-		
+
 		return null;
 	}
 
-	public StateVariable getStateVariable(String name)
-	{
+	public StateVariable getStateVariable(String name) {
 		return getStateVariable(null, name);
 	}
-	
-	////////////////////////////////////////////////
-	//	Action
-	////////////////////////////////////////////////
 
-	public Action getAction(String name)
-	{
+	// //////////////////////////////////////////////
+	// Action
+	// //////////////////////////////////////////////
+
+	public Action getAction(String name) {
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			ActionList actionList = service.getActionList();
 			int actionCnt = actionList.size();
-			for (int i=0; i<actionCnt; i++) {
-				Action action = (Action)actionList.getAction(i);
+			for (int i = 0; i < actionCnt; i++) {
+				Action action = (Action) actionList.getAction(i);
 				String actionName = action.getName();
 				if (actionName == null)
 					continue;
@@ -1195,107 +1288,154 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 					return action;
 			}
 		}
-		
+
 		DeviceList devList = getDeviceList();
 		int devCnt = devList.size();
-		for (int n=0; n<devCnt; n++) {
+		for (int n = 0; n < devCnt; n++) {
 			Device dev = devList.getDevice(n);
 			Action action = dev.getAction(name);
 			if (action != null)
 				return action;
 		}
+
+		return null;
+	}
+
+	// //////////////////////////////////////////////
+	// iconList
+	// //////////////////////////////////////////////
+
+	private HashMap<String, byte[]> iconBytesMap = new HashMap<String, byte[]>();
+
+	public boolean isIconBytesURI(String uri) {
+		byte iconBytes[] = iconBytesMap.get(uri);
+		if (iconBytes == null)
+			return false;
+		return true;
+	}
+
+	public Icon getIconByURI(String uri) {
+		IconList iconList = getIconList();
+		if (iconList.size() <= 0)
+			return null;
+
+		int nIcon = iconList.size();
+		for (int n = 0; n < nIcon; n++) {
+			Icon icon = iconList.getIcon(n);
+			if (icon.isURL(uri))
+				return icon;
+		}
 		
 		return null;
 	}
 
-	////////////////////////////////////////////////
-	//	iconList
-	////////////////////////////////////////////////
+	public boolean addIcon(Icon icon) {
+		Node deviceNode = getDeviceNode();
+		if (deviceNode == null)
+			return false;
+
+		Node iconListNode = deviceNode.getNode(IconList.ELEM_NAME);
+		if (iconListNode == null) {
+			iconListNode = new Node(IconList.ELEM_NAME);
+			deviceNode.addNode(iconListNode);
+		}
+
+		Node iconNode = new Node(Icon.ELEM_NAME);
+		if (icon.getIconNode() != null) {
+			iconNode.set(icon.getIconNode());
+		}
+		iconListNode.addNode(iconNode);
+
+		if (icon.hasURL() && icon.hasBytes()) {
+			iconBytesMap.put(icon.getURL(), icon.getBytes());
+		}
+
+		return true;
+	}
 
-	public IconList getIconList()
-	{
+	public IconList getIconList() {
 		IconList iconList = new IconList();
 		Node iconListNode = getDeviceNode().getNode(IconList.ELEM_NAME);
 		if (iconListNode == null)
 			return iconList;
 		int nNode = iconListNode.getNNodes();
-		for (int n=0; n<nNode; n++) {
+		for (int n = 0; n < nNode; n++) {
 			Node node = iconListNode.getNode(n);
 			if (Icon.isIconNode(node) == false)
 				continue;
 			Icon icon = new Icon(node);
+			if (icon.hasURL()) {
+				String iconURL = icon.getURL();
+				byte iconBytes[] = iconBytesMap.get(iconURL);
+				if (iconBytes != null) {
+					icon.setBytes(iconBytes);
+				}
+			}
 			iconList.add(icon);
-		} 
+		}
 		return iconList;
 	}
-	
-	public Icon getIcon(int n)
-	{
+
+	public Icon getIcon(int n) {
 		IconList iconList = getIconList();
-		if (n < 0 && (iconList.size()-1) < n)
+		if (n < 0 && (iconList.size() - 1) < n)
 			return null;
 		return iconList.getIcon(n);
 	}
 
-	public Icon getSmallestIcon()
-	{
-		Icon smallestIcon = null;		
+	public Icon getSmallestIcon() {
+		Icon smallestIcon = null;
 		IconList iconList = getIconList();
 		int iconCount = iconList.size();
-		for (int n=0; n < iconCount; n++) {
+		for (int n = 0; n < iconCount; n++) {
 			Icon icon = iconList.getIcon(n);
 			if (null == smallestIcon) {
 				smallestIcon = icon;
 				continue;
 			}
 			if (icon.getWidth() < smallestIcon.getWidth())
-				smallestIcon = icon;			
+				smallestIcon = icon;
 		}
-		
+
 		return smallestIcon;
 	}
-	
-	////////////////////////////////////////////////
-	//	Notify
-	////////////////////////////////////////////////
 
-	public String getLocationURL(String host)
-	{
-		return HostInterface.getHostURL(host, getHTTPPort(), getDescriptionURI());
+	// //////////////////////////////////////////////
+	// Notify
+	// //////////////////////////////////////////////
+
+	public String getLocationURL(String host) {
+		return HostInterface.getHostURL(host, getHTTPPort(),
+				getDescriptionURI());
 	}
 
-	private String getNotifyDeviceNT()
-	{
+	private String getNotifyDeviceNT() {
 		if (isRootDevice() == false)
-			return getUDN();			
+			return getUDN();
 		return UPNP_ROOTDEVICE;
 	}
 
-	private String getNotifyDeviceUSN()
-	{
+	private String getNotifyDeviceUSN() {
 		if (isRootDevice() == false)
-			return getUDN();			
+			return getUDN();
 		return getUDN() + "::" + UPNP_ROOTDEVICE;
 	}
 
-	private String getNotifyDeviceTypeNT()
-	{
+	private String getNotifyDeviceTypeNT() {
 		return getDeviceType();
 	}
 
-	private String getNotifyDeviceTypeUSN()
-	{
+	private String getNotifyDeviceTypeUSN() {
 		return getUDN() + "::" + getDeviceType();
 	}
-	
-	public final static void notifyWait()
-	{
+
+	public final static void notifyWait() {
 		TimerUtil.waitRandom(DEFAULT_DISCOVERY_WAIT_TIME);
 	}
-	public void announce(String bindAddr)
-	{
+
+	public void announce(String bindAddr) {
 		String devLocation = getLocationURL(bindAddr);
-		
+
 		SSDPNotifySocket ssdpSock = new SSDPNotifySocket(bindAddr);
 
 		SSDPNotifyRequest ssdpReq = new SSDPNotifyRequest();
@@ -1303,90 +1443,90 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		ssdpReq.setLeaseTime(getLeaseTime());
 		ssdpReq.setLocation(devLocation);
 		ssdpReq.setNTS(NTS.ALIVE);
-		
-		// uuid:device-UUID(::upnp:rootdevice)* 
+		ssdpReq.setBootId(getBootId());
+
+		// uuid:device-UUID(::upnp:rootdevice)*
 		if (isRootDevice() == true) {
-			String devNT = getNotifyDeviceNT();			
+			String devNT = getNotifyDeviceNT();
 			String devUSN = getNotifyDeviceUSN();
 			ssdpReq.setNT(devNT);
 			ssdpReq.setUSN(devUSN);
 			ssdpSock.post(ssdpReq);
-			 
-			String devUDN = getUDN(); 
-			ssdpReq.setNT(devUDN); 
-			ssdpReq.setUSN(devUDN); 
-			ssdpSock.post(ssdpReq); 			
+
+			String devUDN = getUDN();
+			ssdpReq.setNT(devUDN);
+			ssdpReq.setUSN(devUDN);
+			ssdpSock.post(ssdpReq);
 		}
-		
-		// uuid:device-UUID::urn:schemas-upnp-org:device:deviceType:v 
-		String devNT = getNotifyDeviceTypeNT();			
+
+		// uuid:device-UUID::urn:schemas-upnp-org:device:deviceType:v
+		String devNT = getNotifyDeviceTypeNT();
 		String devUSN = getNotifyDeviceTypeUSN();
 		ssdpReq.setNT(devNT);
 		ssdpReq.setUSN(devUSN);
 		ssdpSock.post(ssdpReq);
-		
+
 		// Thanks for Mikael Hakman (04/25/05)
 		ssdpSock.close();
-		
+
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			service.announce(bindAddr);
 		}
 
 		DeviceList childDeviceList = getDeviceList();
 		int childDeviceCnt = childDeviceList.size();
-		for (int n=0; n<childDeviceCnt; n++) {
+		for (int n = 0; n < childDeviceCnt; n++) {
 			Device childDevice = childDeviceList.getDevice(n);
 			childDevice.announce(bindAddr);
 		}
 	}
 
-	public void announce(){
+	public void announce() {
 		notifyWait();
 		InetAddress[] binds = getDeviceData().getHTTPBindAddress();
 		String[] bindAddresses;
-		if(binds!=null){			
+		if (binds != null) {
 			bindAddresses = new String[binds.length];
 			for (int i = 0; i < binds.length; i++) {
 				bindAddresses[i] = binds[i].getHostAddress();
 			}
-		}else{
+		} else {
 			int nHostAddrs = HostInterface.getNHostAddresses();
-			bindAddresses = new String[nHostAddrs]; 
-			for (int n=0; n<nHostAddrs; n++) {
+			bindAddresses = new String[nHostAddrs];
+			for (int n = 0; n < nHostAddrs; n++) {
 				bindAddresses[n] = HostInterface.getHostAddress(n);
 			}
-		}		
+		}
 		for (int j = 0; j < bindAddresses.length; j++) {
-			if(bindAddresses[j] == null || bindAddresses[j].length() == 0)
+			if (bindAddresses[j] == null || bindAddresses[j].length() == 0)
 				continue;
 			int ssdpCount = getSSDPAnnounceCount();
-			for (int i=0; i<ssdpCount; i++)
+			for (int i = 0; i < ssdpCount; i++)
 				announce(bindAddresses[j]);
-			
+
 		}
 	}
-	
-	public void byebye(String bindAddr)
-	{
+
+	public void byebye(String bindAddr) {
 		SSDPNotifySocket ssdpSock = new SSDPNotifySocket(bindAddr);
-		
+
 		SSDPNotifyRequest ssdpReq = new SSDPNotifyRequest();
 		ssdpReq.setNTS(NTS.BYEBYE);
-		
-		// uuid:device-UUID(::upnp:rootdevice)* 
+
+		// uuid:device-UUID(::upnp:rootdevice)*
 		if (isRootDevice() == true) {
-			String devNT = getNotifyDeviceNT();			
+			String devNT = getNotifyDeviceNT();
 			String devUSN = getNotifyDeviceUSN();
 			ssdpReq.setNT(devNT);
 			ssdpReq.setUSN(devUSN);
 			ssdpSock.post(ssdpReq);
 		}
-		
-		// uuid:device-UUID::urn:schemas-upnp-org:device:deviceType:v 
-		String devNT = getNotifyDeviceTypeNT();			
+
+		// uuid:device-UUID::urn:schemas-upnp-org:device:deviceType:v
+		String devNT = getNotifyDeviceTypeNT();
 		String devUSN = getNotifyDeviceTypeUSN();
 		ssdpReq.setNT(devNT);
 		ssdpReq.setUSN(devUSN);
@@ -1394,203 +1534,203 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 
 		// Thanks for Mikael Hakman (04/25/05)
 		ssdpSock.close();
-		
+
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			service.byebye(bindAddr);
 		}
 
 		DeviceList childDeviceList = getDeviceList();
 		int childDeviceCnt = childDeviceList.size();
-		for (int n=0; n<childDeviceCnt; n++) {
+		for (int n = 0; n < childDeviceCnt; n++) {
 			Device childDevice = childDeviceList.getDevice(n);
 			childDevice.byebye(bindAddr);
 		}
 	}
 
-	public void byebye(){
+	public void byebye() {
 
 		InetAddress[] binds = getDeviceData().getHTTPBindAddress();
 		String[] bindAddresses;
-		if(binds!=null){			
+		if (binds != null) {
 			bindAddresses = new String[binds.length];
 			for (int i = 0; i < binds.length; i++) {
 				bindAddresses[i] = binds[i].getHostAddress();
 			}
-		}else{
+		} else {
 			int nHostAddrs = HostInterface.getNHostAddresses();
-			bindAddresses = new String[nHostAddrs]; 
-			for (int n=0; n<nHostAddrs; n++) {
+			bindAddresses = new String[nHostAddrs];
+			for (int n = 0; n < nHostAddrs; n++) {
 				bindAddresses[n] = HostInterface.getHostAddress(n);
 			}
-		}		
-		
-		for (int j = 0; j < bindAddresses.length; j++) {			
+		}
+
+		for (int j = 0; j < bindAddresses.length; j++) {
 			if (bindAddresses[j] == null || bindAddresses[j].length() <= 0)
 				continue;
 			int ssdpCount = getSSDPAnnounceCount();
-			for (int i=0; i<ssdpCount; i++)
+			for (int i = 0; i < ssdpCount; i++)
 				byebye(bindAddresses[j]);
-		}		
+		}
 	}
 
-	////////////////////////////////////////////////
-	//	Search
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// Search
+	// //////////////////////////////////////////////
+
+	private static Calendar cal = Calendar.getInstance();
 
-    private static Calendar cal = Calendar.getInstance();
-    public boolean postSearchResponse(SSDPPacket ssdpPacket, String st, String usn)
-	{
+	public boolean postSearchResponse(SSDPPacket ssdpPacket, String st,
+			String usn) {
 		String localAddr = ssdpPacket.getLocalAddress();
 		Device rootDev = getRootDevice();
 		String rootDevLocation = rootDev.getLocationURL(localAddr);
-		
+
 		SSDPSearchResponse ssdpRes = new SSDPSearchResponse();
 		ssdpRes.setLeaseTime(getLeaseTime());
 		ssdpRes.setDate(cal);
 		ssdpRes.setST(st);
 		ssdpRes.setUSN(usn);
 		ssdpRes.setLocation(rootDevLocation);
+		ssdpRes.setBootId(getBootId());
 		// Thanks for Brent Hills (10/20/04)
 		ssdpRes.setMYNAME(getFriendlyName());
 
 		int mx = ssdpPacket.getMX();
 		TimerUtil.waitRandom(mx * 1000);
-		
+
 		String remoteAddr = ssdpPacket.getRemoteAddress();
 		int remotePort = ssdpPacket.getRemotePort();
 		SSDPSearchResponseSocket ssdpResSock = new SSDPSearchResponseSocket();
 		if (Debug.isOn() == true)
 			ssdpRes.print();
 		int ssdpCount = getSSDPAnnounceCount();
-		for (int i=0; i<ssdpCount; i++)
+		for (int i = 0; i < ssdpCount; i++)
 			ssdpResSock.post(remoteAddr, remotePort, ssdpRes);
-			
+
 		return true;
 	}
-	
-	public void deviceSearchResponse(SSDPPacket ssdpPacket)
-	{
+
+	public void deviceSearchResponse(SSDPPacket ssdpPacket) {
 		String ssdpST = ssdpPacket.getST();
 
 		if (ssdpST == null)
 			return;
 
 		boolean isRootDevice = isRootDevice();
-		
+
 		String devUSN = getUDN();
 		if (isRootDevice == true)
 			devUSN += "::" + USN.ROOTDEVICE;
-			
+
 		if (ST.isAllDevice(ssdpST) == true) {
-			String devNT = getNotifyDeviceNT();			
+			String devNT = getNotifyDeviceNT();
 			int repeatCnt = (isRootDevice == true) ? 3 : 2;
-			for (int n=0; n<repeatCnt; n++)
+			for (int n = 0; n < repeatCnt; n++)
 				postSearchResponse(ssdpPacket, devNT, devUSN);
-		}
-		else if (ST.isRootDevice(ssdpST) == true) {
+		} else if (ST.isRootDevice(ssdpST) == true) {
 			if (isRootDevice == true)
 				postSearchResponse(ssdpPacket, ST.ROOT_DEVICE, devUSN);
-		}
-		else if (ST.isUUIDDevice(ssdpST) == true) {
+		} else if (ST.isUUIDDevice(ssdpST) == true) {
 			String devUDN = getUDN();
 			if (ssdpST.equals(devUDN) == true)
 				postSearchResponse(ssdpPacket, devUDN, devUSN);
-		}
-		else if (ST.isURNDevice(ssdpST) == true) {
-			String devType= getDeviceType();
+		} else if (ST.isURNDevice(ssdpST) == true) {
+			String devType = getDeviceType();
 			if (ssdpST.equals(devType) == true) {
 				// Thanks for Mikael Hakman (04/25/05)
 				devUSN = getUDN() + "::" + devType;
 				postSearchResponse(ssdpPacket, devType, devUSN);
 			}
 		}
-		
+
 		ServiceList serviceList = getServiceList();
 		int serviceCnt = serviceList.size();
-		for (int n=0; n<serviceCnt; n++) {
+		for (int n = 0; n < serviceCnt; n++) {
 			Service service = serviceList.getService(n);
 			service.serviceSearchResponse(ssdpPacket);
 		}
-		
+
 		DeviceList childDeviceList = getDeviceList();
 		int childDeviceCnt = childDeviceList.size();
-		for (int n=0; n<childDeviceCnt; n++) {
+		for (int n = 0; n < childDeviceCnt; n++) {
 			Device childDevice = childDeviceList.getDevice(n);
 			childDevice.deviceSearchResponse(ssdpPacket);
 		}
 	}
-	
-	public void deviceSearchReceived(SSDPPacket ssdpPacket)
-	{
+
+	public void deviceSearchReceived(SSDPPacket ssdpPacket) {
 		deviceSearchResponse(ssdpPacket);
 	}
-	
-	////////////////////////////////////////////////
-	//	HTTP Server	
-	////////////////////////////////////////////////
 
-	public void setHTTPPort(int port)
-	{
+	// //////////////////////////////////////////////
+	// HTTP Server
+	// //////////////////////////////////////////////
+
+	public void setHTTPPort(int port) {
 		getDeviceData().setHTTPPort(port);
 	}
-	
-	public int getHTTPPort()
-	{
+
+	public int getHTTPPort() {
 		return getDeviceData().getHTTPPort();
 	}
 
-	public void setHTTPBindAddress(InetAddress[] inets){
+	public void setHTTPBindAddress(InetAddress[] inets) {
 		this.getDeviceData().setHTTPBindAddress(inets);
 	}
-	
-	public InetAddress[] getHTTPBindAddress(){
+
+	public InetAddress[] getHTTPBindAddress() {
 		return this.getDeviceData().getHTTPBindAddress();
-	}	
-	
+	}
+
 	/**
 	 * 
 	 * @return SSDPIPv4MulticastAddress
 	 * @since 1.8
 	 */
-	public String getSSDPIPv4MulticastAddress(){
+	public String getSSDPIPv4MulticastAddress() {
 		return this.getDeviceData().getMulticastIPv4Address();
-	}	
-	
+	}
+
 	/**
 	 * 
 	 * @param ip
 	 * @since 1.8
 	 */
-	public void getSSDPIPv4MulticastAddress(String ip){
+	public void getSSDPIPv4MulticastAddress(String ip) {
 		this.getDeviceData().setMulticastIPv4Address(ip);
-	}	
-	
+	}
+
 	/**
 	 * 
 	 * @return SSDPIPv6MulticastAddress
 	 * @since 1.8
 	 */
-	public String getSSDPIPv6MulticastAddress(){
+	public String getSSDPIPv6MulticastAddress() {
 		return this.getDeviceData().getMulticastIPv6Address();
-	}	
-	
+	}
+
 	/**
 	 * 
 	 * @param ip
 	 * @since 1.8
 	 */
-	public void getSSDPIPv6MulticastAddress(String ip){
+	public void getSSDPIPv6MulticastAddress(String ip) {
 		this.getDeviceData().setMulticastIPv6Address(ip);
-	}	
-	
-	public void httpRequestRecieved(HTTPRequest httpReq)
-	{
+	}
+
+	public void httpRequestRecieved(HTTPRequest httpReq) {
 		if (Debug.isOn() == true)
 			httpReq.print();
-	
+
+		if (hasPresentationListener() && isPresentationRequest(httpReq)) {
+			PresentationListener listener = getPresentationListener();
+			listener.httpRequestRecieved(httpReq);
+			return;
+		}
+
 		if (httpReq.isGetRequest() == true || httpReq.isHeadRequest() == true) {
 			httpGetRequestRecieved(httpReq);
 			return;
@@ -1600,7 +1740,8 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			return;
 		}
 
-		if (httpReq.isSubscribeRequest() == true || httpReq.isUnsubscribeRequest() == true) {
+		if (httpReq.isSubscribeRequest() == true
+				|| httpReq.isUnsubscribeRequest() == true) {
 			SubscriptionRequest subReq = new SubscriptionRequest(httpReq);
 			deviceEventSubscriptionRecieved(subReq);
 			return;
@@ -1609,8 +1750,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		httpReq.returnBadRequest();
 	}
 
-	private synchronized byte[] getDescriptionData(String host)
-	{
+	private synchronized byte[] getDescriptionData(String host) {
 		if (isNMPRMode() == false)
 			updateURLBase(host);
 		Node rootNode = getRootNode();
@@ -1623,73 +1763,87 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		desc += rootNode.toString();
 		return desc.getBytes();
 	}
-	
-	private void httpGetRequestRecieved(HTTPRequest httpReq)
-	{
+
+	private void httpGetRequestRecieved(HTTPRequest httpReq) {
 		String uri = httpReq.getURI();
 		Debug.message("httpGetRequestRecieved = " + uri);
 		if (uri == null) {
 			httpReq.returnBadRequest();
 			return;
 		}
-					
+
 		Device embDev;
 		Service embService;
-		
+
 		byte fileByte[] = new byte[0];
+		String contentType = null;
+		String contentLanguage = null;
+
 		if (isDescriptionURI(uri) == true) {
 			String localAddr = httpReq.getLocalAddress();
 			if ((localAddr == null) || (localAddr.length() <= 0))
 				localAddr = HostInterface.getInterface();
+			contentType = XML.DEFAULT_CONTENT_TYPE;
+			contentLanguage = XML.DEFAULT_CONTENT_LANGUAGE;
 			fileByte = getDescriptionData(localAddr);
-		}
-		else if ((embDev = getDeviceByDescriptionURI(uri)) != null) {
+		} else if ((embDev = getDeviceByDescriptionURI(uri)) != null) {
 			String localAddr = httpReq.getLocalAddress();
+			contentType = XML.DEFAULT_CONTENT_TYPE;
+			contentLanguage = XML.DEFAULT_CONTENT_LANGUAGE;
 			fileByte = embDev.getDescriptionData(localAddr);
-		}
-		else if ((embService = getServiceBySCPDURL(uri)) != null) {
+		} else if ((embService = getServiceBySCPDURL(uri)) != null) {
+			contentType = XML.DEFAULT_CONTENT_TYPE;
+			contentLanguage = XML.DEFAULT_CONTENT_LANGUAGE;
 			fileByte = embService.getSCPDData();
-		}
-		else {
+		} else if (isIconBytesURI(uri) == true) {
+			Icon devIcon = getIconByURI(uri);
+			if (devIcon != null) {
+				contentType = devIcon.getMimeType();
+				fileByte = devIcon.getBytes();
+			}
+		} else {
 			httpReq.returnBadRequest();
 			return;
 		}
-		
+
 		HTTPResponse httpRes = new HTTPResponse();
-		if (FileUtil.isXMLFileName(uri) == true)
-			httpRes.setContentType(XML.CONTENT_TYPE);
 		httpRes.setStatusCode(HTTPStatus.OK);
+		if (contentType != null) {
+			httpRes.setContentType(contentType);
+		}
+		if (contentLanguage != null) {
+			// FIXME Check ACCEPT-LANGUAGE header in client request, and set a
+			// suitable code.
+			httpRes.setContentLanguage(contentLanguage);
+		}
 		httpRes.setContent(fileByte);
 
 		httpReq.post(httpRes);
 	}
 
-	private void httpPostRequestRecieved(HTTPRequest httpReq)
-	{
+	private void httpPostRequestRecieved(HTTPRequest httpReq) {
 		if (httpReq.isSOAPAction() == true) {
-			//SOAPRequest soapReq = new SOAPRequest(httpReq);
+			// SOAPRequest soapReq = new SOAPRequest(httpReq);
 			soapActionRecieved(httpReq);
 			return;
 		}
 		httpReq.returnBadRequest();
 	}
 
-	////////////////////////////////////////////////
-	//	SOAP
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// SOAP
+	// //////////////////////////////////////////////
 
-	private void soapBadActionRecieved(HTTPRequest soapReq)
-	{
+	private void soapBadActionRecieved(HTTPRequest soapReq) {
 		SOAPResponse soapRes = new SOAPResponse();
 		soapRes.setStatusCode(HTTPStatus.BAD_REQUEST);
 		soapReq.post(soapRes);
 	}
 
-	private void soapActionRecieved(HTTPRequest soapReq)
-	{
+	private void soapActionRecieved(HTTPRequest soapReq) {
 		String uri = soapReq.getURI();
 		Service ctlService = getServiceByControlURL(uri);
-		if (ctlService != null)  {
+		if (ctlService != null) {
 			ActionRequest crlReq = new ActionRequest(soapReq);
 			deviceControlRequestRecieved(crlReq, ctlService);
 			return;
@@ -1697,37 +1851,35 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		soapBadActionRecieved(soapReq);
 	}
 
-	////////////////////////////////////////////////
-	//	controlAction
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// controlAction
+	// //////////////////////////////////////////////
 
-	private void deviceControlRequestRecieved(ControlRequest ctlReq, Service service)
-	{
+	private void deviceControlRequestRecieved(ControlRequest ctlReq,
+			Service service) {
 		if (ctlReq.isQueryControl() == true)
 			deviceQueryControlRecieved(new QueryRequest(ctlReq), service);
 		else
 			deviceActionControlRecieved(new ActionRequest(ctlReq), service);
 	}
 
-	private void invalidActionControlRecieved(ControlRequest ctlReq)
-	{
+	private void invalidActionControlRecieved(ControlRequest ctlReq) {
 		ControlResponse actRes = new ActionResponse();
 		actRes.setFaultResponse(UPnPStatus.INVALID_ACTION);
 		ctlReq.post(actRes);
 	}
 
-   private void invalidArgumentsControlRecieved(ControlRequest ctlReq)
-    {
-        ControlResponse actRes = new ActionResponse();
-        actRes.setFaultResponse(UPnPStatus.INVALID_ARGS);
-        ctlReq.post(actRes);
-    }
+	private void invalidArgumentsControlRecieved(ControlRequest ctlReq) {
+		ControlResponse actRes = new ActionResponse();
+		actRes.setFaultResponse(UPnPStatus.INVALID_ARGS);
+		ctlReq.post(actRes);
+	}
 
-	private void deviceActionControlRecieved(ActionRequest ctlReq, Service service)
-	{
+	private void deviceActionControlRecieved(ActionRequest ctlReq,
+			Service service) {
 		if (Debug.isOn() == true)
 			ctlReq.print();
-			
+
 		String actionName = ctlReq.getActionName();
 		Action action = service.getAction(actionName);
 		if (action == null) {
@@ -1736,18 +1888,17 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 		ArgumentList actionArgList = action.getArgumentList();
 		ArgumentList reqArgList = ctlReq.getArgumentList();
-        try {
-            actionArgList.setReqArgs(reqArgList);
-        } catch (IllegalArgumentException ex){
-            invalidArgumentsControlRecieved(ctlReq);
-            return;
-       }
+		try {
+			actionArgList.setReqArgs(reqArgList);
+		} catch (IllegalArgumentException ex) {
+			invalidArgumentsControlRecieved(ctlReq);
+			return;
+		}
 		if (action.performActionListener(ctlReq) == false)
 			invalidActionControlRecieved(ctlReq);
 	}
 
-	private void deviceQueryControlRecieved(QueryRequest ctlReq, Service service)
-	{
+	private void deviceQueryControlRecieved(QueryRequest ctlReq, Service service) {
 		if (Debug.isOn() == true)
 			ctlReq.print();
 		String varName = ctlReq.getVarName();
@@ -1760,19 +1911,18 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			invalidActionControlRecieved(ctlReq);
 	}
 
-	////////////////////////////////////////////////
-	//	eventSubscribe
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// eventSubscribe
+	// //////////////////////////////////////////////
 
-	private void upnpBadSubscriptionRecieved(SubscriptionRequest subReq, int code)
-	{
+	private void upnpBadSubscriptionRecieved(SubscriptionRequest subReq,
+			int code) {
 		SubscriptionResponse subRes = new SubscriptionResponse();
 		subRes.setErrorResponse(code);
 		subReq.post(subRes);
 	}
 
-	private void deviceEventSubscriptionRecieved(SubscriptionRequest subReq)
-	{
+	private void deviceEventSubscriptionRecieved(SubscriptionRequest subReq) {
 		String uri = subReq.getURI();
 		Service service = getServiceByEventSubURL(uri);
 		if (service == null) {
@@ -1795,36 +1945,35 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			deviceEventNewSubscriptionRecieved(service, subReq);
 			return;
 		}
-		
+
 		// SUBSCRIBE (RENEW)
 		if (subReq.hasSID() == true) {
 			deviceEventRenewSubscriptionRecieved(service, subReq);
 			return;
 		}
-		
+
 		upnpBadSubscriptionRecieved(subReq, HTTPStatus.PRECONDITION_FAILED);
 	}
 
-	private void deviceEventNewSubscriptionRecieved(Service service, SubscriptionRequest subReq)
-	{
+	private void deviceEventNewSubscriptionRecieved(Service service,
+			SubscriptionRequest subReq) {
 		String callback = subReq.getCallback();
 		try {
 			new URL(callback);
-		}
-		catch (Exception e) {
+		} catch (Exception e) {
 			upnpBadSubscriptionRecieved(subReq, HTTPStatus.PRECONDITION_FAILED);
 			return;
 		}
 
 		long timeOut = subReq.getTimeout();
 		String sid = Subscription.createSID();
-			
+
 		Subscriber sub = new Subscriber();
 		sub.setDeliveryURL(callback);
 		sub.setTimeOut(timeOut);
 		sub.setSID(sid);
 		service.addSubscriber(sub);
-			
+
 		SubscriptionResponse subRes = new SubscriptionResponse();
 		subRes.setStatusCode(HTTPStatus.OK);
 		subRes.setSID(sid);
@@ -1835,12 +1984,12 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 
 		if (Debug.isOn() == true)
 			subRes.print();
-		
+
 		service.notifyAllStateVariables();
 	}
 
-	private void deviceEventRenewSubscriptionRecieved(Service service, SubscriptionRequest subReq)
-	{
+	private void deviceEventRenewSubscriptionRecieved(Service service,
+			SubscriptionRequest subReq) {
 		String sid = subReq.getSID();
 		Subscriber sub = service.getSubscriber(sid);
 
@@ -1852,19 +2001,19 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		long timeOut = subReq.getTimeout();
 		sub.setTimeOut(timeOut);
 		sub.renew();
-				
+
 		SubscriptionResponse subRes = new SubscriptionResponse();
 		subRes.setStatusCode(HTTPStatus.OK);
 		subRes.setSID(sid);
 		subRes.setTimeout(timeOut);
 		subReq.post(subRes);
-		
+
 		if (Debug.isOn() == true)
 			subRes.print();
-	}		
+	}
 
-	private void deviceEventUnsubscriptionRecieved(Service service, SubscriptionRequest subReq)
-	{
+	private void deviceEventUnsubscriptionRecieved(Service service,
+			SubscriptionRequest subReq) {
 		String sid = subReq.getSID();
 		Subscriber sub = service.getSubscriber(sid);
 
@@ -1874,28 +2023,29 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 
 		service.removeSubscriber(sub);
-						
+
 		SubscriptionResponse subRes = new SubscriptionResponse();
 		subRes.setStatusCode(HTTPStatus.OK);
 		subReq.post(subRes);
-		
+
 		if (Debug.isOn() == true)
 			subRes.print();
-	}		
-	
-	////////////////////////////////////////////////
-	//	Thread	
-	////////////////////////////////////////////////
-
-	private HTTPServerList getHTTPServerList() 
-	{
+	}
+
+	// //////////////////////////////////////////////
+	// Thread
+	// //////////////////////////////////////////////
+
+	private HTTPServerList getHTTPServerList() {
 		return getDeviceData().getHTTPServerList();
 	}
+
 	/**
 	 * 
-	 * @param port The port to use for binding the SSDP service
+	 * @param port
+	 *            The port to use for binding the SSDP service
 	 */
-	public void setSSDPPort(int port){
+	public void setSSDPPort(int port) {
 		this.getDeviceData().setSSDPPort(port);
 	}
 
@@ -1903,36 +2053,35 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	 * 
 	 * @return The port to use for binding the SSDP service
 	 */
-	public int getSSDPPort(){
+	public int getSSDPPort() {
 		return this.getDeviceData().getSSDPPort();
 	}
-	
-	
 
 	/**
 	 * 
-	 * @param inets The IP that will be used for binding the SSDP service.
-	 * 		Use <code>null</code> to get the default beahvior 
+	 * @param inets
+	 *            The IP that will be used for binding the SSDP service. Use
+	 *            <code>null</code> to get the default beahvior
 	 */
-	public void setSSDPBindAddress(InetAddress[] inets){
+	public void setSSDPBindAddress(InetAddress[] inets) {
 		this.getDeviceData().setSSDPBindAddress(inets);
 	}
-		
-	
+
 	/**
 	 * 
-	 * @return inets The IP that will be used for binding the SSDP service.
-	 * 		null means the default setted by the class UPnP
+	 * @return inets The IP that will be used for binding the SSDP service. null
+	 *         means the default setted by the class UPnP
 	 */
-	public InetAddress[] getSSDPBindAddress(){
+	public InetAddress[] getSSDPBindAddress() {
 		return this.getDeviceData().getSSDPBindAddress();
-	}	
-	
+	}
+
 	/**
 	 * 
-	 * @param ip The IPv4 address used for Multicast comunication
+	 * @param ip
+	 *            The IPv4 address used for Multicast comunication
 	 */
-	public void setMulticastIPv4Address(String ip){
+	public void setMulticastIPv4Address(String ip) {
 		this.getDeviceData().setMulticastIPv4Address(ip);
 	}
 
@@ -1940,15 +2089,16 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	 * 
 	 * @return The IPv4 address used for Multicast comunication
 	 */
-	public String getMulticastIPv4Address(){
+	public String getMulticastIPv4Address() {
 		return this.getDeviceData().getMulticastIPv4Address();
 	}
-	
+
 	/**
 	 * 
-	 * @param ip The IPv address used for Multicast comunication
+	 * @param ip
+	 *            The IPv address used for Multicast comunication
 	 */
-	public void setMulticastIPv6Address(String ip){
+	public void setMulticastIPv6Address(String ip) {
 		this.getDeviceData().setMulticastIPv6Address(ip);
 	}
 
@@ -1956,34 +2106,29 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 	 * 
 	 * @return The IPv address used for Multicast comunication
 	 */
-	public String getMulticastIPv6Address(){
+	public String getMulticastIPv6Address() {
 		return this.getDeviceData().getMulticastIPv6Address();
 	}
-	
 
-	private SSDPSearchSocketList getSSDPSearchSocketList() 
-	{
+	private SSDPSearchSocketList getSSDPSearchSocketList() {
 		return getDeviceData().getSSDPSearchSocketList();
 	}
 
-	private void setAdvertiser(Advertiser adv) 
-	{
+	private void setAdvertiser(Advertiser adv) {
 		getDeviceData().setAdvertiser(adv);
 	}
-	
-	private Advertiser getAdvertiser() 
-	{
+
+	private Advertiser getAdvertiser() {
 		return getDeviceData().getAdvertiser();
 	}
 
-	public boolean start()
-	{
+	public boolean start() {
 		stop(true);
-		
-		////////////////////////////////////////
+
+		// //////////////////////////////////////
 		// HTTP Server
-		////////////////////////////////////////
-		
+		// //////////////////////////////////////
+
 		int retryCnt = 0;
 		int bindPort = getHTTPPort();
 		HTTPServerList httpServerList = getHTTPServerList();
@@ -1997,48 +2142,54 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		httpServerList.addRequestListener(this);
 		httpServerList.start();
 
-		////////////////////////////////////////
+		// //////////////////////////////////////
 		// SSDP Seach Socket
-		////////////////////////////////////////
-		
+		// //////////////////////////////////////
+
 		SSDPSearchSocketList ssdpSearchSockList = getSSDPSearchSocketList();
 		if (ssdpSearchSockList.open() == false)
 			return false;
 		ssdpSearchSockList.addSearchListener(this);
 		ssdpSearchSockList.start();
 
-		////////////////////////////////////////
+		// //////////////////////////////////////
+		// BOOTID/CONFIGID.UPNP.ORG
+		// //////////////////////////////////////
+
+		updateBootId();
+		updateConfigId();
+
+		// //////////////////////////////////////
 		// Announce
-		////////////////////////////////////////
-		
+		// //////////////////////////////////////
+
 		announce();
-		
-		////////////////////////////////////////
+
+		// //////////////////////////////////////
 		// Advertiser
-		////////////////////////////////////////
+		// //////////////////////////////////////
 
 		Advertiser adv = new Advertiser(this);
 		setAdvertiser(adv);
 		adv.start();
-		
+
 		return true;
 	}
 
-	private boolean stop(boolean doByeBye)
-	{
+	private boolean stop(boolean doByeBye) {
 		if (doByeBye == true)
 			byebye();
-		
+
 		HTTPServerList httpServerList = getHTTPServerList();
 		httpServerList.stop();
 		httpServerList.close();
 		httpServerList.clear();
-		
+
 		SSDPSearchSocketList ssdpSearchSockList = getSSDPSearchSocketList();
 		ssdpSearchSockList.stop();
 		ssdpSearchSockList.close();
 		ssdpSearchSockList.clear();
-		
+
 		Advertiser adv = getAdvertiser();
 		if (adv != null) {
 			adv.stop();
@@ -2047,60 +2198,55 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 
 		return true;
 	}
-	
-	public boolean stop()
-	{
+
+	public boolean stop() {
 		return stop(true);
 	}
 
-	public boolean isRunning()
-	{
+	public boolean isRunning() {
 		return (getAdvertiser() != null) ? true : false;
 	}
 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
 	// Interface Address
-	////////////////////////////////////////////////
-	
-	public String getInterfaceAddress() 
-	{
+	// //////////////////////////////////////////////
+
+	public String getInterfaceAddress() {
 		SSDPPacket ssdpPacket = getSSDPPacket();
 		if (ssdpPacket == null)
 			return "";
 		return ssdpPacket.getLocalAddress();
 	}
 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
 	// Acion/QueryListener
-	////////////////////////////////////////////////
-	
-	public void setActionListener(ActionListener listener)
-	{
+	// //////////////////////////////////////////////
+
+	public void setActionListener(ActionListener listener) {
 		ServiceList serviceList = getServiceList();
 		int nServices = serviceList.size();
-		for (int n=0; n<nServices; n++) {
+		for (int n = 0; n < nServices; n++) {
 			Service service = serviceList.getService(n);
 			service.setActionListener(listener);
 		}
 	}
 
-	public void setQueryListener(QueryListener listener)
-	{
+	public void setQueryListener(QueryListener listener) {
 		ServiceList serviceList = getServiceList();
 		int nServices = serviceList.size();
-		for (int n=0; n<nServices; n++) {
+		for (int n = 0; n < nServices; n++) {
 			Service service = serviceList.getService(n);
 			service.setQueryListener(listener);
 		}
 	}
 
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
 	// Acion/QueryListener (includeSubDevices)
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
 
 	// Thanks for Mikael Hakman (04/25/05)
-	public void setActionListener(ActionListener listener, boolean includeSubDevices) 
-	{
+	public void setActionListener(ActionListener listener,
+			boolean includeSubDevices) {
 		setActionListener(listener);
 		if (includeSubDevices == true) {
 			DeviceList devList = getDeviceList();
@@ -2111,10 +2257,10 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 			}
 		}
 	}
-		
+
 	// Thanks for Mikael Hakman (04/25/05)
-	public void setQueryListener(QueryListener listener, boolean includeSubDevices) 
-	{
+	public void setQueryListener(QueryListener listener,
+			boolean includeSubDevices) {
 		setQueryListener(listener);
 		if (includeSubDevices == true) {
 			DeviceList devList = getDeviceList();
@@ -2126,50 +2272,40 @@ public class Device implements org.cybergarage.http.HTTPRequestListener, SearchL
 		}
 	}
 
-	////////////////////////////////////////////////
-	//	userData
-	////////////////////////////////////////////////
+	// //////////////////////////////////////////////
+	// userData
+	// //////////////////////////////////////////////
 
-	private Object userData = null; 
-	
-	public void setUserData(Object data) 
-	{
+	private Object userData = null;
+
+	public void setUserData(Object data) {
 		userData = data;
 	}
 
-	public Object getUserData() 
-	{
+	public Object getUserData() {
 		return userData;
 	}
-	
-	////////////////////////////////////////////////
-	//	output
-	////////////////////////////////////////////////
-
-/*
-	public void output(PrintWriter ps) 
-	{
-		ps.println("deviceType = " + getDeviceType());
-		ps.println("freindlyName = " + getFriendlyName());
-		ps.println("presentationURL = " + getPresentationURL());
 
-		DeviceList devList = getDeviceList();
-		ps.println("devList = " + devList.size());
-		
-		ServiceList serviceList = getServiceList();
-		ps.println("serviceList = " + serviceList.size());
+	// //////////////////////////////////////////////
+	// output
+	// //////////////////////////////////////////////
 
-		IconList iconList = getIconList();
-		ps.println("iconList = " + iconList.size());
-	}
-
-	public void print()
-	{
-		PrintWriter pr = new PrintWriter(System.out);
-		output(pr);
-		pr.flush();
-	}
-*/
+	/*
+	 * public void output(PrintWriter ps) { ps.println("deviceType = " +
+	 * getDeviceType()); ps.println("freindlyName = " + getFriendlyName());
+	 * ps.println("presentationURL = " + getPresentationURL());
+	 * 
+	 * DeviceList devList = getDeviceList(); ps.println("devList = " +
+	 * devList.size());
+	 * 
+	 * ServiceList serviceList = getServiceList(); ps.println("serviceList = " +
+	 * serviceList.size());
+	 * 
+	 * IconList iconList = getIconList(); ps.println("iconList = " +
+	 * iconList.size()); }
+	 * 
+	 * public void print() { PrintWriter pr = new PrintWriter(System.out);
+	 * output(pr); pr.flush(); }
+	 */
 
 }
-
diff --git a/router/java/src/org/cybergarage/upnp/Icon.java b/router/java/src/org/cybergarage/upnp/Icon.java
index 0f76c44a38bdfe90b2c7d48eee24ec254e117974..6f71ceeea63ed322c89f55e8f979140ea4700c5f 100644
--- a/router/java/src/org/cybergarage/upnp/Icon.java
+++ b/router/java/src/org/cybergarage/upnp/Icon.java
@@ -5,84 +5,96 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: Icon.java
-*
-*	Revision;
-*
-*	11/28/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/28/02
+*		- first revision.
 *	04/12/06
 *		- Added setUserData() and getUserData() to set a user original data object.
 *	
 ******************************************************************/
-
-package org.cybergarage.upnp;
-
+
+package org.cybergarage.upnp;
+
 import org.cybergarage.xml.Node;
-
-public class Icon
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "icon";
-
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private Node iconNode;
-
-	public Node getIconNode()
-	{
-		return iconNode;
-	}
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public Icon(Node node)
-	{
-		iconNode = node;
-	}
-
-	////////////////////////////////////////////////
-	//	isIconNode
-	////////////////////////////////////////////////
-
-	public static boolean isIconNode(Node node)
-	{
-		return Icon.ELEM_NAME.equals(node.getName());
-	}
-
-	////////////////////////////////////////////////
-	//	mimeType
-	////////////////////////////////////////////////
-
-	private final static String MIME_TYPE = "mimeType";
-	
-	public void setMimeType(String value)
-	{
-		getIconNode().setNode(MIME_TYPE, value);
-	}
-
-	public String getMimeType()
-	{
-		return getIconNode().getNodeValue(MIME_TYPE);
-	}
-
-	////////////////////////////////////////////////
-	//	width
-	////////////////////////////////////////////////
-
-	private final static String WIDTH = "width";
-	
-	public void setWidth(String value)
-	{
-		getIconNode().setNode(WIDTH, value);
-	}
-
+
+public class Icon
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "icon";
+
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private Node iconNode;
+
+	public Node getIconNode()
+	{
+		return iconNode;
+	}
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public Icon(Node node)
+	{
+		iconNode = node;
+	}
+
+	public Icon() {
+		this(new Node(ELEM_NAME));
+	}
+	
+	////////////////////////////////////////////////
+	//	isIconNode
+	////////////////////////////////////////////////
+
+	public static boolean isIconNode(Node node)
+	{
+		return Icon.ELEM_NAME.equals(node.getName());
+	}
+
+	////////////////////////////////////////////////
+	//	mimeType
+	////////////////////////////////////////////////
+
+	private final static String MIME_TYPE = "mimeType";
+	
+	public void setMimeType(String value)
+	{
+		getIconNode().setNode(MIME_TYPE, value);
+	}
+
+	public String getMimeType()
+	{
+		return getIconNode().getNodeValue(MIME_TYPE);
+	}
+
+	public boolean hasMimeType()
+	{
+		String iconMimeType = getMimeType();
+		if (iconMimeType == null)
+			return false;
+		return (0 < iconMimeType.length()) ? true : false;
+	}
+	
+	////////////////////////////////////////////////
+	//	width
+	////////////////////////////////////////////////
+
+	private final static String WIDTH = "width";
+	
+	public void setWidth(String value)
+	{
+		getIconNode().setNode(WIDTH, value);
+	}
+
 	public void setWidth(int value)
 	{
 		try {
@@ -91,26 +103,26 @@ public class Icon
 		catch (Exception e) {};
 	}
 	
-	public int getWidth()
+	public int getWidth()
 	{
-		try {
+		try {
 			return Integer.parseInt(getIconNode().getNodeValue(WIDTH));
 		}
 		catch (Exception e) {};
-		return 0;
-	}
-
-	////////////////////////////////////////////////
-	//	height
-	////////////////////////////////////////////////
-
-	private final static String HEIGHT = "height";
-	
-	public void setHeight(String value)
-	{
-		getIconNode().setNode(HEIGHT, value);
-	}
-
+		return 0;
+	}
+
+	////////////////////////////////////////////////
+	//	height
+	////////////////////////////////////////////////
+
+	private final static String HEIGHT = "height";
+	
+	public void setHeight(String value)
+	{
+		getIconNode().setNode(HEIGHT, value);
+	}
+
 	public void setHeight(int value)
 	{
 		try {
@@ -119,47 +131,77 @@ public class Icon
 		catch (Exception e) {};
 	}
 	
-	public int getHeight()
-	{
+	public int getHeight()
+	{
 		try {
 			return Integer.parseInt(getIconNode().getNodeValue(HEIGHT));
 		}
 		catch (Exception e) {};
 		return 0;
-	}
-
-	////////////////////////////////////////////////
-	//	depth
-	////////////////////////////////////////////////
-
-	private final static String DEPTH = "depth";
-	
-	public void setDepth(String value)
-	{
-		getIconNode().setNode(DEPTH, value);
-	}
-
-	public String getDepth()
-	{
-		return getIconNode().getNodeValue(DEPTH);
-	}
-
-	////////////////////////////////////////////////
-	//	URL
-	////////////////////////////////////////////////
-
-	private final static String URL = "url";
-	
-	public void setURL(String value)
-	{
-		getIconNode().setNode(URL, value);
-	}
-
-	public String getURL()
-	{
-		return getIconNode().getNodeValue(URL);
-	}
-	
+	}
+
+	////////////////////////////////////////////////
+	//	depth
+	////////////////////////////////////////////////
+
+	private final static String DEPTH = "depth";
+	
+	public void setDepth(String value)
+	{
+		getIconNode().setNode(DEPTH, value);
+	}
+
+	public void setDepth(int value)
+	{
+		try {
+			setDepth(Integer.toString(value));
+		}
+		catch (Exception e) {};
+	}
+	
+	public int getDepth()
+	{
+		try {
+			return Integer.parseInt(getIconNode().getNodeValue(DEPTH));
+		}
+		catch (Exception e) {};
+		return 0;
+	}
+
+	////////////////////////////////////////////////
+	//	URL
+	////////////////////////////////////////////////
+
+	private final static String URL = "url";
+	
+	public void setURL(String value)
+	{
+		getIconNode().setNode(URL, value);
+	}
+
+	public String getURL()
+	{
+		return getIconNode().getNodeValue(URL);
+	}
+
+	public boolean hasURL()
+	{
+		String iconURL = getURL();
+		if (iconURL == null)
+			return false;
+		return (0 < iconURL.length()) ? true : false;
+	}
+	
+	public boolean isURL(String url)
+	{
+		if (url == null)
+			return false;
+		String iconURL = getURL();
+		if (iconURL == null)
+			return false;
+		return iconURL.equals(url);
+	}
+	
 	////////////////////////////////////////////////
 	//	userData
 	////////////////////////////////////////////////
@@ -175,4 +217,25 @@ public class Icon
 	{
 		return userData;
 	}
+
+	////////////////////////////////////////////////
+	//	Bytes
+	////////////////////////////////////////////////
+
+	private byte bytes[] = null; 
+	
+	public void setBytes(byte data[]) 
+	{
+		bytes = data;
+	}
+
+	public boolean hasBytes() 
+	{
+		return (bytes != null) ? true : false;
+	}
+	
+	public byte[]getBytes() 
+	{
+		return bytes;
+	}
 }
diff --git a/router/java/src/org/cybergarage/upnp/IconList.java b/router/java/src/org/cybergarage/upnp/IconList.java
index 44082f07b90098ef04c9d0df890948261abe5c6b..707e5b7a3bb369f434ca6c7e66901721bcd8bb7c 100644
--- a/router/java/src/org/cybergarage/upnp/IconList.java
+++ b/router/java/src/org/cybergarage/upnp/IconList.java
@@ -1,45 +1,45 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: IconList.java
-*
-*	Revision;
-*
-*	12/04/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: IconList.java
+*
+*	Revision;
+*
+*	12/04/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp;
+
+import java.util.Vector;
+
+public class IconList extends Vector<Icon>
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "iconList";
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public IconList() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public Icon getIcon(int n)
+	{
+		return (Icon)get(n);
+	}
+}
 
-package org.cybergarage.upnp;
-
-import java.util.Vector;
-
-public class IconList extends Vector<Icon> 
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "iconList";
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public IconList() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public Icon getIcon(int n)
-	{
-		return (Icon)get(n);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/RootDescription.java b/router/java/src/org/cybergarage/upnp/RootDescription.java
index 19b5ad92632e51efcd18b60c82ae90dd9281f335..02a600f61ddecbdf7193767751d200f7ba32130c 100644
--- a/router/java/src/org/cybergarage/upnp/RootDescription.java
+++ b/router/java/src/org/cybergarage/upnp/RootDescription.java
@@ -1,19 +1,19 @@
 package org.cybergarage.upnp;
 
-
-/**
- * @author Stefano "Kismet" Lenzi - kismet-sl@users.sourceforge.net  <br> 
- * 		Copyright (c) 2005
- *
- */
-public interface RootDescription {
-
-	public final String ROOT_ELEMENT = "root";
-	public final String ROOT_ELEMENT_NAMESPACE = "urn:schemas-upnp-org:device-1-0"; 
-		
-	
-	public final String SPECVERSION_ELEMENT = "specVersion";
-	public final String MAJOR_ELEMENT = "major";
-	public final String MINOR_ELEMENT = "minor";
-	public final String SERVICE_LIST_ELEMENT = "serviceList";
-}
+
+/**
+ * @author Stefano "Kismet" Lenzi - kismet-sl@users.sourceforge.net  <br> 
+ * 		Copyright (c) 2005
+ *
+ */
+public interface RootDescription {
+
+	public final String ROOT_ELEMENT = "root";
+	public final String ROOT_ELEMENT_NAMESPACE = "urn:schemas-upnp-org:device-1-0"; 
+		
+	
+	public final String SPECVERSION_ELEMENT = "specVersion";
+	public final String MAJOR_ELEMENT = "major";
+	public final String MINOR_ELEMENT = "minor";
+	public final String SERVICE_LIST_ELEMENT = "serviceList";
+}
diff --git a/router/java/src/org/cybergarage/upnp/Service.java b/router/java/src/org/cybergarage/upnp/Service.java
index 59c5d3848d27f0aae97025d36748984703fd7132..c598ba72e0390afae4b51742a25648c1f1ec33ac 100644
--- a/router/java/src/org/cybergarage/upnp/Service.java
+++ b/router/java/src/org/cybergarage/upnp/Service.java
@@ -121,7 +121,7 @@ public class Service
 	////////////////////////////////////////////////
 	public static final String SCPD_ROOTNODE="scpd";
 	public static final String SCPD_ROOTNODE_NS="urn:schemas-upnp-org:service-1-0"; 
-	
+
 	public static final String SPEC_VERSION="specVersion";
 	public static final String MAJOR="major";
 	public static final String MAJOR_VALUE="1";
@@ -142,8 +142,8 @@ public class Service
 		sp.addNode(m);
 		
 		//Node scpd = new Node(SCPD_ROOTNODE,SCPD_ROOTNODE_NS); wrong!
-		Node scpd = new Node(SCPD_ROOTNODE); 					// better (twa)
-		scpd.addAttribute("xmlns",SCPD_ROOTNODE_NS); 			// better (twa)
+		Node scpd = new Node(SCPD_ROOTNODE);
+		scpd.addAttribute("xmlns",SCPD_ROOTNODE_NS);
 		scpd.addNode(sp);
 		getServiceData().setSCPDNode(scpd);
 	}
@@ -241,6 +241,31 @@ public class Service
 		return getServiceNode().getNodeValue(SERVICE_ID);
 	}
 
+	////////////////////////////////////////////////
+	//	configID
+	////////////////////////////////////////////////
+
+	private final static String CONFIG_ID = "configId";
+	
+	public void updateConfigId()
+	{
+		Node scpdNode = getSCPDNode();
+		if (scpdNode == null)
+			return;
+		
+		String scpdXml = scpdNode.toString();
+		int configId = UPnP.caluculateConfigId(scpdXml);
+		scpdNode.setAttribute(CONFIG_ID, configId);
+	}
+
+	public int getConfigId()
+	{
+		Node scpdNode = getSCPDNode();
+		if (scpdNode == null)
+			return 0;
+		return scpdNode.getAttributeIntegerValue(CONFIG_ID);
+	}
+	
 	////////////////////////////////////////////////
 	//	isURL
 	////////////////////////////////////////////////
@@ -340,6 +365,7 @@ public class Service
 		catch (ParserException e) {
 			throw new InvalidDescriptionException(e);
 		}
+		
 		return true;
 	}
 
@@ -349,8 +375,10 @@ public class Service
 		Node scpdNode = parser.parse(file);
 		if (scpdNode == null)
 			return false;
+		
 		ServiceData data = getServiceData();
 		data.setSCPDNode(scpdNode);
+
 		return true;
 	}
 
@@ -363,20 +391,22 @@ public class Service
 		Node scpdNode = parser.parse(input);
 		if (scpdNode == null)
 			return false;
+		
 		ServiceData data = getServiceData();
 		data.setSCPDNode(scpdNode);
+		
 		return true;
 	}
 	
 	
     public void setDescriptionURL(String value)
     {
-            getServiceData().setDescriptionURL(value);
+    	getServiceData().setDescriptionURL(value);
     }
 
     public String getDescriptionURL()
     {
-            return getServiceData().getDescriptionURL();
+    	return getServiceData().getDescriptionURL();
     }
 	
 	
@@ -406,6 +436,9 @@ public class Service
 		
 		String scpdURLStr = getSCPDURL();
 
+/****
+ * I2P - no, dont attempt to load local file
+ *
 		// Thanks for Robin V. (Sep 18, 2010)
 		String rootDevPath = rootDev.getDescriptionFilePath();
 		if(rootDevPath!=null) {
@@ -425,6 +458,7 @@ public class Service
 				}
 			}
 		}
+****/
 
 		try {
 			URL scpdUrl = new URL(rootDev.getAbsoluteURL(scpdURLStr));
@@ -434,8 +468,14 @@ public class Service
 				return scpdNode;
 			}
 		}
-		catch (Exception e) {}
+		catch (Exception e) {
+			// I2P
+			Debug.warning(e);
+		}
 		
+/****
+ * I2P - no, dont attempt to load local file
+ *
 		String newScpdURLStr = rootDev.getDescriptionFilePath() + HTTP.toRelativeURL(scpdURLStr);
 		try {
 			scpdNode = getSCPDNode(new File(newScpdURLStr));
@@ -444,6 +484,7 @@ public class Service
 		catch (Exception e) {
 			Debug.warning(e);
 		}
+****/
 		
 		return null;
 	}
diff --git a/router/java/src/org/cybergarage/upnp/ServiceList.java b/router/java/src/org/cybergarage/upnp/ServiceList.java
index e0d6b63bfe1a34a1e5ded4ca1a407838294ec4d0..d0f6061ed78b0c7c395ac48d63ae21016cd2df15 100644
--- a/router/java/src/org/cybergarage/upnp/ServiceList.java
+++ b/router/java/src/org/cybergarage/upnp/ServiceList.java
@@ -1,52 +1,52 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: ServiceList.java
-*
-*	Revision;
-*
-*	12/04/02
-*		- first revision.
-*	06/18/03
-*		- Added caching a ArrayIndexOfBound exception.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ServiceList.java
+*
+*	Revision;
+*
+*	12/04/02
+*		- first revision.
+*	06/18/03
+*		- Added caching a ArrayIndexOfBound exception.
+*
+******************************************************************/
+
+package org.cybergarage.upnp;
+
+import java.util.Vector;
+
+public class ServiceList extends Vector<Service>
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "serviceList";
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ServiceList() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public Service getService(int n)
+	{
+		Object obj = null;
+		try {
+			obj = get(n);
+		}
+		catch (Exception e) {};
+		return (Service)obj;
+	}
+}
 
-package org.cybergarage.upnp;
-
-import java.util.Vector;
-
-public class ServiceList extends Vector<Service> 
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "serviceList";
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ServiceList() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public Service getService(int n)
-	{
-		Object obj = null;
-		try {
-			obj = get(n);
-		}
-		catch (Exception e) {};
-		return (Service)obj;
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/ServiceStateTable.java b/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
index b7e15ea2177dd19d8513e6a51f23c7c2823561f1..cf1e1d5e9868503d189b12691b33de392bf3f1bc 100644
--- a/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
+++ b/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
@@ -1,45 +1,45 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: ServiceStateTable.java
-*
-*	Revision:
-*
-*	12/06/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ServiceStateTable.java
+*
+*	Revision:
+*
+*	12/06/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp;
+
+import java.util.Vector;
+
+public class ServiceStateTable extends Vector<StateVariable>
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "serviceStateTable";
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ServiceStateTable() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public StateVariable getStateVariable(int n)
+	{
+		return (StateVariable)get(n);
+	}
+}
 
-package org.cybergarage.upnp;
-
-import java.util.Vector;
-
-public class ServiceStateTable extends Vector<StateVariable> 
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "serviceStateTable";
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ServiceStateTable() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public StateVariable getStateVariable(int n)
-	{
-		return (StateVariable)get(n);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/UPnP.java b/router/java/src/org/cybergarage/upnp/UPnP.java
index d869415bbeb327af449adb939a14cacd3e8c93cf..db5042a2d0d8773cac1f92621f275b468dd3e4f5 100644
--- a/router/java/src/org/cybergarage/upnp/UPnP.java
+++ b/router/java/src/org/cybergarage/upnp/UPnP.java
@@ -45,7 +45,7 @@ public class UPnP
 	public final static String XML_CLASS_PROPERTTY="cyberlink.upnp.xml.parser";
 	
 	public final static String NAME = "CyberLinkJava";
-	public final static String VERSION = "1.8";
+	public final static String VERSION = "3.0";
 
 	// I2P was 100
 	public final static int SERVER_RETRY_COUNT = 4;
@@ -64,6 +64,8 @@ public class UPnP
 
 	public final static String XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; 
 	
+	public final static int CONFIGID_UPNP_ORG_MAX = 16777215;
+	
 	////////////////////////////////////////////////
 	//	Enable / Disable
 	////////////////////////////////////////////////
@@ -190,6 +192,34 @@ public class UPnP
 			toUUID((int)((time2 >> 32) | 0xE000) & 0xFFFF);
 	}
 
+	////////////////////////////////////////////////
+	//	BootId
+	////////////////////////////////////////////////
+
+	public static final int createBootId()
+	{
+		return (int)(System.currentTimeMillis() / 1000L);
+	}
+	
+	////////////////////////////////////////////////
+	//	ConfigId
+	////////////////////////////////////////////////
+
+	public static final int caluculateConfigId(String configXml)
+	{
+		if (configXml == null)
+			return 0;
+		int configId = 0;
+		int configLen = configXml.length();
+		for (int n=0; n<configLen; n++) {
+			configId += configXml.codePointAt(n);
+			if (configId < CONFIGID_UPNP_ORG_MAX)
+				continue;
+			configId = configId % CONFIGID_UPNP_ORG_MAX;
+		}
+		return configId;
+	}
+	
 	////////////////////////////////////////////////
 	// XML Parser
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/upnp/UPnPStatus.java b/router/java/src/org/cybergarage/upnp/UPnPStatus.java
index 0244a6b1df9d3f73a76e714e213b8e950a41101d..2ab429249430234a05576f925266bc0536031a5b 100644
--- a/router/java/src/org/cybergarage/upnp/UPnPStatus.java
+++ b/router/java/src/org/cybergarage/upnp/UPnPStatus.java
@@ -1,82 +1,82 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: UPnPStatus.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
-*	01/03/04
-*		- Changed the class name from UPnPError to UPnPStatus.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp;
-import org.cybergarage.http.HTTPStatus;
-
-public class UPnPStatus
-{
-	////////////////////////////////////////////////
-	//	Code
-	////////////////////////////////////////////////
-	
-	public static final int INVALID_ACTION = 401;
-	public static final int INVALID_ARGS = 402;
-	public static final int OUT_OF_SYNC = 403;
-	public static final int INVALID_VAR = 404;
-	public static final int PRECONDITION_FAILED = 412;
-	public static final int ACTION_FAILED = 501;
-
-	public static final String code2String(int code)
-	{
-		switch (code) {
-		case INVALID_ACTION: return "Invalid Action";
-		case INVALID_ARGS: return "Invalid Args";
-		case OUT_OF_SYNC: return "Out of Sync";
-		case INVALID_VAR: return "Invalid Var";
-		case PRECONDITION_FAILED: return "Precondition Failed";
-		case ACTION_FAILED: return "Action Failed";
-	        default: return HTTPStatus.code2String(code);
-		}
-	}
-	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-	
-	private int code;
-	private String description;
-	
-	public UPnPStatus()
-	{
-		setCode(0);
-		setDescription("");	
-	}
-	
-	public UPnPStatus(int code, String desc)
-	{
-		setCode(code);
-		setDescription(desc);	
-	}
-	
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: UPnPStatus.java
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
+*	01/03/04
+*		- Changed the class name from UPnPError to UPnPStatus.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp;
+import org.cybergarage.http.HTTPStatus;
+
+public class UPnPStatus
+{
+	////////////////////////////////////////////////
+	//	Code
+	////////////////////////////////////////////////
+	
+	public static final int INVALID_ACTION = 401;
+	public static final int INVALID_ARGS = 402;
+	public static final int OUT_OF_SYNC = 403;
+	public static final int INVALID_VAR = 404;
+	public static final int PRECONDITION_FAILED = 412;
+	public static final int ACTION_FAILED = 501;
+
+	public static final String code2String(int code)
+	{
+		switch (code) {
+		case INVALID_ACTION: return "Invalid Action";
+		case INVALID_ARGS: return "Invalid Args";
+		case OUT_OF_SYNC: return "Out of Sync";
+		case INVALID_VAR: return "Invalid Var";
+		case PRECONDITION_FAILED: return "Precondition Failed";
+		case ACTION_FAILED: return "Action Failed";
+	        default: return HTTPStatus.code2String(code);
+		}
+	}
+	
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+	
+	private int code;
+	private String description;
+	
+	public UPnPStatus()
+	{
+		setCode(0);
+		setDescription("");	
+	}
+	
+	public UPnPStatus(int code, String desc)
+	{
+		setCode(code);
+		setDescription(desc);	
+	}
+	
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/ActionListener.java b/router/java/src/org/cybergarage/upnp/control/ActionListener.java
index 40f9244b5bf25aa46155c36177ebe8aae65fb0b2..180602aad177a612144cd58e73c511e48587a1de 100644
--- a/router/java/src/org/cybergarage/upnp/control/ActionListener.java
+++ b/router/java/src/org/cybergarage/upnp/control/ActionListener.java
@@ -1,23 +1,23 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: ActionListener.java
-*
-*	Revision;
-*
-*	01/16/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.upnp.*;
-
-public interface ActionListener
-{
-	public boolean actionControlReceived(Action action);
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ActionListener.java
+*
+*	Revision;
+*
+*	01/16/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.upnp.*;
+
+public interface ActionListener
+{
+	public boolean actionControlReceived(Action action);
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/ActionRequest.java b/router/java/src/org/cybergarage/upnp/control/ActionRequest.java
index e14db4b46c793b95978eeb165deb896966993c02..531b7d2147c77ef59c833cda617f6529d546b039 100644
--- a/router/java/src/org/cybergarage/upnp/control/ActionRequest.java
+++ b/router/java/src/org/cybergarage/upnp/control/ActionRequest.java
@@ -1,145 +1,145 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: ControlRequest.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	05/09/05
-*		- Changed getActionName() to return when the delimiter is not found.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.http.*;
-import org.cybergarage.xml.*;
-import org.cybergarage.soap.*;
-
-import org.cybergarage.upnp.*;
-
-public class ActionRequest extends ControlRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ActionRequest()
-	{
-	}
-
-	public ActionRequest(HTTPRequest httpReq)
-	{
-		set(httpReq);
-	}
-
-	////////////////////////////////////////////////
-	//	Action
-	////////////////////////////////////////////////
-	
-	public Node getActionNode()
-	{
-		Node bodyNode = getBodyNode();
-		if (bodyNode == null)
-			return null;
-		if (bodyNode.hasNodes() == false)
-			return null;
-		return bodyNode.getNode(0);
-	}
-
-	public String getActionName()
-	{
-		Node node = getActionNode();
-		if (node == null)
-			return "";
-		String name = node.getName();
-		if (name == null)
-			return "";
-		int idx = name.indexOf(SOAP.DELIM)+1;
-		if (idx < 0)
-			return "";
-		return name.substring(idx, name.length());
-	}
-
-	public ArgumentList getArgumentList()
-	{
-		Node actNode = getActionNode();
-		int nArgNodes = actNode.getNNodes();
-		ArgumentList argList = new ArgumentList();
-		for (int n=0; n<nArgNodes; n++) {
-			Argument arg = new Argument();
-			Node argNode = actNode.getNode(n);
-			arg.setName(argNode.getName());
-			arg.setValue(argNode.getValue());
-			argList.add(arg);
-		}
-		return argList;
-	}
-
-	////////////////////////////////////////////////
-	//	setRequest
-	////////////////////////////////////////////////
-	
-	public void setRequest(Action action, ArgumentList argList)
-	{
-		Service service = action.getService();		
-		
-		setRequestHost(service);
-
-		setEnvelopeNode(SOAP.createEnvelopeBodyNode());
-		Node envNode = getEnvelopeNode();
-		Node bodyNode = getBodyNode();
-		Node argNode = createContentNode(service, action, argList);
-		bodyNode.addNode(argNode);
-		setContent(envNode);
-
-		String serviceType = service.getServiceType();
-		String actionName = action.getName();
-		String soapAction = "\"" +
-			serviceType +
-			"#" + actionName +
-			"\"";
-		setSOAPAction(soapAction);
-	}
-
-	////////////////////////////////////////////////
-	//	Contents
-	////////////////////////////////////////////////
-
-	private Node createContentNode(Service service, Action action, ArgumentList argList)
-	{
-		String actionName = action.getName();
-		String serviceType = service.getServiceType();
-		
-		Node actionNode = new Node();
-		actionNode.setName(Control.NS, actionName);
-		actionNode.setNameSpace(Control.NS, serviceType);
-
-		int argListCnt = argList.size();
-		for (int n=0; n<argListCnt; n++) {
-			Argument arg = argList.getArgument(n);
-			Node argNode = new Node();
-			argNode.setName(arg.getName());
-			argNode.setValue(arg.getValue());
-			actionNode.addNode(argNode);
-		}
-		
-		return actionNode;
-	}
-
-	////////////////////////////////////////////////
-	//	post
-	////////////////////////////////////////////////
-
-	public ActionResponse post()
-	{
-		SOAPResponse soapRes = postMessage(getRequestHost(), getRequestPort());
-		return new ActionResponse(soapRes);
-	}
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ControlRequest.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	05/09/05
+*		- Changed getActionName() to return when the delimiter is not found.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.http.*;
+import org.cybergarage.xml.*;
+import org.cybergarage.soap.*;
+
+import org.cybergarage.upnp.*;
+
+public class ActionRequest extends ControlRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ActionRequest()
+	{
+	}
+
+	public ActionRequest(HTTPRequest httpReq)
+	{
+		set(httpReq);
+	}
+
+	////////////////////////////////////////////////
+	//	Action
+	////////////////////////////////////////////////
+	
+	public Node getActionNode()
+	{
+		Node bodyNode = getBodyNode();
+		if (bodyNode == null)
+			return null;
+		if (bodyNode.hasNodes() == false)
+			return null;
+		return bodyNode.getNode(0);
+	}
+
+	public String getActionName()
+	{
+		Node node = getActionNode();
+		if (node == null)
+			return "";
+		String name = node.getName();
+		if (name == null)
+			return "";
+		int idx = name.indexOf(SOAP.DELIM)+1;
+		if (idx < 0)
+			return "";
+		return name.substring(idx, name.length());
+	}
+
+	public ArgumentList getArgumentList()
+	{
+		Node actNode = getActionNode();
+		int nArgNodes = actNode.getNNodes();
+		ArgumentList argList = new ArgumentList();
+		for (int n=0; n<nArgNodes; n++) {
+			Argument arg = new Argument();
+			Node argNode = actNode.getNode(n);
+			arg.setName(argNode.getName());
+			arg.setValue(argNode.getValue());
+			argList.add(arg);
+		}
+		return argList;
+	}
+
+	////////////////////////////////////////////////
+	//	setRequest
+	////////////////////////////////////////////////
+	
+	public void setRequest(Action action, ArgumentList argList)
+	{
+		Service service = action.getService();		
+		
+		setRequestHost(service);
+
+		setEnvelopeNode(SOAP.createEnvelopeBodyNode());
+		Node envNode = getEnvelopeNode();
+		Node bodyNode = getBodyNode();
+		Node argNode = createContentNode(service, action, argList);
+		bodyNode.addNode(argNode);
+		setContent(envNode);
+
+		String serviceType = service.getServiceType();
+		String actionName = action.getName();
+		String soapAction = "\"" +
+			serviceType +
+			"#" + actionName +
+			"\"";
+		setSOAPAction(soapAction);
+	}
+
+	////////////////////////////////////////////////
+	//	Contents
+	////////////////////////////////////////////////
+
+	private Node createContentNode(Service service, Action action, ArgumentList argList)
+	{
+		String actionName = action.getName();
+		String serviceType = service.getServiceType();
+		
+		Node actionNode = new Node();
+		actionNode.setName(Control.NS, actionName);
+		actionNode.setNameSpace(Control.NS, serviceType);
+
+		int argListCnt = argList.size();
+		for (int n=0; n<argListCnt; n++) {
+			Argument arg = argList.getArgument(n);
+			Node argNode = new Node();
+			argNode.setName(arg.getName());
+			argNode.setValue(arg.getValue());
+			actionNode.addNode(argNode);
+		}
+		
+		return actionNode;
+	}
+
+	////////////////////////////////////////////////
+	//	post
+	////////////////////////////////////////////////
+
+	public ActionResponse post()
+	{
+		SOAPResponse soapRes = postMessage(getRequestHost(), getRequestPort());
+		return new ActionResponse(soapRes);
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/control/ActionResponse.java b/router/java/src/org/cybergarage/upnp/control/ActionResponse.java
index 04c495a498c4c0735789eec6a68c7168f061e87a..a1e2cfc0ee65731d50b29755c1a88b0e19294c9b 100644
--- a/router/java/src/org/cybergarage/upnp/control/ActionResponse.java
+++ b/router/java/src/org/cybergarage/upnp/control/ActionResponse.java
@@ -1,120 +1,120 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: ActionResponse.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	09/02/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : Action Responses do not contain the mandatory header field EXT
-*		- Error : ActionResponse class does not set the EXT header
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.http.*;
-import org.cybergarage.soap.*;
-import org.cybergarage.xml.*;
-
-public class ActionResponse extends ControlResponse
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ActionResponse()
-	{
-		setHeader(HTTP.EXT, "");
-	}
-
-	public ActionResponse(SOAPResponse soapRes)
-	{
-		super(soapRes);
-		setHeader(HTTP.EXT, "");
-	}
-
-
-	////////////////////////////////////////////////
-	//	Response
-	////////////////////////////////////////////////
-
-	public void setResponse(Action action)
-	{
-		setStatusCode(HTTPStatus.OK);
-	
-		Node bodyNode = getBodyNode();
-		Node resNode = createResponseNode(action);
-		bodyNode.addNode(resNode);
-
-		Node envNode = getEnvelopeNode();
-		setContent(envNode);
-	}
-
-	private Node createResponseNode(Action action)
-	{
-		String actionName = action.getName();
-		Node actionNameResNode = new Node(SOAP.METHODNS + SOAP.DELIM + actionName + SOAP.RESPONSE);
-		
-		Service service = action.getService();
-		if (service != null) {
-			actionNameResNode.setAttribute(
-				"xmlns:" + SOAP.METHODNS,
-					service.getServiceType());
-		}
-		
-		ArgumentList argList = action.getArgumentList();
-		int nArgs = argList.size();
-		for (int n=0; n<nArgs; n++) {
-			Argument arg = argList.getArgument(n);
-			if (arg.isOutDirection() == false)
-				continue;
-			Node argNode = new Node();
-			argNode.setName(arg.getName());
-			argNode.setValue(arg.getValue());
-			actionNameResNode.addNode(argNode);
-		}
-		
-		return actionNameResNode;
-	}
-
-	////////////////////////////////////////////////
-	//	getResponse
-	////////////////////////////////////////////////
-
-	private Node getActionResponseNode()
-	{
-		Node bodyNode = getBodyNode();
-		if (bodyNode == null || bodyNode.hasNodes() == false)
-			return null;
-		return bodyNode.getNode(0);
-	}
-	
-	
-	public ArgumentList getResponse()
-	{
-		ArgumentList argList = new ArgumentList();
-		
-		Node resNode = getActionResponseNode();
-		if (resNode == null)
-			return argList;
-			
-		int nArgs = resNode.getNNodes();
-		for (int n=0; n<nArgs; n++) {
-			Node node = resNode.getNode(n);
-			String name = node.getName();
-			String value = node.getValue();
-			Argument arg = new Argument(name, value);
-			argList.add(arg);
-		}
-		
-		return argList;
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ActionResponse.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	09/02/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : Action Responses do not contain the mandatory header field EXT
+*		- Error : ActionResponse class does not set the EXT header
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.http.*;
+import org.cybergarage.soap.*;
+import org.cybergarage.xml.*;
+
+public class ActionResponse extends ControlResponse
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ActionResponse()
+	{
+		setHeader(HTTP.EXT, "");
+	}
+
+	public ActionResponse(SOAPResponse soapRes)
+	{
+		super(soapRes);
+		setHeader(HTTP.EXT, "");
+	}
+
+
+	////////////////////////////////////////////////
+	//	Response
+	////////////////////////////////////////////////
+
+	public void setResponse(Action action)
+	{
+		setStatusCode(HTTPStatus.OK);
+	
+		Node bodyNode = getBodyNode();
+		Node resNode = createResponseNode(action);
+		bodyNode.addNode(resNode);
+
+		Node envNode = getEnvelopeNode();
+		setContent(envNode);
+	}
+
+	private Node createResponseNode(Action action)
+	{
+		String actionName = action.getName();
+		Node actionNameResNode = new Node(SOAP.METHODNS + SOAP.DELIM + actionName + SOAP.RESPONSE);
+		
+		Service service = action.getService();
+		if (service != null) {
+			actionNameResNode.setAttribute(
+				"xmlns:" + SOAP.METHODNS,
+					service.getServiceType());
+		}
+		
+		ArgumentList argList = action.getArgumentList();
+		int nArgs = argList.size();
+		for (int n=0; n<nArgs; n++) {
+			Argument arg = argList.getArgument(n);
+			if (arg.isOutDirection() == false)
+				continue;
+			Node argNode = new Node();
+			argNode.setName(arg.getName());
+			argNode.setValue(arg.getValue());
+			actionNameResNode.addNode(argNode);
+		}
+		
+		return actionNameResNode;
+	}
+
+	////////////////////////////////////////////////
+	//	getResponse
+	////////////////////////////////////////////////
+
+	private Node getActionResponseNode()
+	{
+		Node bodyNode = getBodyNode();
+		if (bodyNode == null || bodyNode.hasNodes() == false)
+			return null;
+		return bodyNode.getNode(0);
+	}
+	
+	
+	public ArgumentList getResponse()
+	{
+		ArgumentList argList = new ArgumentList();
+		
+		Node resNode = getActionResponseNode();
+		if (resNode == null)
+			return argList;
+			
+		int nArgs = resNode.getNNodes();
+		for (int n=0; n<nArgs; n++) {
+			Node node = resNode.getNode(n);
+			String name = node.getName();
+			String value = node.getValue();
+			Argument arg = new Argument(name, value);
+			argList.add(arg);
+		}
+		
+		return argList;
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/Control.java b/router/java/src/org/cybergarage/upnp/control/Control.java
index 53549096ebe288a88cc8943d460be7c956504372..ea68a2f4af306458499611898cb19b727e34f61d 100644
--- a/router/java/src/org/cybergarage/upnp/control/Control.java
+++ b/router/java/src/org/cybergarage/upnp/control/Control.java
@@ -1,29 +1,29 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: Control.java
-*
-*	Revision;
-*
-*	01/20/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-public class Control
-{
-	public final static String NS = "u";
-	public final static String QUERY_SOAPACTION = "urn:schemas-upnp-org:control-1-0#QueryStateVariable";
-	public final static String XMLNS = "urn:schemas-upnp-org:control-1-0";
-	public final static String QUERY_STATE_VARIABLE = "QueryStateVariable";
-	public final static String QUERY_STATE_VARIABLE_RESPONSE = "QueryStateVariableResponse";
-	public final static String VAR_NAME = "varName";
-	public final static String RETURN = "return";
-}
-
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: Control.java
+*
+*	Revision;
+*
+*	01/20/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+public class Control
+{
+	public final static String NS = "u";
+	public final static String QUERY_SOAPACTION = "urn:schemas-upnp-org:control-1-0#QueryStateVariable";
+	public final static String XMLNS = "urn:schemas-upnp-org:control-1-0";
+	public final static String QUERY_STATE_VARIABLE = "QueryStateVariable";
+	public final static String QUERY_STATE_VARIABLE_RESPONSE = "QueryStateVariableResponse";
+	public final static String VAR_NAME = "varName";
+	public final static String RETURN = "return";
+}
+
+
diff --git a/router/java/src/org/cybergarage/upnp/control/ControlRequest.java b/router/java/src/org/cybergarage/upnp/control/ControlRequest.java
index a605a2afad49f5ecbe72d220fe6f95d0c382ff6f..b5d519b4fd1272ab799797671c60da918d2e58dc 100644
--- a/router/java/src/org/cybergarage/upnp/control/ControlRequest.java
+++ b/router/java/src/org/cybergarage/upnp/control/ControlRequest.java
@@ -1,128 +1,128 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: ControlRequest.java
-*
-*	Revision:
-*
-*	01/29/03
-*		- first revision.
-*	05/22/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Description: inserted a check at the beginning of the setRequestHost method
-*		- Problem : If the host does not start with a '/', the device could refuse the control action
-*		- Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices
-*	09/02/03
-*		- Giordano Sassaroli <sassarol@cefriel.it> / Suzan Foster
-*		- Problem : NullpointerException thrown for devices whose description use absolute urls
-*		- Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. 
-*		  If the baseUrl is not present, the request host and port should be extracted from the control/subscription url
-*		- Description: The method setRequestHost/setService should be changed as follows
-*	02/17/04
-*		- Rob van den Boomen <rob.van.den.boomen@philips.com>
-*		- Fixed to set a URLBase from the SSDP header when the URLBase of the description is null.
-*	02/18/04
-*		- Andre <andre@antiheld.net>
-*		- The xml nodes controlUrl and eventSubUrl can contain absolut urls, but these absolut urls may have 
-*		  different ports than the base url! (so seen on my SMC 7004ABR Barricade Router, where xml files are 
-*		  requested from port 80, but soap requests are made on port 5440). Therefore whenever a request is made, 
-*		  the port specified by the controlUrl or eventSubUrl node should be used, else no response will be returned 
-*		  (oddly, there was a response returned even on port 80, but with empty body tags. but the correct response 
-*		  finally came from port 5440).
-*		- Fixed to get the port from the control url when it is absolute.
-*	03/20/04
-*		- Thanks for Thomas Schulz <tsroyale at users.sourceforge.net>
-*		- Fixed setRequestHost() for Sony's UPnP stack when the URLBase has the path.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import java.net.*;
-
-import org.cybergarage.http.*;
-import org.cybergarage.soap.*;
-
-import org.cybergarage.upnp.*;
-
-public class ControlRequest extends SOAPRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ControlRequest()
-	{
-	}
-
-	public ControlRequest(HTTPRequest httpReq)
-	{
-		set(httpReq);
-	}
-
-	////////////////////////////////////////////////
-	//	Query
-	////////////////////////////////////////////////
-
-	public boolean isQueryControl()
-	{
-		return isSOAPAction(Control.QUERY_SOAPACTION);
-	}
-	
-	public boolean isActionControl()
-	{
-		return !isQueryControl();
-	}
-
-	////////////////////////////////////////////////
-	//	setRequest
-	////////////////////////////////////////////////
-
-	protected void setRequestHost(Service service)
-	{
-		String ctrlURL = service.getControlURL();
-
-		// Thanks for Thomas Schulz (2004/03/20)
-		String urlBase = service.getRootDevice().getURLBase();
-		if (urlBase != null && 0 < urlBase.length()){
-			try {
-				URL url = new URL(urlBase);
-				String basePath = url.getPath();
-				int  baseLen = basePath.length();
-				if (0 < baseLen) {
-					if (1 < baseLen || (basePath.charAt(0) != '/'))
-						ctrlURL = basePath + ctrlURL;
-				}
-			}
-			catch (MalformedURLException e) {}
-		}
-
-		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/21/03)
-		setURI(ctrlURL, true);
-
-		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> and Suzan Foster (09/02/03)
-		// Thanks for Andre <andre@antiheld.net> (02/18/04)
-		String postURL = "";
-		if (HTTP.isAbsoluteURL(ctrlURL) == true)
-			postURL = ctrlURL;
-		
-		if (postURL == null || postURL.length() <= 0)
-			postURL = service.getRootDevice().getURLBase();
-
-		// Thanks for Rob van den Boomen <rob.van.den.boomen@philips.com> (02/17/04)
-		// BUGFIX, set urlbase from location string if not set in description.xml
-		if (postURL == null || postURL.length() <= 0)
-			postURL = service.getRootDevice().getLocation();
-		
-		String reqHost = HTTP.getHost(postURL);
-		int reqPort = HTTP.getPort(postURL);
-		
-		setHost(reqHost, reqPort);
-		setRequestHost(reqHost);
-		setRequestPort(reqPort);
-	}
-	
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ControlRequest.java
+*
+*	Revision:
+*
+*	01/29/03
+*		- first revision.
+*	05/22/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Description: inserted a check at the beginning of the setRequestHost method
+*		- Problem : If the host does not start with a '/', the device could refuse the control action
+*		- Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices
+*	09/02/03
+*		- Giordano Sassaroli <sassarol@cefriel.it> / Suzan Foster
+*		- Problem : NullpointerException thrown for devices whose description use absolute urls
+*		- Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. 
+*		  If the baseUrl is not present, the request host and port should be extracted from the control/subscription url
+*		- Description: The method setRequestHost/setService should be changed as follows
+*	02/17/04
+*		- Rob van den Boomen <rob.van.den.boomen@philips.com>
+*		- Fixed to set a URLBase from the SSDP header when the URLBase of the description is null.
+*	02/18/04
+*		- Andre <andre@antiheld.net>
+*		- The xml nodes controlUrl and eventSubUrl can contain absolut urls, but these absolut urls may have 
+*		  different ports than the base url! (so seen on my SMC 7004ABR Barricade Router, where xml files are 
+*		  requested from port 80, but soap requests are made on port 5440). Therefore whenever a request is made, 
+*		  the port specified by the controlUrl or eventSubUrl node should be used, else no response will be returned 
+*		  (oddly, there was a response returned even on port 80, but with empty body tags. but the correct response 
+*		  finally came from port 5440).
+*		- Fixed to get the port from the control url when it is absolute.
+*	03/20/04
+*		- Thanks for Thomas Schulz <tsroyale at users.sourceforge.net>
+*		- Fixed setRequestHost() for Sony's UPnP stack when the URLBase has the path.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import java.net.*;
+
+import org.cybergarage.http.*;
+import org.cybergarage.soap.*;
+
+import org.cybergarage.upnp.*;
+
+public class ControlRequest extends SOAPRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ControlRequest()
+	{
+	}
+
+	public ControlRequest(HTTPRequest httpReq)
+	{
+		set(httpReq);
+	}
+
+	////////////////////////////////////////////////
+	//	Query
+	////////////////////////////////////////////////
+
+	public boolean isQueryControl()
+	{
+		return isSOAPAction(Control.QUERY_SOAPACTION);
+	}
+	
+	public boolean isActionControl()
+	{
+		return !isQueryControl();
+	}
+
+	////////////////////////////////////////////////
+	//	setRequest
+	////////////////////////////////////////////////
+
+	protected void setRequestHost(Service service)
+	{
+		String ctrlURL = service.getControlURL();
+
+		// Thanks for Thomas Schulz (2004/03/20)
+		String urlBase = service.getRootDevice().getURLBase();
+		if (urlBase != null && 0 < urlBase.length()){
+			try {
+				URL url = new URL(urlBase);
+				String basePath = url.getPath();
+				int  baseLen = basePath.length();
+				if (0 < baseLen) {
+					if (1 < baseLen || (basePath.charAt(0) != '/'))
+						ctrlURL = basePath + ctrlURL;
+				}
+			}
+			catch (MalformedURLException e) {}
+		}
+
+		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/21/03)
+		setURI(ctrlURL, true);
+
+		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> and Suzan Foster (09/02/03)
+		// Thanks for Andre <andre@antiheld.net> (02/18/04)
+		String postURL = "";
+		if (HTTP.isAbsoluteURL(ctrlURL) == true)
+			postURL = ctrlURL;
+		
+		if (postURL == null || postURL.length() <= 0)
+			postURL = service.getRootDevice().getURLBase();
+
+		// Thanks for Rob van den Boomen <rob.van.den.boomen@philips.com> (02/17/04)
+		// BUGFIX, set urlbase from location string if not set in description.xml
+		if (postURL == null || postURL.length() <= 0)
+			postURL = service.getRootDevice().getLocation();
+		
+		String reqHost = HTTP.getHost(postURL);
+		int reqPort = HTTP.getPort(postURL);
+		
+		setHost(reqHost, reqPort);
+		setRequestHost(reqHost);
+		setRequestPort(reqPort);
+	}
+	
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/ControlResponse.java b/router/java/src/org/cybergarage/upnp/control/ControlResponse.java
index b764a6ae7324586f5479554d74c90ee943ee7e78..196d6b4df30a7147380eb6735e0101bc0d5add6a 100644
--- a/router/java/src/org/cybergarage/upnp/control/ControlResponse.java
+++ b/router/java/src/org/cybergarage/upnp/control/ControlResponse.java
@@ -1,173 +1,173 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: ControlResponse.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.http.*;
-import org.cybergarage.xml.*;
-import org.cybergarage.soap.*;
-
-import org.cybergarage.upnp.*;
-
-public class ControlResponse extends SOAPResponse
-{
-	public static final String FAULT_CODE = "Client";
-	public static final String FAULT_STRING = "UPnPError";
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public ControlResponse()
-	{
-		setServer(UPnP.getServerName());
-	}
-
-	public ControlResponse(SOAPResponse soapRes)
-	{
-		super(soapRes);
-	}
-	
-	////////////////////////////////////////////////
-	//	FaultResponse
-	////////////////////////////////////////////////
-
-	public void setFaultResponse(int errCode, String errDescr)
-	{
-		setStatusCode(HTTPStatus.INTERNAL_SERVER_ERROR);
-		
-		Node bodyNode = getBodyNode();
-		Node faultNode = createFaultResponseNode(errCode, errDescr);
-		bodyNode.addNode(faultNode);
-
-		Node envNode = getEnvelopeNode();
-		setContent(envNode);
-	}
-
-	public void setFaultResponse(int errCode)
-	{
-		setFaultResponse(errCode, UPnPStatus.code2String(errCode));
-	}
-
-	////////////////////////////////////////////////
-	//	createFaultResponseNode
-	////////////////////////////////////////////////
-
-	private Node createFaultResponseNode(int errCode, String errDescr)
-	{
-		// <s:Fault>
-		Node faultNode = new Node(SOAP.XMLNS + SOAP.DELIM + SOAP.FAULT);
-
- 		// <faultcode>s:Client</faultcode>
-		Node faultCodeNode = new Node(SOAP.FAULT_CODE);
-		faultCodeNode.setValue(SOAP.XMLNS + SOAP.DELIM + FAULT_CODE);
-		faultNode.addNode(faultCodeNode);
-		
-		// <faultstring>UPnPError</faultstring>
-		Node faultStringNode = new Node(SOAP.FAULT_STRING);
-		faultStringNode.setValue(FAULT_STRING);
-		faultNode.addNode(faultStringNode);
-
-		// <detail>
-		Node detailNode = new Node(SOAP.DETAIL);
-		faultNode.addNode(detailNode);
-
-		// <UPnPError xmlns="urn:schemas-upnp-org:control-1-0">
-		Node upnpErrorNode = new Node(FAULT_STRING);
-		upnpErrorNode.setAttribute("xmlns", Control.XMLNS);
-		detailNode.addNode(upnpErrorNode);
-
-		// <errorCode>error code</errorCode>
-		Node errorCodeNode = new Node(SOAP.ERROR_CODE);
-		errorCodeNode.setValue(errCode);
-		upnpErrorNode.addNode(errorCodeNode);
-
-		// <errorDescription>error string</errorDescription>
-		Node errorDesctiprionNode = new Node(SOAP.ERROR_DESCRIPTION);
-		errorDesctiprionNode.setValue(errDescr);
-		upnpErrorNode.addNode(errorDesctiprionNode);
-		
-		return faultNode;
-	}
-	
-	private Node createFaultResponseNode(int errCode)
-	{
-		return createFaultResponseNode(errCode, UPnPStatus.code2String(errCode));
-	}
-
-	////////////////////////////////////////////////
-	//	UPnP Error
-	////////////////////////////////////////////////
-	
-	private UPnPStatus upnpErr = new UPnPStatus();
-	
-	private Node getUPnPErrorNode()
-	{
-		Node detailNode = getFaultDetailNode();
-		if (detailNode == null)
-			return null;
-		return detailNode.getNodeEndsWith(SOAP.UPNP_ERROR);
-	}
-
-	private Node getUPnPErrorCodeNode()
-	{
-		Node errorNode = getUPnPErrorNode();
-		if (errorNode == null)
-			return null;
-		return errorNode.getNodeEndsWith(SOAP.ERROR_CODE);
-	}
-
-	private Node getUPnPErrorDescriptionNode()
-	{
-		Node errorNode = getUPnPErrorNode();
-		if (errorNode == null)
-			return null;
-		return errorNode.getNodeEndsWith(SOAP.ERROR_DESCRIPTION);
-	}
-
-	public int getUPnPErrorCode()
-	{
-		Node errorCodeNode = getUPnPErrorCodeNode();
-		if (errorCodeNode == null)
-			return -1;
-		String errorCodeStr = errorCodeNode.getValue();
-		try {
-			return Integer.parseInt(errorCodeStr);
-		}
-		catch (Exception e) {
-			return -1;
-		}
-	}
-
-	public String getUPnPErrorDescription()
-	{
-		Node errorDescNode = getUPnPErrorDescriptionNode();
-		if (errorDescNode == null)
-			return "";
-		return errorDescNode.getValue();
-	}
-
-	public UPnPStatus getUPnPError()
-	{
-		int code = 0;
-		String desc = "";
-		code = getUPnPErrorCode();
-		desc = getUPnPErrorDescription();
-		upnpErr.setCode(code);
-		upnpErr.setDescription(desc);
-		return upnpErr;
-	}
-
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ControlResponse.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.http.*;
+import org.cybergarage.xml.*;
+import org.cybergarage.soap.*;
+
+import org.cybergarage.upnp.*;
+
+public class ControlResponse extends SOAPResponse
+{
+	public static final String FAULT_CODE = "Client";
+	public static final String FAULT_STRING = "UPnPError";
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public ControlResponse()
+	{
+		setServer(UPnP.getServerName());
+	}
+
+	public ControlResponse(SOAPResponse soapRes)
+	{
+		super(soapRes);
+	}
+	
+	////////////////////////////////////////////////
+	//	FaultResponse
+	////////////////////////////////////////////////
+
+	public void setFaultResponse(int errCode, String errDescr)
+	{
+		setStatusCode(HTTPStatus.INTERNAL_SERVER_ERROR);
+		
+		Node bodyNode = getBodyNode();
+		Node faultNode = createFaultResponseNode(errCode, errDescr);
+		bodyNode.addNode(faultNode);
+
+		Node envNode = getEnvelopeNode();
+		setContent(envNode);
+	}
+
+	public void setFaultResponse(int errCode)
+	{
+		setFaultResponse(errCode, UPnPStatus.code2String(errCode));
+	}
+
+	////////////////////////////////////////////////
+	//	createFaultResponseNode
+	////////////////////////////////////////////////
+
+	private Node createFaultResponseNode(int errCode, String errDescr)
+	{
+		// <s:Fault>
+		Node faultNode = new Node(SOAP.XMLNS + SOAP.DELIM + SOAP.FAULT);
+
+ 		// <faultcode>s:Client</faultcode>
+		Node faultCodeNode = new Node(SOAP.FAULT_CODE);
+		faultCodeNode.setValue(SOAP.XMLNS + SOAP.DELIM + FAULT_CODE);
+		faultNode.addNode(faultCodeNode);
+		
+		// <faultstring>UPnPError</faultstring>
+		Node faultStringNode = new Node(SOAP.FAULT_STRING);
+		faultStringNode.setValue(FAULT_STRING);
+		faultNode.addNode(faultStringNode);
+
+		// <detail>
+		Node detailNode = new Node(SOAP.DETAIL);
+		faultNode.addNode(detailNode);
+
+		// <UPnPError xmlns="urn:schemas-upnp-org:control-1-0">
+		Node upnpErrorNode = new Node(FAULT_STRING);
+		upnpErrorNode.setAttribute("xmlns", Control.XMLNS);
+		detailNode.addNode(upnpErrorNode);
+
+		// <errorCode>error code</errorCode>
+		Node errorCodeNode = new Node(SOAP.ERROR_CODE);
+		errorCodeNode.setValue(errCode);
+		upnpErrorNode.addNode(errorCodeNode);
+
+		// <errorDescription>error string</errorDescription>
+		Node errorDesctiprionNode = new Node(SOAP.ERROR_DESCRIPTION);
+		errorDesctiprionNode.setValue(errDescr);
+		upnpErrorNode.addNode(errorDesctiprionNode);
+		
+		return faultNode;
+	}
+	
+	private Node createFaultResponseNode(int errCode)
+	{
+		return createFaultResponseNode(errCode, UPnPStatus.code2String(errCode));
+	}
+
+	////////////////////////////////////////////////
+	//	UPnP Error
+	////////////////////////////////////////////////
+	
+	private UPnPStatus upnpErr = new UPnPStatus();
+	
+	private Node getUPnPErrorNode()
+	{
+		Node detailNode = getFaultDetailNode();
+		if (detailNode == null)
+			return null;
+		return detailNode.getNodeEndsWith(SOAP.UPNP_ERROR);
+	}
+
+	private Node getUPnPErrorCodeNode()
+	{
+		Node errorNode = getUPnPErrorNode();
+		if (errorNode == null)
+			return null;
+		return errorNode.getNodeEndsWith(SOAP.ERROR_CODE);
+	}
+
+	private Node getUPnPErrorDescriptionNode()
+	{
+		Node errorNode = getUPnPErrorNode();
+		if (errorNode == null)
+			return null;
+		return errorNode.getNodeEndsWith(SOAP.ERROR_DESCRIPTION);
+	}
+
+	public int getUPnPErrorCode()
+	{
+		Node errorCodeNode = getUPnPErrorCodeNode();
+		if (errorCodeNode == null)
+			return -1;
+		String errorCodeStr = errorCodeNode.getValue();
+		try {
+			return Integer.parseInt(errorCodeStr);
+		}
+		catch (Exception e) {
+			return -1;
+		}
+	}
+
+	public String getUPnPErrorDescription()
+	{
+		Node errorDescNode = getUPnPErrorDescriptionNode();
+		if (errorDescNode == null)
+			return "";
+		return errorDescNode.getValue();
+	}
+
+	public UPnPStatus getUPnPError()
+	{
+		int code = 0;
+		String desc = "";
+		code = getUPnPErrorCode();
+		desc = getUPnPErrorDescription();
+		upnpErr.setCode(code);
+		upnpErr.setDescription(desc);
+		return upnpErr;
+	}
+
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/QueryListener.java b/router/java/src/org/cybergarage/upnp/control/QueryListener.java
index 8af1ea13e30549c7580a67e86be27e6e6343835d..17d96d7d8310977f8c2925e16dd24e121849ed28 100644
--- a/router/java/src/org/cybergarage/upnp/control/QueryListener.java
+++ b/router/java/src/org/cybergarage/upnp/control/QueryListener.java
@@ -1,25 +1,25 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: QueryListener.java
-*
-*	Revision;
-*
-*	01/30/03
-*		- first revision.
-*	01/04/04
-*		- Changed the interface.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.upnp.*;
-
-public interface QueryListener
-{
-	public boolean queryControlReceived(StateVariable stateVar);
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: QueryListener.java
+*
+*	Revision;
+*
+*	01/30/03
+*		- first revision.
+*	01/04/04
+*		- Changed the interface.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.upnp.*;
+
+public interface QueryListener
+{
+	public boolean queryControlReceived(StateVariable stateVar);
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/QueryRequest.java b/router/java/src/org/cybergarage/upnp/control/QueryRequest.java
index ad8b437e5a2d5a198a519eabb71d659a787cde5b..bd178f0f8179688ef85134aa3269078b8653dbf7 100644
--- a/router/java/src/org/cybergarage/upnp/control/QueryRequest.java
+++ b/router/java/src/org/cybergarage/upnp/control/QueryRequest.java
@@ -1,119 +1,119 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: QueryRequest.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	09/02/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Error : redundant code, the setRequest method in QueryRequest invokes setURI even if after a couple of rows setRequestHost is invoked
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.http.*;
-import org.cybergarage.xml.*;
-import org.cybergarage.soap.*;
-
-import org.cybergarage.upnp.*;
-
-public class QueryRequest extends ControlRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public QueryRequest()
-	{
-	}
-
-	public QueryRequest(HTTPRequest httpReq)
-	{
-		set(httpReq);
-	}
-
-	////////////////////////////////////////////////
-	//	Qyery
-	////////////////////////////////////////////////
-
-	private Node getVarNameNode()
-	{
-		Node bodyNode = getBodyNode();
-		if (bodyNode == null)
-			return null;
-		if (bodyNode.hasNodes() == false)
-			return null;
-		Node queryStateVarNode = bodyNode.getNode(0);
-		if (queryStateVarNode == null)
-			return null;
-		if (queryStateVarNode.hasNodes() == false)
-			return null;
-		return queryStateVarNode.getNode(0);
-	}
-	
-	public String getVarName()
-	{
-		Node node = getVarNameNode();
-		if (node == null)
-			return "";
-		return node.getValue();
-	}
-
-	////////////////////////////////////////////////
-	//	setRequest
-	////////////////////////////////////////////////
-	
-	public void setRequest(StateVariable stateVar)
-	{
-		Service service = stateVar.getService();		
-		
-		String ctrlURL = service.getControlURL();
-
-		setRequestHost(service);
-
-		setEnvelopeNode(SOAP.createEnvelopeBodyNode());
-		Node envNode = getEnvelopeNode();
-		Node bodyNode = getBodyNode();
-		Node qeuryNode = createContentNode(stateVar);
-		bodyNode.addNode(qeuryNode);
-		setContent(envNode);
-
-		setSOAPAction(Control.QUERY_SOAPACTION);
-	}
-
-	////////////////////////////////////////////////
-	//	Contents
-	////////////////////////////////////////////////
-
-	private Node createContentNode(StateVariable stateVar)
-	{
-		Node queryVarNode = new Node();
-		queryVarNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE);
-		queryVarNode.setNameSpace(Control.NS, Control.XMLNS);
-
-		Node varNode = new Node();
-		varNode.setName(Control.NS, Control.VAR_NAME);
-		varNode.setValue(stateVar.getName());
-		queryVarNode.addNode(varNode);
-		
-		return queryVarNode;
-	}
-	
-	////////////////////////////////////////////////
-	//	post
-	////////////////////////////////////////////////
-
-	public QueryResponse post()
-	{
-		SOAPResponse soapRes = postMessage(getRequestHost(), getRequestPort());
-		return new QueryResponse(soapRes);
-	}
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: QueryRequest.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	09/02/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Error : redundant code, the setRequest method in QueryRequest invokes setURI even if after a couple of rows setRequestHost is invoked
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.http.*;
+import org.cybergarage.xml.*;
+import org.cybergarage.soap.*;
+
+import org.cybergarage.upnp.*;
+
+public class QueryRequest extends ControlRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public QueryRequest()
+	{
+	}
+
+	public QueryRequest(HTTPRequest httpReq)
+	{
+		set(httpReq);
+	}
+
+	////////////////////////////////////////////////
+	//	Qyery
+	////////////////////////////////////////////////
+
+	private Node getVarNameNode()
+	{
+		Node bodyNode = getBodyNode();
+		if (bodyNode == null)
+			return null;
+		if (bodyNode.hasNodes() == false)
+			return null;
+		Node queryStateVarNode = bodyNode.getNode(0);
+		if (queryStateVarNode == null)
+			return null;
+		if (queryStateVarNode.hasNodes() == false)
+			return null;
+		return queryStateVarNode.getNode(0);
+	}
+	
+	public String getVarName()
+	{
+		Node node = getVarNameNode();
+		if (node == null)
+			return "";
+		return node.getValue();
+	}
+
+	////////////////////////////////////////////////
+	//	setRequest
+	////////////////////////////////////////////////
+	
+	public void setRequest(StateVariable stateVar)
+	{
+		Service service = stateVar.getService();		
+		
+		String ctrlURL = service.getControlURL();
+
+		setRequestHost(service);
+
+		setEnvelopeNode(SOAP.createEnvelopeBodyNode());
+		Node envNode = getEnvelopeNode();
+		Node bodyNode = getBodyNode();
+		Node qeuryNode = createContentNode(stateVar);
+		bodyNode.addNode(qeuryNode);
+		setContent(envNode);
+
+		setSOAPAction(Control.QUERY_SOAPACTION);
+	}
+
+	////////////////////////////////////////////////
+	//	Contents
+	////////////////////////////////////////////////
+
+	private Node createContentNode(StateVariable stateVar)
+	{
+		Node queryVarNode = new Node();
+		queryVarNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE);
+		queryVarNode.setNameSpace(Control.NS, Control.XMLNS);
+
+		Node varNode = new Node();
+		varNode.setName(Control.NS, Control.VAR_NAME);
+		varNode.setValue(stateVar.getName());
+		queryVarNode.addNode(varNode);
+		
+		return queryVarNode;
+	}
+	
+	////////////////////////////////////////////////
+	//	post
+	////////////////////////////////////////////////
+
+	public QueryResponse post()
+	{
+		SOAPResponse soapRes = postMessage(getRequestHost(), getRequestPort());
+		return new QueryResponse(soapRes);
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/control/QueryResponse.java b/router/java/src/org/cybergarage/upnp/control/QueryResponse.java
index 75ba30c84e90186e02e91fde6e1b42bd8c6e7768..a8877371152f9c47da4094f35ef128f32ebde6d7 100644
--- a/router/java/src/org/cybergarage/upnp/control/QueryResponse.java
+++ b/router/java/src/org/cybergarage/upnp/control/QueryResponse.java
@@ -1,97 +1,97 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: QueryResponse.java
-*
-*	Revision;
-*
-*	01/30/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.http.*;
-import org.cybergarage.soap.*;
-import org.cybergarage.xml.*;
-
-public class QueryResponse extends ControlResponse
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public QueryResponse()
-	{
-	}
-
-	public QueryResponse(SOAPResponse soapRes)
-	{
-		super(soapRes);
-	}
-
-	////////////////////////////////////////////////
-	//	Qyery
-	////////////////////////////////////////////////
-
-	private Node getReturnNode()
-	{
-		Node bodyNode = getBodyNode();
-		if (bodyNode == null)
-			return null;
-		if (bodyNode.hasNodes() == false)
-			return null;
-		Node queryResNode = bodyNode.getNode(0);
-		if (queryResNode == null)
-			return null;
-		if (queryResNode.hasNodes() == false)
-			return null;
-		return queryResNode.getNode(0);
-	}
-	
-	public String getReturnValue()
-	{
-		Node node = getReturnNode();
-		if (node == null)
-			return "";
-		return node.getValue();
-	}
-
-	////////////////////////////////////////////////
-	//	Response
-	////////////////////////////////////////////////
-
-	public void setResponse(StateVariable stateVar)
-	{
-		String var = stateVar.getValue();
-
-		setStatusCode(HTTPStatus.OK);
-		
-		Node bodyNode = getBodyNode();
-		Node resNode = createResponseNode(var);
-		bodyNode.addNode(resNode);
-		
-		Node envNodee = getEnvelopeNode();
-		setContent(envNodee);
-
-	}
-
-	private Node createResponseNode(String var)
-	{
-		Node queryResNode = new Node();
-		queryResNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE_RESPONSE);
-		queryResNode.setNameSpace(Control.NS, Control.XMLNS);
-		
-		Node returnNode = new Node();
-		returnNode.setName(Control.RETURN);
-		returnNode.setValue(var);
-		queryResNode.addNode(returnNode);
-		
-		return queryResNode;
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: QueryResponse.java
+*
+*	Revision;
+*
+*	01/30/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.http.*;
+import org.cybergarage.soap.*;
+import org.cybergarage.xml.*;
+
+public class QueryResponse extends ControlResponse
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public QueryResponse()
+	{
+	}
+
+	public QueryResponse(SOAPResponse soapRes)
+	{
+		super(soapRes);
+	}
+
+	////////////////////////////////////////////////
+	//	Qyery
+	////////////////////////////////////////////////
+
+	private Node getReturnNode()
+	{
+		Node bodyNode = getBodyNode();
+		if (bodyNode == null)
+			return null;
+		if (bodyNode.hasNodes() == false)
+			return null;
+		Node queryResNode = bodyNode.getNode(0);
+		if (queryResNode == null)
+			return null;
+		if (queryResNode.hasNodes() == false)
+			return null;
+		return queryResNode.getNode(0);
+	}
+	
+	public String getReturnValue()
+	{
+		Node node = getReturnNode();
+		if (node == null)
+			return "";
+		return node.getValue();
+	}
+
+	////////////////////////////////////////////////
+	//	Response
+	////////////////////////////////////////////////
+
+	public void setResponse(StateVariable stateVar)
+	{
+		String var = stateVar.getValue();
+
+		setStatusCode(HTTPStatus.OK);
+		
+		Node bodyNode = getBodyNode();
+		Node resNode = createResponseNode(var);
+		bodyNode.addNode(resNode);
+		
+		Node envNodee = getEnvelopeNode();
+		setContent(envNodee);
+
+	}
+
+	private Node createResponseNode(String var)
+	{
+		Node queryResNode = new Node();
+		queryResNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE_RESPONSE);
+		queryResNode.setNameSpace(Control.NS, Control.XMLNS);
+		
+		Node returnNode = new Node();
+		returnNode.setName(Control.RETURN);
+		returnNode.setValue(var);
+		queryResNode.addNode(returnNode);
+		
+		return queryResNode;
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java b/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java
index 7b8d2e05907caf7372a34d72347871b5f58769d6..8741472f4a863e746c8d1277340b66d7730b6b63 100644
--- a/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java
+++ b/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java
@@ -1,65 +1,65 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: RenewSubscriber.java
-*
-*	Revision:
-*
-*	07/07/04
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.control;
-
-import org.cybergarage.util.*;
-import org.cybergarage.upnp.*;
-
-public class RenewSubscriber extends ThreadCore
-{
-	public final static long INTERVAL = 120;
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public RenewSubscriber(ControlPoint ctrlp)
-	{
-		setControlPoint(ctrlp);
-	}
-	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private ControlPoint ctrlPoint;
-
-	public void setControlPoint(ControlPoint ctrlp)
-	{
-		ctrlPoint = ctrlp;
-	}
-	
-	public ControlPoint getControlPoint()
-	{
-		return ctrlPoint;
-	}
-
-	////////////////////////////////////////////////
-	//	Thread
-	////////////////////////////////////////////////
-	
-	public void run() 
-	{
-		ControlPoint ctrlp = getControlPoint();
-		long renewInterval = INTERVAL * 1000;
-		while (isRunnable() == true) {
-			try {
-				Thread.sleep(renewInterval);
-			} catch (InterruptedException e) {}
-			ctrlp.renewSubscriberService();
-		}
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: RenewSubscriber.java
+*
+*	Revision:
+*
+*	07/07/04
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.control;
+
+import org.cybergarage.util.*;
+import org.cybergarage.upnp.*;
+
+public class RenewSubscriber extends ThreadCore
+{
+	public final static long INTERVAL = 120;
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public RenewSubscriber(ControlPoint ctrlp)
+	{
+		setControlPoint(ctrlp);
+	}
+	
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private ControlPoint ctrlPoint;
+
+	public void setControlPoint(ControlPoint ctrlp)
+	{
+		ctrlPoint = ctrlp;
+	}
+	
+	public ControlPoint getControlPoint()
+	{
+		return ctrlPoint;
+	}
+
+	////////////////////////////////////////////////
+	//	Thread
+	////////////////////////////////////////////////
+	
+	public void run() 
+	{
+		ControlPoint ctrlp = getControlPoint();
+		long renewInterval = INTERVAL * 1000;
+		while (isRunnable() == true) {
+			try {
+				Thread.sleep(renewInterval);
+			} catch (InterruptedException e) {}
+			ctrlp.renewSubscriberService();
+		}
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/Advertiser.java b/router/java/src/org/cybergarage/upnp/device/Advertiser.java
index 373fea82d93c55ff64223e6c15fd4d54cad28bfb..5be3e0bcbe239ebb62a4f2ad8b4b78fe27b38f6a 100644
--- a/router/java/src/org/cybergarage/upnp/device/Advertiser.java
+++ b/router/java/src/org/cybergarage/upnp/device/Advertiser.java
@@ -1,68 +1,68 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: Advertiser.java
-*
-*	Revision;
-*
-*	12/24/03
-*		- first revision.
-*	06/18/04
-*		- Changed to advertise every 25%-50% of the periodic notification cycle for NMPR;
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.device;
-
-import org.cybergarage.util.*;
-import org.cybergarage.upnp.*;
-
-public class Advertiser extends ThreadCore
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public Advertiser(Device dev)
-	{
-		setDevice(dev);
-	}
-	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private Device device;
-
-	public void setDevice(Device dev)
-	{
-		device = dev;
-	}
-	
-	public Device getDevice()
-	{
-		return device;
-	}
-
-	////////////////////////////////////////////////
-	//	Thread
-	////////////////////////////////////////////////
-	
-	public void run() 
-	{
-		Device dev = getDevice();
-		long leaseTime = dev.getLeaseTime();
-		long notifyInterval;
-		while (isRunnable() == true) {
-			notifyInterval = (leaseTime/4) + (long)((float)leaseTime * (Math.random() * 0.25f));
-			notifyInterval *= 1000;
-			try {
-				Thread.sleep(notifyInterval);
-			} catch (InterruptedException e) {}
-			dev.announce();
-		}
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: Advertiser.java
+*
+*	Revision;
+*
+*	12/24/03
+*		- first revision.
+*	06/18/04
+*		- Changed to advertise every 25%-50% of the periodic notification cycle for NMPR;
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.util.*;
+import org.cybergarage.upnp.*;
+
+public class Advertiser extends ThreadCore
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public Advertiser(Device dev)
+	{
+		setDevice(dev);
+	}
+	
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private Device device;
+
+	public void setDevice(Device dev)
+	{
+		device = dev;
+	}
+	
+	public Device getDevice()
+	{
+		return device;
+	}
+
+	////////////////////////////////////////////////
+	//	Thread
+	////////////////////////////////////////////////
+	
+	public void run() 
+	{
+		Device dev = getDevice();
+		long leaseTime = dev.getLeaseTime();
+		long notifyInterval;
+		while (isRunnable() == true) {
+			notifyInterval = (leaseTime/4) + (long)((float)leaseTime * (Math.random() * 0.25f));
+			notifyInterval *= 1000;
+			try {
+				Thread.sleep(notifyInterval);
+			} catch (InterruptedException e) {}
+			dev.announce();
+		}
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/Description.java b/router/java/src/org/cybergarage/upnp/device/Description.java
index fe42dc5ea6a88210e0b90cda2894f0115ee288f7..fbf539291f28af774cfb3839a3c1bd2ba937d6b6 100644
--- a/router/java/src/org/cybergarage/upnp/device/Description.java
+++ b/router/java/src/org/cybergarage/upnp/device/Description.java
@@ -1,24 +1,24 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: MAN.java
-*
-*	Revision;
-*
-*	12/30/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: MAN.java
+*
+*	Revision;
+*
+*	12/30/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class Description 
+{
+	public final static String LOADING_EXCEPTION = "Couldn't load a specified description file ";
+	public final static String NOROOT_EXCEPTION = "Couldn't find a root node";
+	public final static String NOROOTDEVICE_EXCEPTION = "Couldn't find a root device node";
+}
 
-package org.cybergarage.upnp.device;
-
-public class Description 
-{
-	public final static String LOADING_EXCEPTION = "Couldn't load a specified description file ";
-	public final static String NOROOT_EXCEPTION = "Couldn't find a root node";
-	public final static String NOROOTDEVICE_EXCEPTION = "Couldn't find a root device node";
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/device/Disposer.java b/router/java/src/org/cybergarage/upnp/device/Disposer.java
index 1de8ceb3b93027cc1b40d4c3a09de65a104e018c..810538986ea08acb329a631d7eff69327f06971c 100644
--- a/router/java/src/org/cybergarage/upnp/device/Disposer.java
+++ b/router/java/src/org/cybergarage/upnp/device/Disposer.java
@@ -1,66 +1,66 @@
-/******************************************************************
-*
-*	CyberLink for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: Disposer.java
-*
-*	Revision:
-*
-*	01/05/04
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.device;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.util.*;
-
-public class Disposer extends ThreadCore
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public Disposer(ControlPoint ctrlp)
-	{
-		setControlPoint(ctrlp);
-	}
-	
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private ControlPoint ctrlPoint;
-
-	public void setControlPoint(ControlPoint ctrlp)
-	{
-		ctrlPoint = ctrlp;
-	}
-	
-	public ControlPoint getControlPoint()
-	{
-		return ctrlPoint;
-	}
-
-	////////////////////////////////////////////////
-	//	Thread
-	////////////////////////////////////////////////
-	
-	public void run() 
-	{
-		Thread.currentThread().setName("UPnP-Disposer");
-		ControlPoint ctrlp = getControlPoint();
-		long monitorInterval = ctrlp.getExpiredDeviceMonitoringInterval() * 1000;
-		
-		while (isRunnable() == true) {
-			try {
-				Thread.sleep(monitorInterval);
-			} catch (InterruptedException e) {}
-			ctrlp.removeExpiredDevices();
-			//ctrlp.print();
-		}
-	}
-}
+/******************************************************************
+*
+*	CyberLink for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: Disposer.java
+*
+*	Revision:
+*
+*	01/05/04
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.util.*;
+
+public class Disposer extends ThreadCore
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public Disposer(ControlPoint ctrlp)
+	{
+		setControlPoint(ctrlp);
+	}
+	
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private ControlPoint ctrlPoint;
+
+	public void setControlPoint(ControlPoint ctrlp)
+	{
+		ctrlPoint = ctrlp;
+	}
+	
+	public ControlPoint getControlPoint()
+	{
+		return ctrlPoint;
+	}
+
+	////////////////////////////////////////////////
+	//	Thread
+	////////////////////////////////////////////////
+	
+	public void run() 
+	{
+		Thread.currentThread().setName("UPnP-Disposer");
+		ControlPoint ctrlp = getControlPoint();
+		long monitorInterval = ctrlp.getExpiredDeviceMonitoringInterval() * 1000;
+		
+		while (isRunnable() == true) {
+			try {
+				Thread.sleep(monitorInterval);
+			} catch (InterruptedException e) {}
+			ctrlp.removeExpiredDevices();
+			//ctrlp.print();
+		}
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java b/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java
index 5145245895ad6831b845da44c58b0bf80618344a..03e24c7b94c93677ce290b83f37548d9cb569255 100644
--- a/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java
+++ b/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java
@@ -5,37 +5,37 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: InvalidDescriptionException.java
-*
-*	Revision;
-*
-*	12/26/02
-*		- first revision.
+*
+*	Revision;
+*
+*	12/26/02
+*		- first revision.
 *	
 ******************************************************************/
 
-package org.cybergarage.upnp.device;
-
-import java.io.*;
-
-public class InvalidDescriptionException extends Exception
+package org.cybergarage.upnp.device;
+
+import java.io.*;
+
+public class InvalidDescriptionException extends Exception
 {
-	public InvalidDescriptionException()
+	public InvalidDescriptionException()
 	{
 		super();
 	}
 	
-	public InvalidDescriptionException(String s)
+	public InvalidDescriptionException(String s)
 	{
 		super(s);
 	}
-
-	public InvalidDescriptionException(String s, File file)
+
+	public InvalidDescriptionException(String s, File file)
 	{
 		super(s + " (" + file.toString() + ")");
 	}
-
-	public InvalidDescriptionException(Exception e)
+
+	public InvalidDescriptionException(Exception e)
 	{
 		super(e.getMessage());
 	}
-}
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/MAN.java b/router/java/src/org/cybergarage/upnp/device/MAN.java
index 1e0093f743a5e988c8fce4c27b1a6f4da2849f7b..9f970e2c284c2ae692a862e971f1877f4b246c5e 100644
--- a/router/java/src/org/cybergarage/upnp/device/MAN.java
+++ b/router/java/src/org/cybergarage/upnp/device/MAN.java
@@ -1,31 +1,31 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: MAN.java
-*
-*	Revision;
-*
-*	12/30/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: MAN.java
+*
+*	Revision;
+*
+*	12/30/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class MAN 
+{
+	public final static String DISCOVER = "ssdp:discover";
+	
+	public final static boolean isDiscover(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.equals(MAN.DISCOVER) == true)
+			return true;
+		return value.equals("\"" + MAN.DISCOVER + "\"");
+	}
+}
 
-package org.cybergarage.upnp.device;
-
-public class MAN 
-{
-	public final static String DISCOVER = "ssdp:discover";
-	
-	public final static boolean isDiscover(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.equals(MAN.DISCOVER) == true)
-			return true;
-		return value.equals("\"" + MAN.DISCOVER + "\"");
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/device/NT.java b/router/java/src/org/cybergarage/upnp/device/NT.java
index 1acb0d49058e89b7cf22f776fbdf777794aa72f8..ce6e314fde7ad4f160f2fe63a0a51020eb9f1076 100644
--- a/router/java/src/org/cybergarage/upnp/device/NT.java
+++ b/router/java/src/org/cybergarage/upnp/device/NT.java
@@ -1,30 +1,30 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: NT.java
-*
-*	Revision;
-*
-*	12/09/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: NT.java
+*
+*	Revision;
+*
+*	12/09/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class NT 
+{
+	public final static String ROOTDEVICE = "upnp:rootdevice";
+	public final static String EVENT = "upnp:event";
+	
+	public final static boolean isRootDevice(String ntValue)
+	{
+		if (ntValue == null)
+			return false;
+		return ntValue.startsWith(ROOTDEVICE);
+	}
+}
 
-package org.cybergarage.upnp.device;
-
-public class NT 
-{
-	public final static String ROOTDEVICE = "upnp:rootdevice";
-	public final static String EVENT = "upnp:event";
-	
-	public final static boolean isRootDevice(String ntValue)
-	{
-		if (ntValue == null)
-			return false;
-		return ntValue.startsWith(ROOTDEVICE);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/device/NTS.java b/router/java/src/org/cybergarage/upnp/device/NTS.java
index 7eab5f19cc21a8257472fbfd59e177a63edb2797..5132e0392449c965ac54f1d2860ab7697844dd85 100644
--- a/router/java/src/org/cybergarage/upnp/device/NTS.java
+++ b/router/java/src/org/cybergarage/upnp/device/NTS.java
@@ -1,38 +1,38 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: NTS.java
-*
-*	Revision;
-*
-*	12/09/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: NTS.java
+*
+*	Revision;
+*
+*	12/09/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class NTS 
+{
+	public final static String ALIVE = "ssdp:alive";
+	public final static String BYEBYE = "ssdp:byebye";
+	public final static String PROPCHANGE = "upnp:propchange";
+	
+	public final static boolean isAlive(String ntsValue)
+	{
+		if (ntsValue == null)
+			return false;
+		return ntsValue.startsWith(NTS.ALIVE);
+	}
+
+	public final static boolean isByeBye(String ntsValue)
+	{
+		if (ntsValue == null)
+			return false;
+		return ntsValue.startsWith(NTS.BYEBYE);
+	}
+}
 
-package org.cybergarage.upnp.device;
-
-public class NTS 
-{
-	public final static String ALIVE = "ssdp:alive";
-	public final static String BYEBYE = "ssdp:byebye";
-	public final static String PROPCHANGE = "upnp:propchange";
-	
-	public final static boolean isAlive(String ntsValue)
-	{
-		if (ntsValue == null)
-			return false;
-		return ntsValue.startsWith(NTS.ALIVE);
-	}
-
-	public final static boolean isByeBye(String ntsValue)
-	{
-		if (ntsValue == null)
-			return false;
-		return ntsValue.startsWith(NTS.BYEBYE);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/device/NotifyListener.java b/router/java/src/org/cybergarage/upnp/device/NotifyListener.java
index bac853ea571a5716994e93933ed5765ec5f9dd2d..e5abcc5bacff8a8d6f3f37bfba7663101c5774b2 100644
--- a/router/java/src/org/cybergarage/upnp/device/NotifyListener.java
+++ b/router/java/src/org/cybergarage/upnp/device/NotifyListener.java
@@ -5,19 +5,19 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: DeviceNotifyListener.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
 *	
 ******************************************************************/
-
-package org.cybergarage.upnp.device;
-
-import org.cybergarage.upnp.ssdp.*;
-
-public interface NotifyListener
-{
-	public void deviceNotifyReceived(SSDPPacket ssdpPacket);
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.upnp.ssdp.*;
+
+public interface NotifyListener
+{
+	public void deviceNotifyReceived(SSDPPacket ssdpPacket);
 }
diff --git a/router/java/src/org/cybergarage/upnp/device/PresentationListener.java b/router/java/src/org/cybergarage/upnp/device/PresentationListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0ab853aa6e8d8c1175477e6eecfb7ff50b1ef45
--- /dev/null
+++ b/router/java/src/org/cybergarage/upnp/device/PresentationListener.java
@@ -0,0 +1,23 @@
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: DeviceNotifyListener.java
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.http.HTTPRequest;
+
+public interface PresentationListener
+{
+	public void httpRequestRecieved(HTTPRequest httpReq);
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/ST.java b/router/java/src/org/cybergarage/upnp/device/ST.java
index dcbfaf8ce8c5560ec5a8fb6668fdf1ca04848281..e0ef91ebc8bb9705bb6cbba39c38a07d1a1bfb5c 100644
--- a/router/java/src/org/cybergarage/upnp/device/ST.java
+++ b/router/java/src/org/cybergarage/upnp/device/ST.java
@@ -1,71 +1,71 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
+/******************************************************************
 *
-*	File: ST.java
-*
-*	Revision;
-*
-*	01/07/03
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: ST.java
+*
+*	Revision;
+*
+*	01/07/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class ST 
+{
+	public final static String ALL_DEVICE = "ssdp:all";
+	public final static String ROOT_DEVICE = "upnp:rootdevice";
+	public final static String UUID_DEVICE = "uuid";
+	public final static String URN_DEVICE = "urn:schemas-upnp-org:device:";
+	public final static String URN_SERVICE = "urn:schemas-upnp-org:service:";
+
+	public final static boolean isAllDevice(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.equals(ALL_DEVICE) == true)
+			return true;
+		return value.equals("\"" + ALL_DEVICE + "\"");
+	}
+	
+	public final static boolean isRootDevice(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.equals(ROOT_DEVICE) == true)
+			return true;
+		return value.equals("\"" + ROOT_DEVICE + "\"");
+	}
+
+	public final static boolean isUUIDDevice(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.startsWith(UUID_DEVICE) == true)
+			return true;
+		return value.startsWith("\"" + UUID_DEVICE);
+	}
+
+	public final static boolean isURNDevice(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.startsWith(URN_DEVICE) == true)
+			return true;
+		return value.startsWith("\"" + URN_DEVICE);
+	}
+
+	public final static boolean isURNService(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.startsWith(URN_SERVICE) == true)
+			return true;
+		return value.startsWith("\"" + URN_SERVICE);
+	}
+}
 
-package org.cybergarage.upnp.device;
-
-public class ST 
-{
-	public final static String ALL_DEVICE = "ssdp:all";
-	public final static String ROOT_DEVICE = "upnp:rootdevice";
-	public final static String UUID_DEVICE = "uuid";
-	public final static String URN_DEVICE = "urn:schemas-upnp-org:device:";
-	public final static String URN_SERVICE = "urn:schemas-upnp-org:service:";
-
-	public final static boolean isAllDevice(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.equals(ALL_DEVICE) == true)
-			return true;
-		return value.equals("\"" + ALL_DEVICE + "\"");
-	}
-	
-	public final static boolean isRootDevice(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.equals(ROOT_DEVICE) == true)
-			return true;
-		return value.equals("\"" + ROOT_DEVICE + "\"");
-	}
-
-	public final static boolean isUUIDDevice(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.startsWith(UUID_DEVICE) == true)
-			return true;
-		return value.startsWith("\"" + UUID_DEVICE);
-	}
-
-	public final static boolean isURNDevice(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.startsWith(URN_DEVICE) == true)
-			return true;
-		return value.startsWith("\"" + URN_DEVICE);
-	}
-
-	public final static boolean isURNService(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.startsWith(URN_SERVICE) == true)
-			return true;
-		return value.startsWith("\"" + URN_SERVICE);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/device/SearchListener.java b/router/java/src/org/cybergarage/upnp/device/SearchListener.java
index 758a37c272c93219cfb3a302e61ab173506d4ba2..66702e36481184a083f85b1ef03a0c86d8862611 100644
--- a/router/java/src/org/cybergarage/upnp/device/SearchListener.java
+++ b/router/java/src/org/cybergarage/upnp/device/SearchListener.java
@@ -1,23 +1,23 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SearchListener.java
-*
-*	Revision;
-*
-*	11/18/02b
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.device;
-
-import org.cybergarage.upnp.ssdp.*;
-
-public interface SearchListener
-{
-	public void deviceSearchReceived(SSDPPacket ssdpPacket);
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SearchListener.java
+*
+*	Revision;
+*
+*	11/18/02b
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.upnp.ssdp.*;
+
+public interface SearchListener
+{
+	public void deviceSearchReceived(SSDPPacket ssdpPacket);
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java b/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java
index c87c41a37a131f6e3b2e9eed3b9c6a50def12e6d..10c845de7ebd013d62c87974fd32ce20ec16c01a 100644
--- a/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java
+++ b/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java
@@ -1,23 +1,23 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SearchResponseListener.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.device;
-
-import org.cybergarage.upnp.ssdp.*;
-
-public interface SearchResponseListener
-{
-	public void deviceSearchResponseReceived(SSDPPacket ssdpPacket);
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SearchResponseListener.java
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+import org.cybergarage.upnp.ssdp.*;
+
+public interface SearchResponseListener
+{
+	public void deviceSearchResponseReceived(SSDPPacket ssdpPacket);
+}
diff --git a/router/java/src/org/cybergarage/upnp/device/USN.java b/router/java/src/org/cybergarage/upnp/device/USN.java
index 74c704027b94c1a1e7cc73bebc963fc2532841ea..ded49a13f3275ea3c7bc6d1f373f10fd1283a480 100644
--- a/router/java/src/org/cybergarage/upnp/device/USN.java
+++ b/router/java/src/org/cybergarage/upnp/device/USN.java
@@ -1,40 +1,40 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: USN.java
-*
-*	Revision;
-*
-*	12/09/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: USN.java
+*
+*	Revision;
+*
+*	12/09/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.device;
+
+public class USN 
+{
+	public final static String ROOTDEVICE = "upnp:rootdevice";
+	
+	public final static boolean isRootDevice(String usnValue)
+	{
+		if (usnValue == null)
+			return false;
+		return usnValue.endsWith(ROOTDEVICE);
+	}
+	
+	public final static String getUDN(String usnValue)
+	{
+		if (usnValue == null)
+			return "";
+		int idx = usnValue.indexOf("::");
+		if (idx < 0)
+			return usnValue.trim();
+		String udnValue = new String(usnValue.getBytes(), 0, idx);
+		return udnValue.trim();
+	}
+}
 
-package org.cybergarage.upnp.device;
-
-public class USN 
-{
-	public final static String ROOTDEVICE = "upnp:rootdevice";
-	
-	public final static boolean isRootDevice(String usnValue)
-	{
-		if (usnValue == null)
-			return false;
-		return usnValue.endsWith(ROOTDEVICE);
-	}
-	
-	public final static String getUDN(String usnValue)
-	{
-		if (usnValue == null)
-			return "";
-		int idx = usnValue.indexOf("::");
-		if (idx < 0)
-			return usnValue.trim();
-		String udnValue = new String(usnValue.getBytes(), 0, idx);
-		return udnValue.trim();
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/event/EventListener.java b/router/java/src/org/cybergarage/upnp/event/EventListener.java
index 900b9307cfdde93165b55c30c116bd5f5f74be3d..782adb5b795731fb3d462e3e844141c580a8baea 100644
--- a/router/java/src/org/cybergarage/upnp/event/EventListener.java
+++ b/router/java/src/org/cybergarage/upnp/event/EventListener.java
@@ -1,21 +1,21 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: EventListener.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-public interface EventListener
-{
-	public void eventNotifyReceived(String uuid, long seq, String varName, String value);
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: EventListener.java
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+public interface EventListener
+{
+	public void eventNotifyReceived(String uuid, long seq, String varName, String value);
+}
diff --git a/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
index 5ebc1f21c59b2a85061aa803eb9c18c6588ed64a..0c8498f6e060f9c02362268c429c7b62f7f31483 100644
--- a/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
+++ b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
@@ -1,205 +1,205 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SOAPRequest.java
-*
-*	Revision;
-*
-*	12/11/02
-*		- first revision.
-*	05/22/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Description: removed the xml namespace
-*		- Problem : Notification messages refer to uncorrect variable names
-*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
-*	05/22/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : Notification messages refer to uncorrect variable names
-*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
-*		- Description : removed the xml namespace
-*	09/03/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : Notification messages refer to uncorrect variable names
-*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
-*		- Description: removed the xml namespace
-*	09/08/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : when an event notification message is received and the message
-*		            contains updates on more than one variable, only the first variable update
-*		            is notified.
-*		- Error :  the other xml nodes of the message are ignored
-*		- Fix : add two methods to the NotifyRequest for extracting the property array
-*                and modify the httpRequestRecieved method in ControlPoint
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import org.cybergarage.http.*;
-import org.cybergarage.xml.*;
-import org.cybergarage.soap.*;
-
-import org.cybergarage.upnp.device.*;
-
-public class NotifyRequest extends SOAPRequest
-{
-	private final static String XMLNS = "e";
-	private final static String PROPERTY = "property";
-	private final static String PROPERTYSET = "propertyset";
-	 
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public NotifyRequest()
-	{
-	}
-
-	public NotifyRequest(HTTPRequest httpReq)
-	{
-		set(httpReq);
-	}
-
-	////////////////////////////////////////////////
-	//	NT
-	////////////////////////////////////////////////
-
-	public void setNT(String value)
-	{
-		setHeader(HTTP.NT, value);
-	}
-
-	////////////////////////////////////////////////
-	//	NTS
-	////////////////////////////////////////////////
-
-	public void setNTS(String value)
-	{
-		setHeader(HTTP.NTS, value);
-	}
-
-	////////////////////////////////////////////////
-	//	SID
-	////////////////////////////////////////////////
-
-	public void setSID(String id)
-	{
-		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
-	}
-
-	public String getSID()
-	{
-		return Subscription.getSID(getHeaderValue(HTTP.SID));
-	}
-
-	////////////////////////////////////////////////
-	//	SEQ
-	////////////////////////////////////////////////
-
-	public void setSEQ(long value)
-	{
-		setHeader(HTTP.SEQ, Long.toString(value));
-	}
-
-	public long getSEQ()
-	{
-		return getLongHeaderValue(HTTP.SEQ);
-	}
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public boolean setRequest(Subscriber sub, String varName, String value)
-	{
-		String callback = sub.getDeliveryURL();
-		String sid = sub.getSID();
-		long notifyCnt = sub.getNotifyCount();
-		String host = sub.getDeliveryHost();
-		String path = sub.getDeliveryPath();
-		int port = sub.getDeliveryPort();
-		
-		setMethod(HTTP.NOTIFY);
-		setURI(path);
-		setHost(host, port);
-		setNT(NT.EVENT);
-		setNTS(NTS.PROPCHANGE);
-		setSID(sid);
-		setSEQ(notifyCnt);
-
-		setContentType(XML.CONTENT_TYPE);
-		Node propSetNode = createPropertySetNode(varName, value);
-		setContent(propSetNode);		
-
-		return true;			
-	}
-	
-	private Node createPropertySetNode(String varName, String value)
-	{
-		Node propSetNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTYSET);
-		
-		propSetNode.setNameSpace(XMLNS, Subscription.XMLNS);
-
-		Node propNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTY);
-		propSetNode.addNode(propNode);
-		
-		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/22/03)
-		//Node varNameNode = new Node(XMLNS + SOAP.DELIM + varName);
-		Node varNameNode = new Node(varName);
-		varNameNode.setValue(value);
-		propNode.addNode(varNameNode);
-		
-		return propSetNode;
-	}
-	
-	private Node getVariableNode()
-	{
-		Node rootNode = getEnvelopeNode();
-		if (rootNode == null)
-			return null;
-		if (rootNode.hasNodes() == false)
-			return null;
-		Node propNode = rootNode.getNode(0);
-		if (propNode.hasNodes() == false)
-			return null;
-		return propNode.getNode(0);
-	}
-
-	// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/08/03)
-	private Property getProperty(Node varNode) 
-	{
-		Property prop = new Property();
-		if (varNode == null)
-			return prop;
-		// remove the event namespace
-		String variableName = varNode.getName();
-		int index = variableName.lastIndexOf(':');
-		if (index != -1)
-			variableName = variableName.substring(index + 1);
-		prop.setName(variableName);
-		prop.setValue(varNode.getValue());
-		return prop;
-	}
-
-	// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/08/03)
-	public PropertyList getPropertyList() {
-		PropertyList properties = new PropertyList();
-		Node varSetNode = getEnvelopeNode();
-		// I2P change: ParserException caught in getRootNode() causes
-		// getEnvelopeNode() to return null
-		if (varSetNode == null)
-			return properties;
-		for (int i = 0; i<varSetNode.getNNodes(); i++){
-			Node propNode = varSetNode.getNode(i);
-			if (propNode == null)
-				continue;
-			Property prop = getProperty(propNode.getNode(0));
-			properties.add(prop);
-		}
-		return properties;
-	}
-	
-}	
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SOAPRequest.java
+*
+*	Revision;
+*
+*	12/11/02
+*		- first revision.
+*	05/22/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Description: removed the xml namespace
+*		- Problem : Notification messages refer to uncorrect variable names
+*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
+*	05/22/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : Notification messages refer to uncorrect variable names
+*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
+*		- Description : removed the xml namespace
+*	09/03/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : Notification messages refer to uncorrect variable names
+*		- Error : The NotifyRequest class introduces the XML namespace in variable names, too
+*		- Description: removed the xml namespace
+*	09/08/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : when an event notification message is received and the message
+*		            contains updates on more than one variable, only the first variable update
+*		            is notified.
+*		- Error :  the other xml nodes of the message are ignored
+*		- Fix : add two methods to the NotifyRequest for extracting the property array
+*                and modify the httpRequestRecieved method in ControlPoint
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import org.cybergarage.http.*;
+import org.cybergarage.xml.*;
+import org.cybergarage.soap.*;
+
+import org.cybergarage.upnp.device.*;
+
+public class NotifyRequest extends SOAPRequest
+{
+	private final static String XMLNS = "e";
+	private final static String PROPERTY = "property";
+	private final static String PROPERTYSET = "propertyset";
+	 
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public NotifyRequest()
+	{
+	}
+
+	public NotifyRequest(HTTPRequest httpReq)
+	{
+		set(httpReq);
+	}
+
+	////////////////////////////////////////////////
+	//	NT
+	////////////////////////////////////////////////
+
+	public void setNT(String value)
+	{
+		setHeader(HTTP.NT, value);
+	}
+
+	////////////////////////////////////////////////
+	//	NTS
+	////////////////////////////////////////////////
+
+	public void setNTS(String value)
+	{
+		setHeader(HTTP.NTS, value);
+	}
+
+	////////////////////////////////////////////////
+	//	SID
+	////////////////////////////////////////////////
+
+	public void setSID(String id)
+	{
+		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
+	}
+
+	public String getSID()
+	{
+		return Subscription.getSID(getHeaderValue(HTTP.SID));
+	}
+
+	////////////////////////////////////////////////
+	//	SEQ
+	////////////////////////////////////////////////
+
+	public void setSEQ(long value)
+	{
+		setHeader(HTTP.SEQ, Long.toString(value));
+	}
+
+	public long getSEQ()
+	{
+		return getLongHeaderValue(HTTP.SEQ);
+	}
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public boolean setRequest(Subscriber sub, String varName, String value)
+	{
+		String callback = sub.getDeliveryURL();
+		String sid = sub.getSID();
+		long notifyCnt = sub.getNotifyCount();
+		String host = sub.getDeliveryHost();
+		String path = sub.getDeliveryPath();
+		int port = sub.getDeliveryPort();
+		
+		setMethod(HTTP.NOTIFY);
+		setURI(path);
+		setHost(host, port);
+		setNT(NT.EVENT);
+		setNTS(NTS.PROPCHANGE);
+		setSID(sid);
+		setSEQ(notifyCnt);
+
+		setContentType(XML.DEFAULT_CONTENT_TYPE);
+		Node propSetNode = createPropertySetNode(varName, value);
+		setContent(propSetNode);		
+
+		return true;			
+	}
+	
+	private Node createPropertySetNode(String varName, String value)
+	{
+		Node propSetNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTYSET);
+		
+		propSetNode.setNameSpace(XMLNS, Subscription.XMLNS);
+
+		Node propNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTY);
+		propSetNode.addNode(propNode);
+		
+		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/22/03)
+		//Node varNameNode = new Node(XMLNS + SOAP.DELIM + varName);
+		Node varNameNode = new Node(varName);
+		varNameNode.setValue(value);
+		propNode.addNode(varNameNode);
+		
+		return propSetNode;
+	}
+	
+	private Node getVariableNode()
+	{
+		Node rootNode = getEnvelopeNode();
+		if (rootNode == null)
+			return null;
+		if (rootNode.hasNodes() == false)
+			return null;
+		Node propNode = rootNode.getNode(0);
+		if (propNode.hasNodes() == false)
+			return null;
+		return propNode.getNode(0);
+	}
+
+	// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/08/03)
+	private Property getProperty(Node varNode) 
+	{
+		Property prop = new Property();
+		if (varNode == null)
+			return prop;
+		// remove the event namespace
+		String variableName = varNode.getName();
+		int index = variableName.lastIndexOf(':');
+		if (index != -1)
+			variableName = variableName.substring(index + 1);
+		prop.setName(variableName);
+		prop.setValue(varNode.getValue());
+		return prop;
+	}
+
+	// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/08/03)
+	public PropertyList getPropertyList() {
+		PropertyList properties = new PropertyList();
+		Node varSetNode = getEnvelopeNode();
+		// I2P change: ParserException caught in getRootNode() causes
+		// getEnvelopeNode() to return null
+		if (varSetNode == null)
+			return properties;
+		for (int i = 0; i<varSetNode.getNNodes(); i++){
+			Node propNode = varSetNode.getNode(i);
+			if (propNode == null)
+				continue;
+			Property prop = getProperty(propNode.getNode(0));
+			properties.add(prop);
+		}
+		return properties;
+	}
+	
+}	
diff --git a/router/java/src/org/cybergarage/upnp/event/Property.java b/router/java/src/org/cybergarage/upnp/event/Property.java
index a9c6d67b68a48874d287787352427b86da2229e2..5e9f5b47d9918d8dbf837a258e16a5f686f969f5 100644
--- a/router/java/src/org/cybergarage/upnp/event/Property.java
+++ b/router/java/src/org/cybergarage/upnp/event/Property.java
@@ -1,65 +1,65 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: Subscriber.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	05/22/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : the setName method does not set the name of the property
-*		- Error : the method contains a bug:
-*	06/18/03
-*		- Fixed a bug when a null value is received to the name and the value of property.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-public class Property
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public Property()
-	{
-	}
-
-	////////////////////////////////////////////////
-	//	name
-	////////////////////////////////////////////////
-
-	private String name = "";
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String val) {
-		if (val == null)
-			val = "";
-		name = val;
-	}
-
-	////////////////////////////////////////////////
-	//	value
-	////////////////////////////////////////////////
-
-	private String value = "";
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String val) {
-		if (val == null)
-			val = "";
-		value = val;
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: Subscriber.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	05/22/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : the setName method does not set the name of the property
+*		- Error : the method contains a bug:
+*	06/18/03
+*		- Fixed a bug when a null value is received to the name and the value of property.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+public class Property
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public Property()
+	{
+	}
+
+	////////////////////////////////////////////////
+	//	name
+	////////////////////////////////////////////////
+
+	private String name = "";
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String val) {
+		if (val == null)
+			val = "";
+		name = val;
+	}
+
+	////////////////////////////////////////////////
+	//	value
+	////////////////////////////////////////////////
+
+	private String value = "";
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String val) {
+		if (val == null)
+			val = "";
+		value = val;
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/event/PropertyList.java b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
index 7b11a9b324f53963414c8fa6220d65abf9b8cee2..23e782efc9967bdda451d820296964f71c760886 100644
--- a/router/java/src/org/cybergarage/upnp/event/PropertyList.java
+++ b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
@@ -1,45 +1,45 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: PropertyList.java
-*
-*	Revision;
-*
-*	09/08/03
-*		- first revision.
-*
-******************************************************************/
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: PropertyList.java
+*
+*	Revision;
+*
+*	09/08/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import java.util.*;
+
+public class PropertyList extends Vector<Property>
+{
+	////////////////////////////////////////////////
+	//	Constants
+	////////////////////////////////////////////////
+	
+	public final static String ELEM_NAME = "PropertyList";
+
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public PropertyList() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public Property getProperty(int n)
+	{
+		return (Property)get(n);
+	}
+}
 
-package org.cybergarage.upnp.event;
-
-import java.util.*;
-
-public class PropertyList extends Vector<Property> 
-{
-	////////////////////////////////////////////////
-	//	Constants
-	////////////////////////////////////////////////
-	
-	public final static String ELEM_NAME = "PropertyList";
-
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public PropertyList() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public Property getProperty(int n)
-	{
-		return (Property)get(n);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/upnp/event/Subscriber.java b/router/java/src/org/cybergarage/upnp/event/Subscriber.java
index 8ade71c721938aa464b32e154ead68a130883704..ccfe75db7ff520d0d3095c6b9751fab60d01ed90 100644
--- a/router/java/src/org/cybergarage/upnp/event/Subscriber.java
+++ b/router/java/src/org/cybergarage/upnp/event/Subscriber.java
@@ -1,180 +1,180 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: Subscriber.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	07/31/04
-*		- Added isExpired().
-*	10/26/04
-*		- Oliver Newell <newell@media-rush.com>
-*		- Added support the intinite time and fixed a bug in isExpired().
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import java.net.*;
-
-public class Subscriber
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public Subscriber()
-	{
-		renew();
-	}
-
-	////////////////////////////////////////////////
-	//	SID
-	////////////////////////////////////////////////
-
-	private String SID = null;
-
-	public String getSID() {
-		return SID;
-	}
-
-	public void setSID(String sid) {
-		SID = sid;
-	}
-
-	////////////////////////////////////////////////
-	//	deliveryURL
-	////////////////////////////////////////////////
-
-	private String ifAddr = "";
-	
-	public void setInterfaceAddress(String addr)
-	{
-		ifAddr = addr;
-	}
-	
-	public String getInterfaceAddress()
-	{
-		return ifAddr;
-	}
-	
-	////////////////////////////////////////////////
-	//	deliveryURL
-	////////////////////////////////////////////////
-
-	private String deliveryURL = "";
-
-	public String getDeliveryURL() {
-		return deliveryURL;
-	}
-
-	public void setDeliveryURL(String deliveryURL) {
-		this.deliveryURL = deliveryURL;
-		try {
-			URL url = new URL(deliveryURL);
-			deliveryHost = url.getHost();
-			deliveryPath = url.getPath();
-			deliveryPort = url.getPort();
-		}
-		catch (Exception e) {}
-	}
-
-	private String deliveryHost = "";
-	private String deliveryPath = "";
-	private int deliveryPort = 0;
-
-	public String getDeliveryHost() {
-		return deliveryHost;
-	}
-
-	public String getDeliveryPath() {
-		return deliveryPath;
-	}
-
-	public int getDeliveryPort() {
-		return deliveryPort;
-	}
-
-	
-	////////////////////////////////////////////////
-	//	Timeout
-	////////////////////////////////////////////////
-
-	private long timeOut = 0;
-	
-	public long getTimeOut() {
-		return timeOut;
-	}
-
-	public void setTimeOut(long value) {
-		timeOut = value;
-	}
-
-	public boolean isExpired()
-	{
-		long currTime = System.currentTimeMillis();
-		
-		// Thanks for Oliver Newell (10/26/04)
-		if(timeOut == Subscription.INFINITE_VALUE ) 
-			return false; 
-			
-		// Thanks for Oliver Newell (10/26/04)
-		long expiredTime = getSubscriptionTime() + getTimeOut()*1000;
-		if (expiredTime < currTime)
-			return true;
-			
-		return false;
-	}
-	
-	////////////////////////////////////////////////
-	//	SubscriptionTIme
-	////////////////////////////////////////////////
-
-	private long subscriptionTime = 0;
-	
-	public long getSubscriptionTime() {
-		return subscriptionTime;
-	}
-
-	public void setSubscriptionTime(long time) {
-		subscriptionTime = time;
-	}
-
-	////////////////////////////////////////////////
-	//	SEQ
-	////////////////////////////////////////////////
-
-	private long notifyCount = 0;
-
-	public long getNotifyCount() {
-		return notifyCount;
-	}
-
-	public void setNotifyCount(int cnt) {
-		notifyCount = cnt;
-	}
-
-	public void incrementNotifyCount() {
-		if (notifyCount == Long.MAX_VALUE) {
-			notifyCount = 1;
-			return;
-		}
-		notifyCount++;
-	}
-	
-	////////////////////////////////////////////////
-	//	renew
-	////////////////////////////////////////////////
-	
-	public void renew()
-	{
-		setSubscriptionTime(System.currentTimeMillis());
-		setNotifyCount(0);
-	}
-
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: Subscriber.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	07/31/04
+*		- Added isExpired().
+*	10/26/04
+*		- Oliver Newell <newell@media-rush.com>
+*		- Added support the intinite time and fixed a bug in isExpired().
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import java.net.*;
+
+public class Subscriber
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public Subscriber()
+	{
+		renew();
+	}
+
+	////////////////////////////////////////////////
+	//	SID
+	////////////////////////////////////////////////
+
+	private String SID = null;
+
+	public String getSID() {
+		return SID;
+	}
+
+	public void setSID(String sid) {
+		SID = sid;
+	}
+
+	////////////////////////////////////////////////
+	//	deliveryURL
+	////////////////////////////////////////////////
+
+	private String ifAddr = "";
+	
+	public void setInterfaceAddress(String addr)
+	{
+		ifAddr = addr;
+	}
+	
+	public String getInterfaceAddress()
+	{
+		return ifAddr;
+	}
+	
+	////////////////////////////////////////////////
+	//	deliveryURL
+	////////////////////////////////////////////////
+
+	private String deliveryURL = "";
+
+	public String getDeliveryURL() {
+		return deliveryURL;
+	}
+
+	public void setDeliveryURL(String deliveryURL) {
+		this.deliveryURL = deliveryURL;
+		try {
+			URL url = new URL(deliveryURL);
+			deliveryHost = url.getHost();
+			deliveryPath = url.getPath();
+			deliveryPort = url.getPort();
+		}
+		catch (Exception e) {}
+	}
+
+	private String deliveryHost = "";
+	private String deliveryPath = "";
+	private int deliveryPort = 0;
+
+	public String getDeliveryHost() {
+		return deliveryHost;
+	}
+
+	public String getDeliveryPath() {
+		return deliveryPath;
+	}
+
+	public int getDeliveryPort() {
+		return deliveryPort;
+	}
+
+	
+	////////////////////////////////////////////////
+	//	Timeout
+	////////////////////////////////////////////////
+
+	private long timeOut = 0;
+	
+	public long getTimeOut() {
+		return timeOut;
+	}
+
+	public void setTimeOut(long value) {
+		timeOut = value;
+	}
+
+	public boolean isExpired()
+	{
+		long currTime = System.currentTimeMillis();
+		
+		// Thanks for Oliver Newell (10/26/04)
+		if(timeOut == Subscription.INFINITE_VALUE ) 
+			return false; 
+			
+		// Thanks for Oliver Newell (10/26/04)
+		long expiredTime = getSubscriptionTime() + getTimeOut()*1000;
+		if (expiredTime < currTime)
+			return true;
+			
+		return false;
+	}
+	
+	////////////////////////////////////////////////
+	//	SubscriptionTIme
+	////////////////////////////////////////////////
+
+	private long subscriptionTime = 0;
+	
+	public long getSubscriptionTime() {
+		return subscriptionTime;
+	}
+
+	public void setSubscriptionTime(long time) {
+		subscriptionTime = time;
+	}
+
+	////////////////////////////////////////////////
+	//	SEQ
+	////////////////////////////////////////////////
+
+	private long notifyCount = 0;
+
+	public long getNotifyCount() {
+		return notifyCount;
+	}
+
+	public void setNotifyCount(int cnt) {
+		notifyCount = cnt;
+	}
+
+	public void incrementNotifyCount() {
+		if (notifyCount == Long.MAX_VALUE) {
+			notifyCount = 1;
+			return;
+		}
+		notifyCount++;
+	}
+	
+	////////////////////////////////////////////////
+	//	renew
+	////////////////////////////////////////////////
+	
+	public void renew()
+	{
+		setSubscriptionTime(System.currentTimeMillis());
+		setNotifyCount(0);
+	}
+
+}
diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriberList.java b/router/java/src/org/cybergarage/upnp/event/SubscriberList.java
index 3bb32b39128ed84e3c954c8a2d102025dd9de6cb..193e2e27b988bf4d0d1e23d12b0d3816ea97b0f5 100644
--- a/router/java/src/org/cybergarage/upnp/event/SubscriberList.java
+++ b/router/java/src/org/cybergarage/upnp/event/SubscriberList.java
@@ -1,46 +1,46 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SubscriberList.java
-*
-*	Revision;
-*
-*	01/31/03
-*		- first revision.
-*	06/18/03
-*		- Fixed to catch ArrayIndexOutOfBounds.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import java.util.*;
-
-public class SubscriberList extends Vector<Subscriber> 
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SubscriberList() 
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Methods
-	////////////////////////////////////////////////
-	
-	public Subscriber getSubscriber(int n)
-	{
-		Object obj = null;
-		try {
-			obj = get(n);
-		}
-		catch (Exception e) {}
-		return (Subscriber)obj;
-	}
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SubscriberList.java
+*
+*	Revision;
+*
+*	01/31/03
+*		- first revision.
+*	06/18/03
+*		- Fixed to catch ArrayIndexOutOfBounds.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import java.util.*;
+
+public class SubscriberList extends Vector<Subscriber>
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SubscriberList() 
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Methods
+	////////////////////////////////////////////////
+	
+	public Subscriber getSubscriber(int n)
+	{
+		Object obj = null;
+		try {
+			obj = get(n);
+		}
+		catch (Exception e) {}
+		return (Subscriber)obj;
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/event/Subscription.java b/router/java/src/org/cybergarage/upnp/event/Subscription.java
index 0685e4fa8b7fae8766d97c729a7b6007696c3c32..488ac75abfabc481b5d494b4a934119de12aa124 100644
--- a/router/java/src/org/cybergarage/upnp/event/Subscription.java
+++ b/router/java/src/org/cybergarage/upnp/event/Subscription.java
@@ -1,77 +1,77 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: ST.java
-*
-*	Revision;
-*
-*	01/31/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import org.cybergarage.upnp.*;
-
-public class Subscription 
-{
-	public final static String XMLNS = "urn:schemas-upnp-org:event-1-0";
-	public final static String TIMEOUT_HEADER = "Second-";
-	public final static String INFINITE_STRING = "infinite";	
-	public final static int INFINITE_VALUE = -1;	
-	public final static String UUID = "uuid:";
-	public final static String SUBSCRIBE_METHOD = "SUBSCRIBE";
-	public final static String UNSUBSCRIBE_METHOD = "UNSUBSCRIBE";
-
-	////////////////////////////////////////////////
-	//	Timeout
-	////////////////////////////////////////////////
-	
-	public final static String toTimeoutHeaderString(long time)
-	{
-		if (time == Subscription.INFINITE_VALUE)
-			return Subscription.INFINITE_STRING;
-		return Subscription.TIMEOUT_HEADER + Long.toString(time);
-	}
-	
-	public final static long getTimeout(String headerValue)
-	{
-		int minusIdx = headerValue.indexOf('-');
-		long timeout = Subscription.INFINITE_VALUE;
-		try {
-			String timeoutStr = headerValue.substring(minusIdx+1, headerValue.length());
-			timeout = Long.parseLong(timeoutStr);
-		}
-		catch (Exception e) {}
-		return timeout;
-	}
-
-	////////////////////////////////////////////////
-	//	SID
-	////////////////////////////////////////////////
-
-	public static final String createSID()
-	{
-		return UPnP.createUUID();
-	}
-
-	public final static String toSIDHeaderString(String id)
-	{
-		return Subscription.UUID + id;
-	}
-
-	public final static String getSID(String headerValue)
-	{
-		if (headerValue == null)
-			return "";
-		if (headerValue.startsWith(Subscription.UUID) == false)
-			return headerValue;
-		return headerValue.substring(Subscription.UUID.length(), headerValue.length());
-	}
-	
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: ST.java
+*
+*	Revision;
+*
+*	01/31/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import org.cybergarage.upnp.*;
+
+public class Subscription 
+{
+	public final static String XMLNS = "urn:schemas-upnp-org:event-1-0";
+	public final static String TIMEOUT_HEADER = "Second-";
+	public final static String INFINITE_STRING = "infinite";	
+	public final static int INFINITE_VALUE = -1;	
+	public final static String UUID = "uuid:";
+	public final static String SUBSCRIBE_METHOD = "SUBSCRIBE";
+	public final static String UNSUBSCRIBE_METHOD = "UNSUBSCRIBE";
+
+	////////////////////////////////////////////////
+	//	Timeout
+	////////////////////////////////////////////////
+	
+	public final static String toTimeoutHeaderString(long time)
+	{
+		if (time == Subscription.INFINITE_VALUE)
+			return Subscription.INFINITE_STRING;
+		return Subscription.TIMEOUT_HEADER + Long.toString(time);
+	}
+	
+	public final static long getTimeout(String headerValue)
+	{
+		int minusIdx = headerValue.indexOf('-');
+		long timeout = Subscription.INFINITE_VALUE;
+		try {
+			String timeoutStr = headerValue.substring(minusIdx+1, headerValue.length());
+			timeout = Long.parseLong(timeoutStr);
+		}
+		catch (Exception e) {}
+		return timeout;
+	}
+
+	////////////////////////////////////////////////
+	//	SID
+	////////////////////////////////////////////////
+
+	public static final String createSID()
+	{
+		return UPnP.createUUID();
+	}
+
+	public final static String toSIDHeaderString(String id)
+	{
+		return Subscription.UUID + id;
+	}
+
+	public final static String getSID(String headerValue)
+	{
+		if (headerValue == null)
+			return "";
+		if (headerValue.startsWith(Subscription.UUID) == false)
+			return headerValue;
+		return headerValue.substring(Subscription.UUID.length(), headerValue.length());
+	}
+	
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java b/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java
index 4ba930c12c63efb46b9f01173f7bb1b32392513d..9f35d67599d6be937c016665d7bb91c3c918ce01 100644
--- a/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java
+++ b/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java
@@ -1,221 +1,221 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SubscriptionRequest.java
-*
-*	Revision;
-*
-*	01/31/03
-*		- first revision.
-*	05/21/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Description: inserted a check at the beginning of the setService method
-*		- Problem : If the EventSubURL does not start with a '/', the device could refuse event subscription
-*		- Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices
-*	09/02/03
-*		- Giordano Sassaroli <sassarol@cefriel.it>
-*		- Problem : NullpointerException thrown for devices whose description use absolute urls
-*		- Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. If the baseUrl is not present, the request host and port should be extracted from the control/subscription url
-*		- Description: The method setRequestHost/setService should be changed as follows
-*	06/11/04
-*		- Markus Thurner <markus.thurner@fh-hagenberg.at> (06/11/2004)
-*		- Changed setServie() to get the host address from the SSDP Location field when the URLBase is null.
-*	12/06/04
-*		- Grzegorz Lehmann <grzegorz.lehmann@dai-labor.de>
-*		- Stefano Lenzi <kismet-sl@users.sourceforge.net>
-*		- Fixed getSID() to loop between getSID() and hasSID();
-*
-********************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import org.cybergarage.http.*;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.upnp.device.*;
-
-public class SubscriptionRequest extends HTTPRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public SubscriptionRequest(){
-		setContentLength(0);
-	}
-
-	public SubscriptionRequest(HTTPRequest httpReq){
-		this();
-		set(httpReq);
-	}
-	
-	////////////////////////////////////////////////
-	//	setRequest
-	////////////////////////////////////////////////
-	
-	private void setService(Service service)
-	{
-		String eventSubURL = service.getEventSubURL();
-		
-		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/21/03)
-		setURI(eventSubURL, true);
-
-		String urlBaseStr = "";
-		Device dev = service.getDevice();
-		if (dev != null)
-			urlBaseStr = dev.getURLBase();
-		
-		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
-			Device rootDev = service.getRootDevice();
-			if (rootDev != null)
-				urlBaseStr = rootDev.getURLBase();
-		}
-		
-		// Thansk for Markus Thurner <markus.thurner@fh-hagenberg.at> (06/11/2004)
-		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
-			Device rootDev = service.getRootDevice();
-			if (rootDev != null)
-				urlBaseStr = rootDev.getLocation();
-		}
-		
-		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/02/03)
-		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
-			if (HTTP.isAbsoluteURL(eventSubURL))
-				urlBaseStr = eventSubURL;
-		}
-		
-		String reqHost = HTTP.getHost(urlBaseStr);
-		int reqPort = HTTP.getPort(urlBaseStr);
-		
-		setHost(reqHost, reqPort);
-		setRequestHost(reqHost);
-		setRequestPort(reqPort);
-	}
-	
-	public void setSubscribeRequest(Service service, String callback, long timeout)
-	{
-		setMethod(Subscription.SUBSCRIBE_METHOD);
-		setService(service);
-		setCallback(callback);
-		setNT(NT.EVENT);
-		setTimeout(timeout);
-	}
-
-	public void setRenewRequest(Service service, String uuid, long timeout)
-	{
-		setMethod(Subscription.SUBSCRIBE_METHOD);
-		setService(service);
-		setSID(uuid);
-		setTimeout(timeout);
-	}
-
-	public void setUnsubscribeRequest(Service service)
-	{
-		setMethod(Subscription.UNSUBSCRIBE_METHOD);
-		setService(service);
-		setSID(service.getSID());
-	}
-
-	////////////////////////////////////////////////
-	//	NT
-	////////////////////////////////////////////////
-
-	public void setNT(String value)
-	{
-		setHeader(HTTP.NT, value);
-	}
-
-	public String getNT()
-	{
-		return getHeaderValue(HTTP.NT);
-	}
-	
-	public boolean hasNT()
-	{
-		String nt = getNT();
-		return (nt != null && 0 < nt.length()) ? true : false;
-	}
-	
-	////////////////////////////////////////////////
-	//	CALLBACK
-	////////////////////////////////////////////////
-
-	private final static String CALLBACK_START_WITH  = "<";
-	private final static String CALLBACK_END_WITH  = ">";
-	
-	public void setCallback(String value)
-	{
-		setStringHeader(HTTP.CALLBACK, value, CALLBACK_START_WITH, CALLBACK_END_WITH);
-	}
-	
-	public String getCallback()
-	{
-		return getStringHeaderValue(HTTP.CALLBACK, CALLBACK_START_WITH, CALLBACK_END_WITH);
-	}
-	
-	public boolean hasCallback()
-	{
-		String callback = getCallback();
-		return (callback != null && 0 < callback.length()) ? true : false;
-	}
-
-	////////////////////////////////////////////////
-	//	SID
-	////////////////////////////////////////////////
-
-	public void setSID(String id)
-	{
-		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
-	}
-
-	public String getSID()
-	{
-		// Thanks for Grzegorz Lehmann and Stefano Lenzi(12/06/04)
-		String sid = Subscription.getSID(getHeaderValue(HTTP.SID));
-		if (sid == null)
-			return "";
-		return sid;
-	}
-	
-	public boolean hasSID()
-	{
-		String sid = getSID();
-		return (sid != null && 0 < sid.length()) ? true : false;
-	}
-
-	////////////////////////////////////////////////
-	//	Timeout
-	////////////////////////////////////////////////
-
-	public final void setTimeout(long value)
-	{
-		setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value));
-	}
-
-	public long getTimeout()
-	{
-		return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT));
-	}
-
-	////////////////////////////////////////////////
-	//	post (Response)
-	////////////////////////////////////////////////
-
-	public void post(SubscriptionResponse subRes)
-	{
-		super.post(subRes);
-	}
-
-	////////////////////////////////////////////////
-	//	post
-	////////////////////////////////////////////////
-
-	public SubscriptionResponse post()
-	{
-		HTTPResponse httpRes = post(getRequestHost(), getRequestPort());
-		return new SubscriptionResponse(httpRes);
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SubscriptionRequest.java
+*
+*	Revision;
+*
+*	01/31/03
+*		- first revision.
+*	05/21/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Description: inserted a check at the beginning of the setService method
+*		- Problem : If the EventSubURL does not start with a '/', the device could refuse event subscription
+*		- Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices
+*	09/02/03
+*		- Giordano Sassaroli <sassarol@cefriel.it>
+*		- Problem : NullpointerException thrown for devices whose description use absolute urls
+*		- Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. If the baseUrl is not present, the request host and port should be extracted from the control/subscription url
+*		- Description: The method setRequestHost/setService should be changed as follows
+*	06/11/04
+*		- Markus Thurner <markus.thurner@fh-hagenberg.at> (06/11/2004)
+*		- Changed setServie() to get the host address from the SSDP Location field when the URLBase is null.
+*	12/06/04
+*		- Grzegorz Lehmann <grzegorz.lehmann@dai-labor.de>
+*		- Stefano Lenzi <kismet-sl@users.sourceforge.net>
+*		- Fixed getSID() to loop between getSID() and hasSID();
+*
+********************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import org.cybergarage.http.*;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.upnp.device.*;
+
+public class SubscriptionRequest extends HTTPRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public SubscriptionRequest(){
+		setContentLength(0);
+	}
+
+	public SubscriptionRequest(HTTPRequest httpReq){
+		this();
+		set(httpReq);
+	}
+	
+	////////////////////////////////////////////////
+	//	setRequest
+	////////////////////////////////////////////////
+	
+	private void setService(Service service)
+	{
+		String eventSubURL = service.getEventSubURL();
+		
+		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (05/21/03)
+		setURI(eventSubURL, true);
+
+		String urlBaseStr = "";
+		Device dev = service.getDevice();
+		if (dev != null)
+			urlBaseStr = dev.getURLBase();
+		
+		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
+			Device rootDev = service.getRootDevice();
+			if (rootDev != null)
+				urlBaseStr = rootDev.getURLBase();
+		}
+		
+		// Thansk for Markus Thurner <markus.thurner@fh-hagenberg.at> (06/11/2004)
+		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
+			Device rootDev = service.getRootDevice();
+			if (rootDev != null)
+				urlBaseStr = rootDev.getLocation();
+		}
+		
+		// Thanks for Giordano Sassaroli <sassarol@cefriel.it> (09/02/03)
+		if (urlBaseStr == null || urlBaseStr.length() <= 0) {
+			if (HTTP.isAbsoluteURL(eventSubURL))
+				urlBaseStr = eventSubURL;
+		}
+		
+		String reqHost = HTTP.getHost(urlBaseStr);
+		int reqPort = HTTP.getPort(urlBaseStr);
+		
+		setHost(reqHost, reqPort);
+		setRequestHost(reqHost);
+		setRequestPort(reqPort);
+	}
+	
+	public void setSubscribeRequest(Service service, String callback, long timeout)
+	{
+		setMethod(Subscription.SUBSCRIBE_METHOD);
+		setService(service);
+		setCallback(callback);
+		setNT(NT.EVENT);
+		setTimeout(timeout);
+	}
+
+	public void setRenewRequest(Service service, String uuid, long timeout)
+	{
+		setMethod(Subscription.SUBSCRIBE_METHOD);
+		setService(service);
+		setSID(uuid);
+		setTimeout(timeout);
+	}
+
+	public void setUnsubscribeRequest(Service service)
+	{
+		setMethod(Subscription.UNSUBSCRIBE_METHOD);
+		setService(service);
+		setSID(service.getSID());
+	}
+
+	////////////////////////////////////////////////
+	//	NT
+	////////////////////////////////////////////////
+
+	public void setNT(String value)
+	{
+		setHeader(HTTP.NT, value);
+	}
+
+	public String getNT()
+	{
+		return getHeaderValue(HTTP.NT);
+	}
+	
+	public boolean hasNT()
+	{
+		String nt = getNT();
+		return (nt != null && 0 < nt.length()) ? true : false;
+	}
+	
+	////////////////////////////////////////////////
+	//	CALLBACK
+	////////////////////////////////////////////////
+
+	private final static String CALLBACK_START_WITH  = "<";
+	private final static String CALLBACK_END_WITH  = ">";
+	
+	public void setCallback(String value)
+	{
+		setStringHeader(HTTP.CALLBACK, value, CALLBACK_START_WITH, CALLBACK_END_WITH);
+	}
+	
+	public String getCallback()
+	{
+		return getStringHeaderValue(HTTP.CALLBACK, CALLBACK_START_WITH, CALLBACK_END_WITH);
+	}
+	
+	public boolean hasCallback()
+	{
+		String callback = getCallback();
+		return (callback != null && 0 < callback.length()) ? true : false;
+	}
+
+	////////////////////////////////////////////////
+	//	SID
+	////////////////////////////////////////////////
+
+	public void setSID(String id)
+	{
+		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
+	}
+
+	public String getSID()
+	{
+		// Thanks for Grzegorz Lehmann and Stefano Lenzi(12/06/04)
+		String sid = Subscription.getSID(getHeaderValue(HTTP.SID));
+		if (sid == null)
+			return "";
+		return sid;
+	}
+	
+	public boolean hasSID()
+	{
+		String sid = getSID();
+		return (sid != null && 0 < sid.length()) ? true : false;
+	}
+
+	////////////////////////////////////////////////
+	//	Timeout
+	////////////////////////////////////////////////
+
+	public final void setTimeout(long value)
+	{
+		setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value));
+	}
+
+	public long getTimeout()
+	{
+		return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT));
+	}
+
+	////////////////////////////////////////////////
+	//	post (Response)
+	////////////////////////////////////////////////
+
+	public void post(SubscriptionResponse subRes)
+	{
+		super.post(subRes);
+	}
+
+	////////////////////////////////////////////////
+	//	post
+	////////////////////////////////////////////////
+
+	public SubscriptionResponse post()
+	{
+		HTTPResponse httpRes = post(getRequestHost(), getRequestPort());
+		return new SubscriptionResponse(httpRes);
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java b/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java
index cf60ecd56286b9e1d3e7fa2d3182b00a909e8037..ef736f77a5c610454754cb15a6fc5a6be444be9f 100644
--- a/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java
+++ b/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java
@@ -1,84 +1,84 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SubscriptionResponse.java
-*
-*	Revision;
-*
-*	01/29/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.event;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.http.*;
-
-public class SubscriptionResponse extends HTTPResponse
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SubscriptionResponse()
-	{
-		setServer(UPnP.getServerName());
-	}
-
-	public SubscriptionResponse(HTTPResponse httpRes)
-	{
-		super(httpRes);
-	}
-
-	////////////////////////////////////////////////
-	//	Error
-	////////////////////////////////////////////////
-
-	public void setResponse(int code)
-	{
-		setStatusCode(code);
-		setContentLength(0);
-	}
-	
-	////////////////////////////////////////////////
-	//	Error
-	////////////////////////////////////////////////
-
-	public void setErrorResponse(int code)
-	{
-		setStatusCode(code);
-		setContentLength(0);
-	}
-		
-	////////////////////////////////////////////////
-	//	SID
-	////////////////////////////////////////////////
-
-	public void setSID(String id)
-	{
-		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
-	}
-
-	public String getSID()
-	{
-		return Subscription.getSID(getHeaderValue(HTTP.SID));
-	}
-
-	////////////////////////////////////////////////
-	//	Timeout
-	////////////////////////////////////////////////
-
-	public void setTimeout(long value)
-	{
-		setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value));
-	}
-
-	public long getTimeout()
-	{
-		return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT));
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SubscriptionResponse.java
+*
+*	Revision;
+*
+*	01/29/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.event;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.http.*;
+
+public class SubscriptionResponse extends HTTPResponse
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SubscriptionResponse()
+	{
+		setServer(UPnP.getServerName());
+	}
+
+	public SubscriptionResponse(HTTPResponse httpRes)
+	{
+		super(httpRes);
+	}
+
+	////////////////////////////////////////////////
+	//	Error
+	////////////////////////////////////////////////
+
+	public void setResponse(int code)
+	{
+		setStatusCode(code);
+		setContentLength(0);
+	}
+	
+	////////////////////////////////////////////////
+	//	Error
+	////////////////////////////////////////////////
+
+	public void setErrorResponse(int code)
+	{
+		setStatusCode(code);
+		setContentLength(0);
+	}
+		
+	////////////////////////////////////////////////
+	//	SID
+	////////////////////////////////////////////////
+
+	public void setSID(String id)
+	{
+		setHeader(HTTP.SID, Subscription.toSIDHeaderString(id));
+	}
+
+	public String getSID()
+	{
+		return Subscription.getSID(getHeaderValue(HTTP.SID));
+	}
+
+	////////////////////////////////////////////////
+	//	Timeout
+	////////////////////////////////////////////////
+
+	public void setTimeout(long value)
+	{
+		setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value));
+	}
+
+	public long getTimeout()
+	{
+		return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT));
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java
index 93e802097382db0be3b25298745f4a732fbea92c..657a1e4c943776037fa87eebcb1c5fe2414092a4 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java
@@ -22,7 +22,7 @@
 *	08/23/07
 *		- Thanks for Kazuyuki Shudo
 *		- Changed receive() to throw IOException.
-*	01/10/08
+*	01/10/08
 *		- Changed getLocalAddress() to return a brank string when the ssdpMultiGroup or ssdpMultiIf is null on Android m3-rc37a.
 *	
 ******************************************************************/
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java
index bded92b8969eef76ea7d06cd141b0db5718b546c..c21f452e3d457024a933b7b8cf04c73ca7f5c8e0 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002-2003
 *
 *	File: HTTPMU.java
-*
-*	Revision;
-*
-*	11/20/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/20/02
+*		- first revision.
 *	12/12/03
 *		- Inma Mar?n <inma@DIF.UM.ES>
 *		- Changed open(addr, port) to send IPv6 SSDP packets.
@@ -20,49 +20,49 @@
 *		- Added to set a current timestamp when the packet are received.
 *	
 ******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
+
+package org.cybergarage.upnp.ssdp;
+
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
 import org.cybergarage.util.Debug;
-
-public class HTTPUSocket
-{
-	////////////////////////////////////////////////
-	//	Member
-	////////////////////////////////////////////////
-
-	private DatagramSocket ssdpUniSock = null;
+
+public class HTTPUSocket
+{
+	////////////////////////////////////////////////
+	//	Member
+	////////////////////////////////////////////////
+
+	private DatagramSocket ssdpUniSock = null;
 	//private MulticastSocket ssdpUniSock = null;
-
-	public DatagramSocket getDatagramSocket()
-	{
-		return ssdpUniSock;
-	}
-		
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public HTTPUSocket()
+
+	public DatagramSocket getDatagramSocket()
+	{
+		return ssdpUniSock;
+	}
+		
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public HTTPUSocket()
 	{
 		open();
-	}
-	
-	public HTTPUSocket(String bindAddr, int bindPort)
+	}
+	
+	public HTTPUSocket(String bindAddr, int bindPort)
 	{
 		open(bindAddr, bindPort);
-	}
+	}
 
 	public HTTPUSocket(int bindPort)
 	{
 		open(bindPort);
 	}
-
+
 	protected void finalize()
 	{
 		close();
@@ -166,67 +166,67 @@ public class HTTPUSocket
 		return true;
 	}
 		
-	////////////////////////////////////////////////
-	//	close
-	////////////////////////////////////////////////
-
-	public boolean close()
-	{
-		if (ssdpUniSock == null)
-			return true;
-			
-		try {
+	////////////////////////////////////////////////
+	//	close
+	////////////////////////////////////////////////
+
+	public boolean close()
+	{
+		if (ssdpUniSock == null)
+			return true;
+			
+		try {
 			ssdpUniSock.close();
-			ssdpUniSock = null;
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-			return false;
-		}
-		
-		return true;
-	}
+			ssdpUniSock = null;
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+			return false;
+		}
+		
+		return true;
+	}
+
+	////////////////////////////////////////////////
+	//	send
+	////////////////////////////////////////////////
 
-	////////////////////////////////////////////////
-	//	send
-	////////////////////////////////////////////////
-
-	public boolean post(String addr, int port, String msg)
-	{
-		 try {
-			InetAddress inetAddr = InetAddress.getByName(addr);
-			DatagramPacket dgmPacket = new DatagramPacket(msg.getBytes(), msg.length(), inetAddr, port);
+	public boolean post(String addr, int port, String msg)
+	{
+		 try {
+			InetAddress inetAddr = InetAddress.getByName(addr);
+			DatagramPacket dgmPacket = new DatagramPacket(msg.getBytes(), msg.length(), inetAddr, port);
 			ssdpUniSock.send(dgmPacket);
-		}
+		}
 		catch (Exception e) {
-			Debug.warning("addr = " +ssdpUniSock.getLocalAddress().getHostName());
+			Debug.warning("addr = " +ssdpUniSock.getLocalAddress().getHostName());
 			Debug.warning("port = " + ssdpUniSock.getLocalPort());
-			Debug.warning(e);
-			return false;
-		}
-		return true;
-	}
-
-	////////////////////////////////////////////////
-	//	reveive
-	////////////////////////////////////////////////
-
-	public SSDPPacket receive()
-	{
-		byte ssdvRecvBuf[] = new byte[SSDP.RECV_MESSAGE_BUFSIZE];
- 		SSDPPacket recvPacket = new SSDPPacket(ssdvRecvBuf, ssdvRecvBuf.length);
+			Debug.warning(e);
+			return false;
+		}
+		return true;
+	}
+
+	////////////////////////////////////////////////
+	//	reveive
+	////////////////////////////////////////////////
+
+	public SSDPPacket receive()
+	{
+		byte ssdvRecvBuf[] = new byte[SSDP.RECV_MESSAGE_BUFSIZE];
+ 		SSDPPacket recvPacket = new SSDPPacket(ssdvRecvBuf, ssdvRecvBuf.length);
 		recvPacket.setLocalAddress(getLocalAddress());
-		try {
-	 		ssdpUniSock.receive(recvPacket.getDatagramPacket());
+		try {
+	 		ssdpUniSock.receive(recvPacket.getDatagramPacket());
 			recvPacket.setTimeStamp(System.currentTimeMillis());
 			Debug.message("Received SSDP unicast packet on " + getLocalAddress() + " from " + recvPacket.getRemoteAddress());
-		}
-		catch (Exception e) {
+		}
+		catch (Exception e) {
 			//Debug.warning(e);
-			return null;
-		}
- 		return recvPacket;
-	}
+			return null;
+		}
+ 		return recvPacket;
+	}
 
 	////////////////////////////////////////////////
 	//	join/leave
@@ -261,5 +261,5 @@ public class HTTPUSocket
 		 return true;
 	 }
 */
-}
-
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java
index 1df63ff6c6704c3593f1a03758cfd4c4dc22ddd4..e92f9133fd3afe9f5b40a399d22d0ddd23f655b5 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java
@@ -1,31 +1,31 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SSDPMSearchRequest.java
-*
-*	Revision;
-*
-*	01/14/03
-*		- first revision.
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
-import org.cybergarage.http.HTTP;
-
-public class SSDPNotifyRequest extends SSDPRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SSDPNotifyRequest()
-	{
-		setMethod(HTTP.NOTIFY);
-		setURI("*");
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SSDPMSearchRequest.java
+*
+*	Revision;
+*
+*	01/14/03
+*		- first revision.
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.ssdp;
+
+import org.cybergarage.http.HTTP;
+
+public class SSDPNotifyRequest extends SSDPRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SSDPNotifyRequest()
+	{
+		setMethod(HTTP.NOTIFY);
+		setURI("*");
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPPacket.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPPacket.java
index d2e0f2770566a632f222363193163785cb75f1ab..e198818f23448591241ed5635d397dae11ce747f 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPPacket.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPPacket.java
@@ -5,11 +5,11 @@
 *	Copyright (C) Satoshi Konno 2002-2003
 *
 *	File: SSDPPacket.java
-*
-*	Revision;
-*
-*	11/18/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/18/02
+*		- first revision.
 *	05/13/03
 *		- Added getLocalAddress().
 *	11/01/04
@@ -20,25 +20,25 @@
 *		- Changed getRemoteAddress() to return the adresss instead of the host name.
 *
 ******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
-import java.net.*;
-
+
+package org.cybergarage.upnp.ssdp;
+
+import java.net.*;
+
 import org.cybergarage.http.*;
 
-import org.cybergarage.upnp.device.*;
-
-public class SSDPPacket 
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SSDPPacket(byte[] buf, int length)
-	{
-		dgmPacket = new DatagramPacket(buf, length);
-	}
+import org.cybergarage.upnp.device.*;
+
+public class SSDPPacket 
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SSDPPacket(byte[] buf, int length)
+	{
+		dgmPacket = new DatagramPacket(buf, length);
+	}
 
 	////////////////////////////////////////////////
 	//	DatagramPacket
@@ -68,115 +68,115 @@ public class SSDPPacket
 	}
 
 	
-	////////////////////////////////////////////////
-	//	Time
-	////////////////////////////////////////////////
-
-	private long timeStamp;
-	
-	public void setTimeStamp(long value)
-	{
-		timeStamp = value;
-	}
-		
-	public long getTimeStamp()
-	{
-		return timeStamp;
-	}
-
-	////////////////////////////////////////////////
-	//	Remote host
-	////////////////////////////////////////////////
+	////////////////////////////////////////////////
+	//	Time
+	////////////////////////////////////////////////
+
+	private long timeStamp;
+	
+	public void setTimeStamp(long value)
+	{
+		timeStamp = value;
+	}
+		
+	public long getTimeStamp()
+	{
+		return timeStamp;
+	}
+
+	////////////////////////////////////////////////
+	//	Remote host
+	////////////////////////////////////////////////
 
 	public InetAddress getRemoteInetAddress()
 	{
 		return getDatagramPacket().getAddress();
 	}
 	
-	public String getRemoteAddress()
-	{
+	public String getRemoteAddress()
+	{
 		// Thanks for Theo Beisch (11/09/04)
-		return getDatagramPacket().getAddress().getHostAddress();
-	}
-
-	public int getRemotePort()
-	{
-		return getDatagramPacket().getPort();
-	}
-	
-	////////////////////////////////////////////////
-	//	Access Methods
-	////////////////////////////////////////////////
-
-	public byte[] packetBytes = null;
-	
-	public byte[] getData()
-	{
-		if (packetBytes != null)
-			return packetBytes;
-		
-		DatagramPacket packet = getDatagramPacket();
-		int packetLen = packet.getLength();
-		String packetData = new String(packet.getData(), 0, packetLen);
-		packetBytes = packetData.getBytes();
-		
-		return packetBytes;
-	}
-
-	////////////////////////////////////////////////
-	//	Access Methods
-	////////////////////////////////////////////////
-
-	public String getHost()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.HOST);
-	}
-
-	public String getCacheControl()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.CACHE_CONTROL);
-	}
-	
-	public String getLocation()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.LOCATION);
-	}
-
-	public String getMAN()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.MAN);
-	}
+		return getDatagramPacket().getAddress().getHostAddress();
+	}
+
+	public int getRemotePort()
+	{
+		return getDatagramPacket().getPort();
+	}
+	
+	////////////////////////////////////////////////
+	//	Access Methods
+	////////////////////////////////////////////////
+
+	public byte[] packetBytes = null;
+	
+	public byte[] getData()
+	{
+		if (packetBytes != null)
+			return packetBytes;
+		
+		DatagramPacket packet = getDatagramPacket();
+		int packetLen = packet.getLength();
+		String packetData = new String(packet.getData(), 0, packetLen);
+		packetBytes = packetData.getBytes();
+		
+		return packetBytes;
+	}
+
+	////////////////////////////////////////////////
+	//	Access Methods
+	////////////////////////////////////////////////
+
+	public String getHost()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.HOST);
+	}
+
+	public String getCacheControl()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.CACHE_CONTROL);
+	}
+	
+	public String getLocation()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.LOCATION);
+	}
+
+	public String getMAN()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.MAN);
+	}
 
 	public String getST()
 	{
 		return HTTPHeader.getValue(getData(), HTTP.ST);
 	}
-
-	public String getNT()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.NT);
-	}
-
-	public String getNTS()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.NTS);
-	}
-
-	public String getServer()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.SERVER);
-	}
-
-	public String getUSN()
-	{
-		return HTTPHeader.getValue(getData(), HTTP.USN);
-	}
-
-	public int getMX()
-	{
-		return HTTPHeader.getIntegerValue(getData(), HTTP.MX);
-	}
-
+
+	public String getNT()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.NT);
+	}
+
+	public String getNTS()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.NTS);
+	}
+
+	public String getServer()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.SERVER);
+	}
+
+	public String getUSN()
+	{
+		return HTTPHeader.getValue(getData(), HTTP.USN);
+	}
+
+	public int getMX()
+	{
+		return HTTPHeader.getIntegerValue(getData(), HTTP.MX);
+	}
+
 	////////////////////////////////////////////////
 	//	Access Methods
 	////////////////////////////////////////////////
@@ -197,39 +197,39 @@ public class SSDPPacket
 		return isockaddr.getAddress();
 	}
 	
-	////////////////////////////////////////////////
-	//	Access Methods (Extension)
-	////////////////////////////////////////////////
-	
-	public boolean isRootDevice()
-	{
-		if (NT.isRootDevice(getNT()) == true)
+	////////////////////////////////////////////////
+	//	Access Methods (Extension)
+	////////////////////////////////////////////////
+	
+	public boolean isRootDevice()
+	{
+		if (NT.isRootDevice(getNT()) == true)
 			return true;
-		// Thanks for Theo Beisch (11/01/04)
+		// Thanks for Theo Beisch (11/01/04)
 		if (ST.isRootDevice(getST()) == true)
 			return true;
-		return USN.isRootDevice(getUSN());
-	}
-
-	public boolean isDiscover()
-	{
-		return MAN.isDiscover(getMAN());
-	}
-	
-	public boolean isAlive()
-	{
-		return NTS.isAlive(getNTS());
-	}
-
-	public boolean isByeBye()
-	{
-		return NTS.isByeBye(getNTS());
-	}
-
-	public int getLeaseTime()
-	{
-		return SSDP.getLeaseTime(getCacheControl());
-	}
+		return USN.isRootDevice(getUSN());
+	}
+
+	public boolean isDiscover()
+	{
+		return MAN.isDiscover(getMAN());
+	}
+	
+	public boolean isAlive()
+	{
+		return NTS.isAlive(getNTS());
+	}
+
+	public boolean isByeBye()
+	{
+		return NTS.isByeBye(getNTS());
+	}
+
+	public int getLeaseTime()
+	{
+		return SSDP.getLeaseTime(getCacheControl());
+	}
 
 	////////////////////////////////////////////////
 	//	toString
@@ -240,4 +240,4 @@ public class SSDPPacket
 		return new String(getData());
 	}
 }
-
+
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java
index 17d6eaceaecfcc82dc34b264f26c9e9561c5da08..ca93d6f35b74c856b5e8e0a4d81e4311eb1f328e 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java
@@ -1,111 +1,125 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SSDPRequest.java
-*
-*	Revision;
-*
-*	01/14/03
-*		- first revision.
-*	03/16/04
-*		- Thanks for Darrell Young
-*		- Fixed to set v1.1 to the HTTP version.;
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
-import java.io.InputStream;
-
-import org.cybergarage.http.*;
-
-public class SSDPRequest extends HTTPRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SSDPRequest()
-	{
-		setVersion(HTTP.VERSION_11);
-	}
-
-	public SSDPRequest(InputStream in)
-	{
-		super(in);
-	}
-	
-	////////////////////////////////////////////////
-	//	NT
-	////////////////////////////////////////////////
-
-	public void setNT(String value)
-	{
-		setHeader(HTTP.NT, value);
-	}
-
-	public String getNT()
-	{
-		return getHeaderValue(HTTP.NT);
-	}
-
-	////////////////////////////////////////////////
-	//	NTS
-	////////////////////////////////////////////////
-
-	public void setNTS(String value)
-	{
-		setHeader(HTTP.NTS, value);
-	}
-
-	public String getNTS()
-	{
-		return getHeaderValue(HTTP.NTS);
-	}
-
-	////////////////////////////////////////////////
-	//	Location
-	////////////////////////////////////////////////
-
-	public void setLocation(String value)
-	{
-		setHeader(HTTP.LOCATION, value);
-	}
-
-	public String getLocation()
-	{
-		return getHeaderValue(HTTP.LOCATION);
-	}
-
-	////////////////////////////////////////////////
-	//	USN
-	////////////////////////////////////////////////
-
-	public void setUSN(String value)
-	{
-		setHeader(HTTP.USN, value);
-	}
-
-	public String getUSN()
-	{
-		return getHeaderValue(HTTP.USN);
-	}
-
-	////////////////////////////////////////////////
-	//	CacheControl
-	////////////////////////////////////////////////
-
-	public void setLeaseTime(int len)
-	{
-		setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len));
-	}
-
-	public int getLeaseTime()
-	{
-		String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL);
-		return SSDP.getLeaseTime(cacheCtrl);
-	}
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SSDPRequest.java
+*
+*	Revision;
+*
+*	01/14/03
+*		- first revision.
+*	03/16/04
+*		- Thanks for Darrell Young
+*		- Fixed to set v1.1 to the HTTP version.;
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.ssdp;
+
+import java.io.InputStream;
+
+import org.cybergarage.http.*;
+
+public class SSDPRequest extends HTTPRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SSDPRequest()
+	{
+		setVersion(HTTP.VERSION_11);
+	}
+
+	public SSDPRequest(InputStream in)
+	{
+		super(in);
+	}
+	
+	////////////////////////////////////////////////
+	//	NT
+	////////////////////////////////////////////////
+
+	public void setNT(String value)
+	{
+		setHeader(HTTP.NT, value);
+	}
+
+	public String getNT()
+	{
+		return getHeaderValue(HTTP.NT);
+	}
+
+	////////////////////////////////////////////////
+	//	NTS
+	////////////////////////////////////////////////
+
+	public void setNTS(String value)
+	{
+		setHeader(HTTP.NTS, value);
+	}
+
+	public String getNTS()
+	{
+		return getHeaderValue(HTTP.NTS);
+	}
+
+	////////////////////////////////////////////////
+	//	Location
+	////////////////////////////////////////////////
+
+	public void setLocation(String value)
+	{
+		setHeader(HTTP.LOCATION, value);
+	}
+
+	public String getLocation()
+	{
+		return getHeaderValue(HTTP.LOCATION);
+	}
+
+	////////////////////////////////////////////////
+	//	USN
+	////////////////////////////////////////////////
+
+	public void setUSN(String value)
+	{
+		setHeader(HTTP.USN, value);
+	}
+
+	public String getUSN()
+	{
+		return getHeaderValue(HTTP.USN);
+	}
+
+	////////////////////////////////////////////////
+	//	CacheControl
+	////////////////////////////////////////////////
+
+	public void setLeaseTime(int len)
+	{
+		setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len));
+	}
+
+	public int getLeaseTime()
+	{
+		String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL);
+		return SSDP.getLeaseTime(cacheCtrl);
+	}
+
+	////////////////////////////////////////////////
+	//	BootId
+	////////////////////////////////////////////////
+
+	public void setBootId(int bootId)
+	{
+		setHeader(HTTP.BOOTID_UPNP_ORG, bootId);
+	}
+
+	public int getBootId()
+	{
+		return getIntegerHeaderValue(HTTP.BOOTID_UPNP_ORG);
+	}
+}
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java
index fd96ed7c636799454cbef6091b7d164937b8c8fe..bdb85155601be7ae8170d4ca078c9e7acc20a52b 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java
@@ -1,133 +1,147 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002
-*
-*	File: SSDPResponse.java
-*
-*	Revision;
-*
-*	01/14/03
-*		- first revision.
-*	01/23/04
-*		- Oliver Newell
-*		- Overided HTTPResponse::getHeader() for Intel UPnP control points.
-*	03/16/04
-*		- Thanks for Darrell Young
-*		- Fixed to set v1.1 to the HTTP version.
-*	10/20/04 
-*		- Brent Hills <bhills@openshores.com>
-*		- Added setMYNAME() and getMYNAME().
-*	
-******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
-import java.io.InputStream;
-
-import org.cybergarage.http.*;
-
-public class SSDPResponse extends HTTPResponse
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SSDPResponse()
-	{
-		setVersion(HTTP.VERSION_11);
-	}
-
-	public SSDPResponse(InputStream in)
-	{
-		super(in);
-	}
-	
-	////////////////////////////////////////////////
-	//	ST (SearchTarget)
-	////////////////////////////////////////////////
-
-	public void setST(String value)
-	{
-		setHeader(HTTP.ST, value);
-	}
-
-	public String getST()
-	{
-		return getHeaderValue(HTTP.ST);
-	}
-
-	////////////////////////////////////////////////
-	//	Location
-	////////////////////////////////////////////////
-
-	public void setLocation(String value)
-	{
-		setHeader(HTTP.LOCATION, value);
-	}
-
-	public String getLocation()
-	{
-		return getHeaderValue(HTTP.LOCATION);
-	}
-
-	////////////////////////////////////////////////
-	//	USN
-	////////////////////////////////////////////////
-
-	public void setUSN(String value)
-	{
-		setHeader(HTTP.USN, value);
-	}
-
-	public String getUSN()
-	{
-		return getHeaderValue(HTTP.USN);
-	}
-
-	////////////////////////////////////////////////
-	//	MYNAME
-	////////////////////////////////////////////////
-
-	public void setMYNAME(String value)
-	{
-		setHeader(HTTP.MYNAME, value);
-	}
-
-	public String getMYNAME()
-	{
-		return getHeaderValue(HTTP.MYNAME);
-	}
-	
-	////////////////////////////////////////////////
-	//	CacheControl
-	////////////////////////////////////////////////
-
-	public void setLeaseTime(int len)
-	{
-		setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len));
-	}
-
-	public int getLeaseTime()
-	{
-		String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL);
-		return SSDP.getLeaseTime(cacheCtrl);
-	}
-
-	////////////////////////////////////////////////
-	//	getHeader (Override)
-	////////////////////////////////////////////////
-	
-	public String getHeader()
-	{
-		StringBuffer str = new StringBuffer();
-	
-		str.append(getStatusLineString());
-		str.append(getHeaderString());
-		str.append(HTTP.CRLF); // for Intel UPnP control points.
-		
-		return str.toString();
-	}
-
-}
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: SSDPResponse.java
+*
+*	Revision;
+*
+*	01/14/03
+*		- first revision.
+*	01/23/04
+*		- Oliver Newell
+*		- Overided HTTPResponse::getHeader() for Intel UPnP control points.
+*	03/16/04
+*		- Thanks for Darrell Young
+*		- Fixed to set v1.1 to the HTTP version.
+*	10/20/04 
+*		- Brent Hills <bhills@openshores.com>
+*		- Added setMYNAME() and getMYNAME().
+*	
+******************************************************************/
+
+package org.cybergarage.upnp.ssdp;
+
+import java.io.InputStream;
+
+import org.cybergarage.http.*;
+
+public class SSDPResponse extends HTTPResponse
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SSDPResponse()
+	{
+		setVersion(HTTP.VERSION_11);
+	}
+
+	public SSDPResponse(InputStream in)
+	{
+		super(in);
+	}
+	
+	////////////////////////////////////////////////
+	//	ST (SearchTarget)
+	////////////////////////////////////////////////
+
+	public void setST(String value)
+	{
+		setHeader(HTTP.ST, value);
+	}
+
+	public String getST()
+	{
+		return getHeaderValue(HTTP.ST);
+	}
+
+	////////////////////////////////////////////////
+	//	Location
+	////////////////////////////////////////////////
+
+	public void setLocation(String value)
+	{
+		setHeader(HTTP.LOCATION, value);
+	}
+
+	public String getLocation()
+	{
+		return getHeaderValue(HTTP.LOCATION);
+	}
+
+	////////////////////////////////////////////////
+	//	USN
+	////////////////////////////////////////////////
+
+	public void setUSN(String value)
+	{
+		setHeader(HTTP.USN, value);
+	}
+
+	public String getUSN()
+	{
+		return getHeaderValue(HTTP.USN);
+	}
+
+	////////////////////////////////////////////////
+	//	MYNAME
+	////////////////////////////////////////////////
+
+	public void setMYNAME(String value)
+	{
+		setHeader(HTTP.MYNAME, value);
+	}
+
+	public String getMYNAME()
+	{
+		return getHeaderValue(HTTP.MYNAME);
+	}
+	
+	////////////////////////////////////////////////
+	//	CacheControl
+	////////////////////////////////////////////////
+
+	public void setLeaseTime(int len)
+	{
+		setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len));
+	}
+
+	public int getLeaseTime()
+	{
+		String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL);
+		return SSDP.getLeaseTime(cacheCtrl);
+	}
+
+	////////////////////////////////////////////////
+	//	BootId
+	////////////////////////////////////////////////
+
+	public void setBootId(int bootId)
+	{
+		setHeader(HTTP.BOOTID_UPNP_ORG, bootId);
+	}
+
+	public int getBootId()
+	{
+		return getIntegerHeaderValue(HTTP.BOOTID_UPNP_ORG);
+	}
+	
+	////////////////////////////////////////////////
+	//	getHeader (Override)
+	////////////////////////////////////////////////
+	
+	public String getHeader()
+	{
+		StringBuffer str = new StringBuffer();
+	
+		str.append(getStatusLineString());
+		str.append(getHeaderString());
+		str.append(HTTP.CRLF); // for Intel UPnP control points.
+		
+		return str.toString();
+	}
+
+}
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java
index fbe7cf8123276a3c7a92d9584b044137ec02dabc..8f4478c3e8321a923c41ce4e32d816084907dc07 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java
@@ -5,26 +5,26 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: SSDPMSearchRequest.java
-*
-*	Revision;
-*
-*	11/19/02
-*		- first revision.
+*
+*	Revision;
+*
+*	11/19/02
+*		- first revision.
 *	
 ******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
+
+package org.cybergarage.upnp.ssdp;
+
 import org.cybergarage.net.*;
 import org.cybergarage.http.*;
-
+
 import org.cybergarage.upnp.device.*;
-
-public class SSDPSearchRequest extends SSDPRequest
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
+
+public class SSDPSearchRequest extends SSDPRequest
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
 
 	public SSDPSearchRequest(String serachTarget, int mx)
 	{
@@ -35,16 +35,16 @@ public class SSDPSearchRequest extends SSDPRequest
 		setHeader(HTTP.MX, Integer.toString(mx));
 		setHeader(HTTP.MAN, "\"" + MAN.DISCOVER + "\"");
 	}
-	
-	public SSDPSearchRequest(String serachTarget)
+	
+	public SSDPSearchRequest(String serachTarget)
 	{
-		this(serachTarget, SSDP.DEFAULT_MSEARCH_MX);
-	}
-	
-	public SSDPSearchRequest()
+		this(serachTarget, SSDP.DEFAULT_MSEARCH_MX);
+	}
+	
+	public SSDPSearchRequest()
 	{
-		this(ST.ROOT_DEVICE);
-	}
+		this(ST.ROOT_DEVICE);
+	}
 
 	////////////////////////////////////////////////
 	//	HOST
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java
index 264f5442918ac192776590f23a26f112775937ce..a237fa5801767bbd8efe754e09e046f10cecf99c 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java
@@ -5,31 +5,31 @@
 *	Copyright (C) Satoshi Konno 2002
 *
 *	File: SSDPSearchResponse.java
-*
-*	Revision;
-*
-*	01/14/03
-*		- first revision.
+*
+*	Revision;
+*
+*	01/14/03
+*		- first revision.
 *	
 ******************************************************************/
-
-package org.cybergarage.upnp.ssdp;
-
+
+package org.cybergarage.upnp.ssdp;
+
 import org.cybergarage.http.*;
 
-import org.cybergarage.upnp.*;
-
-public class SSDPSearchResponse extends SSDPResponse
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-	
-	public SSDPSearchResponse()
-	{
-		setStatusCode(HTTPStatus.OK);
-		setCacheControl(Device.DEFAULT_LEASE_TIME);
-		setHeader(HTTP.SERVER, UPnP.getServerName());
-		setHeader(HTTP.EXT, "");
-	}
+import org.cybergarage.upnp.*;
+
+public class SSDPSearchResponse extends SSDPResponse
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+	
+	public SSDPSearchResponse()
+	{
+		setStatusCode(HTTPStatus.OK);
+		setCacheControl(Device.DEFAULT_LEASE_TIME);
+		setHeader(HTTP.SERVER, UPnP.getServerName());
+		setHeader(HTTP.EXT, "");
+	}
 }
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java
index 0777ebac7d1727f5db71e7548ed17581373e2fb7..8d840c7d1d645ab14ca5bfbc6b8bf2138d7e8f28 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java
@@ -21,7 +21,7 @@
 *	08/23/07
 *		- Thanks for Kazuyuki Shudo
 * 		- Changed run() to catch IOException of HTTPMUSocket::receive().
-*	01/10/08
+*	01/10/08
 *		- Changed start() not to abort when the interface infomation is null on Android m3-rc37a.
 *	
 ******************************************************************/
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
index f19bca3b8541687fae3c65745c9a40863f450eed..6e3c5b13071b528efd034fb2c3b5a9b3f0018b1e 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
@@ -61,9 +61,6 @@ public class SSDPSearchSocketList extends Vector<SSDPSearchSocket>
 		this.multicastIPv6 = multicastIPv6;
 	}
 
-	
-	
-
 	////////////////////////////////////////////////
 	//	Methods
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/upnp/xml/ActionData.java b/router/java/src/org/cybergarage/upnp/xml/ActionData.java
index 4982f408842e7541ef214637cfed1cdfc749fe1f..c232a2e4ed09036688ad635172c37db86929a9b2 100644
--- a/router/java/src/org/cybergarage/upnp/xml/ActionData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/ActionData.java
@@ -1,57 +1,57 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: ActionData.java
-*
-*	Revision;
-*
-*	03/28/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.xml;
-
-import org.cybergarage.upnp.control.*;
-
-public class ActionData extends NodeData
-{
-	public ActionData()
-	{
-	}
-
-	////////////////////////////////////////////////
-	// ActionListener
-	////////////////////////////////////////////////
-
-	private ActionListener actionListener = null;
-
-	public ActionListener getActionListener() {
-		return actionListener;
-	}
-
-	public void setActionListener(ActionListener actionListener) {
-		this.actionListener = actionListener;
-	}
-
-	////////////////////////////////////////////////
-	// ControlResponse
-	////////////////////////////////////////////////
-
-	private ControlResponse ctrlRes = null;
-
-	public ControlResponse getControlResponse() 
-	{
-		return ctrlRes;
-	}
-
-	public void setControlResponse(ControlResponse res) 
-	{
-		ctrlRes = res;
-	}
-
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: ActionData.java
+*
+*	Revision;
+*
+*	03/28/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.xml;
+
+import org.cybergarage.upnp.control.*;
+
+public class ActionData extends NodeData
+{
+	public ActionData()
+	{
+	}
+
+	////////////////////////////////////////////////
+	// ActionListener
+	////////////////////////////////////////////////
+
+	private ActionListener actionListener = null;
+
+	public ActionListener getActionListener() {
+		return actionListener;
+	}
+
+	public void setActionListener(ActionListener actionListener) {
+		this.actionListener = actionListener;
+	}
+
+	////////////////////////////////////////////////
+	// ControlResponse
+	////////////////////////////////////////////////
+
+	private ControlResponse ctrlRes = null;
+
+	public ControlResponse getControlResponse() 
+	{
+		return ctrlRes;
+	}
+
+	public void setControlResponse(ControlResponse res) 
+	{
+		ctrlRes = res;
+	}
+
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/xml/DeviceData.java b/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
index e8c2c44725c59b0b40cc2522e26803e52fcc1804..f8be8238f81b038165b1e77344179b43039f94c5 100644
--- a/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/DeviceData.java
@@ -1,271 +1,271 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: DeviceData.java
-*
-*	Revision;
-*
-*	03/28/03
-*		- first revision.
-*	12/25/03
-*		- Added Advertiser functions.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.xml;
-
-import java.io.*;
-import java.net.InetAddress;
-
-import org.cybergarage.util.*;
-import org.cybergarage.http.*;
-
-import org.cybergarage.upnp.*;
-import org.cybergarage.upnp.ssdp.*;
-import org.cybergarage.upnp.device.*;
-
-public class DeviceData extends NodeData
-{
-	public DeviceData() 
-	{
-	}
-
-	////////////////////////////////////////////////
-	// description
-	////////////////////////////////////////////////
-
-	private String descriptionURI = null; 
-	private File descriptionFile = null;
-	
-	public File getDescriptionFile() {
-		return descriptionFile;
-	}
-
-	public String getDescriptionURI() {
-		return descriptionURI;
-	}
-
-	public void setDescriptionFile(File descriptionFile) {
-		this.descriptionFile = descriptionFile;
-	}
-
-	public void setDescriptionURI(String descriptionURI) {
-		this.descriptionURI = descriptionURI;
-	}
-
-	////////////////////////////////////////////////
-	// description
-	////////////////////////////////////////////////
-
-	private String location = "";
-	
-	public String getLocation() {
-		return location;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	////////////////////////////////////////////////
-	//	LeaseTime 
-	////////////////////////////////////////////////
-
-	private int leaseTime = Device.DEFAULT_LEASE_TIME;
-	
-	public int getLeaseTime() 
-	{
-		return leaseTime;
-	}
-
-	public void setLeaseTime(int val) 
-	{
-		leaseTime = val;
-	}
-
-	////////////////////////////////////////////////
-	//	HTTPServer 
-	////////////////////////////////////////////////
-
-	private HTTPServerList httpServerList = null;		
-
-	public HTTPServerList getHTTPServerList() {
-		if(this.httpServerList==null){
-			this.httpServerList = new HTTPServerList(this.httpBinds,this.httpPort);
-		}
-		return this.httpServerList;
-	}
-	
-	private InetAddress[] httpBinds = null;
-	
-	public void setHTTPBindAddress(InetAddress[] inets){
-		this.httpBinds=inets;
-	}
-	
-	public InetAddress[] getHTTPBindAddress(){
-		return this.httpBinds;
-	}
-
-	////////////////////////////////////////////////
-	//	httpPort 
-	////////////////////////////////////////////////
-
-	private int httpPort = Device.HTTP_DEFAULT_PORT;
-
-	public int getHTTPPort() {
-		return httpPort;
-	}
-
-	public void setHTTPPort(int port) {
-		httpPort = port;
-	}
-
-	////////////////////////////////////////////////
-	// controlActionListenerList
-	////////////////////////////////////////////////
-
-	private ListenerList controlActionListenerList = new ListenerList();
-
-	public ListenerList getControlActionListenerList() {
-		return controlActionListenerList;
-	}
-
-/*
-	public void setControlActionListenerList(ListenerList controlActionListenerList) {
-		this.controlActionListenerList = controlActionListenerList;
-	}
-*/
-
-	////////////////////////////////////////////////
-	// SSDPSearchSocket
-	////////////////////////////////////////////////
-	
-	private SSDPSearchSocketList ssdpSearchSocketList = null;
-	private String ssdpMulticastIPv4 = SSDP.ADDRESS;
-	private String ssdpMulticastIPv6 = SSDP.getIPv6Address();
-	private int ssdpPort = SSDP.PORT;
-	private InetAddress[] ssdpBinds = null;
-	
-	public SSDPSearchSocketList getSSDPSearchSocketList() {
-		if(this.ssdpSearchSocketList==null){
-			this.ssdpSearchSocketList = new SSDPSearchSocketList(this.ssdpBinds,ssdpPort,ssdpMulticastIPv4,ssdpMulticastIPv6);			
-		}
-		return ssdpSearchSocketList;
-	}
-	
-	/**
-	 * 
-	 * @param port The port to use for binding the SSDP service. 
-	 * 		The port will be used as source port for all SSDP messages 
-	 * @since 1.8
-	 */
-	public void setSSDPPort(int port){
-		this.ssdpPort=port;
-	}
-
-	/**
-	 * 
-	 * @return The port used for binding the SSDP service. 
-	 * 		The port will be used as source port for all SSDP messages 
-	 */
-	public int getSSDPPort(){
-		return this.ssdpPort;
-	}
-	
-	
-	/**
-	 * 
-	 * @param inets The <tt>InetAddress</tt> that will be binded for listing this service. 
-	 * 		Use <code>null</code> for the default behaviur. 
-	 * @see org.cybergarage.upnp.ssdp
-	 * @see org.cybergarage.upnp
-	 * @see org.cybergarage.net.HostInterface
-	 * @since 1.8 
-	 */
-	public void setSSDPBindAddress(InetAddress[] inets){
-		this.ssdpBinds=inets;
-	}
-	
-	/**
-	 * 
-	 * @return inets The <tt>InetAddress</tt> that will be binded for this service
-	 * 		<code>null</code> means that defulat behaviur will be used
-	 * @since 1.8
-	 */	
-	public InetAddress[] getSSDPBindAddress(){
-		return this.ssdpBinds;
-	}
-	
-	/**
-	 * 
-	 * @param ip The IPv4 address used as destination address for Multicast comunication
-	 * @since 1.8
-	 */
-	public void setMulticastIPv4Address(String ip){
-		this.ssdpMulticastIPv4=ip;
-	}
-
-	/**
-	 * 
-	 * @return The IPv4 address used for Multicast comunication
-	 */
-	public String getMulticastIPv4Address(){
-		return this.ssdpMulticastIPv4;
-	}
-	
-	/**
-	 * 
-	 * @param ip The IPv6 address used as destination address for Multicast comunication
-	 * @since 1.8
-	 */
-	public void setMulticastIPv6Address(String ip){
-		this.ssdpMulticastIPv6=ip;
-	}
-
-	/**
-	 * 
-	 * @return The IPv6 address used as destination address for Multicast comunication
-	 * @since 1.8
-	 */
-	public String getMulticastIPv6Address(){
-		return this.ssdpMulticastIPv6;
-	}
-	
-	
-
-	////////////////////////////////////////////////
-	// SSDPPacket
-	////////////////////////////////////////////////
-	
-	private SSDPPacket ssdpPacket = null;
-	
-	public SSDPPacket getSSDPPacket() {
-		return ssdpPacket;
-	}
-
-	public void setSSDPPacket(SSDPPacket packet) {
-		ssdpPacket = packet;
-	}
-
-	////////////////////////////////////////////////
-	// Advertiser
-	////////////////////////////////////////////////
-
-	private Advertiser advertiser = null;
-	
-	public void setAdvertiser(Advertiser adv) 
-	{
-		advertiser = adv;
-	}
-	
-	public Advertiser getAdvertiser() 
-	{
-		return advertiser;
-	}
-
-
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: DeviceData.java
+*
+*	Revision;
+*
+*	03/28/03
+*		- first revision.
+*	12/25/03
+*		- Added Advertiser functions.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.xml;
+
+import java.io.*;
+import java.net.InetAddress;
+
+import org.cybergarage.util.*;
+import org.cybergarage.http.*;
+
+import org.cybergarage.upnp.*;
+import org.cybergarage.upnp.ssdp.*;
+import org.cybergarage.upnp.device.*;
+
+public class DeviceData extends NodeData
+{
+	public DeviceData() 
+	{
+	}
+
+	////////////////////////////////////////////////
+	// description
+	////////////////////////////////////////////////
+
+	private String descriptionURI = null; 
+	private File descriptionFile = null;
+	
+	public File getDescriptionFile() {
+		return descriptionFile;
+	}
+
+	public String getDescriptionURI() {
+		return descriptionURI;
+	}
+
+	public void setDescriptionFile(File descriptionFile) {
+		this.descriptionFile = descriptionFile;
+	}
+
+	public void setDescriptionURI(String descriptionURI) {
+		this.descriptionURI = descriptionURI;
+	}
+
+	////////////////////////////////////////////////
+	// description
+	////////////////////////////////////////////////
+
+	private String location = "";
+	
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	////////////////////////////////////////////////
+	//	LeaseTime 
+	////////////////////////////////////////////////
+
+	private int leaseTime = Device.DEFAULT_LEASE_TIME;
+	
+	public int getLeaseTime() 
+	{
+		return leaseTime;
+	}
+
+	public void setLeaseTime(int val) 
+	{
+		leaseTime = val;
+	}
+
+	////////////////////////////////////////////////
+	//	HTTPServer 
+	////////////////////////////////////////////////
+
+	private HTTPServerList httpServerList = null;		
+
+	public HTTPServerList getHTTPServerList() {
+		if(this.httpServerList==null){
+			this.httpServerList = new HTTPServerList(this.httpBinds,this.httpPort);
+		}
+		return this.httpServerList;
+	}
+	
+	private InetAddress[] httpBinds = null;
+	
+	public void setHTTPBindAddress(InetAddress[] inets){
+		this.httpBinds=inets;
+	}
+	
+	public InetAddress[] getHTTPBindAddress(){
+		return this.httpBinds;
+	}
+
+	////////////////////////////////////////////////
+	//	httpPort 
+	////////////////////////////////////////////////
+
+	private int httpPort = Device.HTTP_DEFAULT_PORT;
+
+	public int getHTTPPort() {
+		return httpPort;
+	}
+
+	public void setHTTPPort(int port) {
+		httpPort = port;
+	}
+
+	////////////////////////////////////////////////
+	// controlActionListenerList
+	////////////////////////////////////////////////
+
+	private ListenerList controlActionListenerList = new ListenerList();
+
+	public ListenerList getControlActionListenerList() {
+		return controlActionListenerList;
+	}
+
+/*
+	public void setControlActionListenerList(ListenerList controlActionListenerList) {
+		this.controlActionListenerList = controlActionListenerList;
+	}
+*/
+
+	////////////////////////////////////////////////
+	// SSDPSearchSocket
+	////////////////////////////////////////////////
+	
+	private SSDPSearchSocketList ssdpSearchSocketList = null;
+	private String ssdpMulticastIPv4 = SSDP.ADDRESS;
+	private String ssdpMulticastIPv6 = SSDP.getIPv6Address();
+	private int ssdpPort = SSDP.PORT;
+	private InetAddress[] ssdpBinds = null;
+	
+	public SSDPSearchSocketList getSSDPSearchSocketList() {
+		if(this.ssdpSearchSocketList==null){
+			this.ssdpSearchSocketList = new SSDPSearchSocketList(this.ssdpBinds,ssdpPort,ssdpMulticastIPv4,ssdpMulticastIPv6);			
+		}
+		return ssdpSearchSocketList;
+	}
+	
+	/**
+	 * 
+	 * @param port The port to use for binding the SSDP service. 
+	 * 		The port will be used as source port for all SSDP messages 
+	 * @since 1.8
+	 */
+	public void setSSDPPort(int port){
+		this.ssdpPort=port;
+	}
+
+	/**
+	 * 
+	 * @return The port used for binding the SSDP service. 
+	 * 		The port will be used as source port for all SSDP messages 
+	 */
+	public int getSSDPPort(){
+		return this.ssdpPort;
+	}
+	
+	
+	/**
+	 * 
+	 * @param inets The <tt>InetAddress</tt> that will be binded for listing this service. 
+	 * 		Use <code>null</code> for the default behaviur. 
+	 * @see org.cybergarage.upnp.ssdp
+	 * @see org.cybergarage.upnp
+	 * @see org.cybergarage.net.HostInterface
+	 * @since 1.8 
+	 */
+	public void setSSDPBindAddress(InetAddress[] inets){
+		this.ssdpBinds=inets;
+	}
+	
+	/**
+	 * 
+	 * @return inets The <tt>InetAddress</tt> that will be binded for this service
+	 * 		<code>null</code> means that defulat behaviur will be used
+	 * @since 1.8
+	 */	
+	public InetAddress[] getSSDPBindAddress(){
+		return this.ssdpBinds;
+	}
+	
+	/**
+	 * 
+	 * @param ip The IPv4 address used as destination address for Multicast comunication
+	 * @since 1.8
+	 */
+	public void setMulticastIPv4Address(String ip){
+		this.ssdpMulticastIPv4=ip;
+	}
+
+	/**
+	 * 
+	 * @return The IPv4 address used for Multicast comunication
+	 */
+	public String getMulticastIPv4Address(){
+		return this.ssdpMulticastIPv4;
+	}
+	
+	/**
+	 * 
+	 * @param ip The IPv6 address used as destination address for Multicast comunication
+	 * @since 1.8
+	 */
+	public void setMulticastIPv6Address(String ip){
+		this.ssdpMulticastIPv6=ip;
+	}
+
+	/**
+	 * 
+	 * @return The IPv6 address used as destination address for Multicast comunication
+	 * @since 1.8
+	 */
+	public String getMulticastIPv6Address(){
+		return this.ssdpMulticastIPv6;
+	}
+	
+	
+
+	////////////////////////////////////////////////
+	// SSDPPacket
+	////////////////////////////////////////////////
+	
+	private SSDPPacket ssdpPacket = null;
+	
+	public SSDPPacket getSSDPPacket() {
+		return ssdpPacket;
+	}
+
+	public void setSSDPPacket(SSDPPacket packet) {
+		ssdpPacket = packet;
+	}
+
+	////////////////////////////////////////////////
+	// Advertiser
+	////////////////////////////////////////////////
+
+	private Advertiser advertiser = null;
+	
+	public void setAdvertiser(Advertiser adv) 
+	{
+		advertiser = adv;
+	}
+	
+	public Advertiser getAdvertiser() 
+	{
+		return advertiser;
+	}
+
+
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/xml/NodeData.java b/router/java/src/org/cybergarage/upnp/xml/NodeData.java
index 638e404d71dccbba5189a5c665c7cfe8543dfab7..304ea53035dcd2231f66419f7870d8f85e5e892e 100644
--- a/router/java/src/org/cybergarage/upnp/xml/NodeData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/NodeData.java
@@ -1,43 +1,43 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: ActionData.java
-*
-*	Revision;
-*
-*	03/28/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.upnp.xml;
-
-import org.cybergarage.xml.*;
-
-public class NodeData
-{
-	public NodeData()
-	{
-		setNode(null);
-	}
-
-	////////////////////////////////////////////////
-	// Node
-	////////////////////////////////////////////////
-
-	private Node node;
-	
-	public void setNode(Node node)
-	{
-		this.node = node;
-	}
-	
-	public Node getNode()
-	{
-		return node;	
-	}
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: ActionData.java
+*
+*	Revision;
+*
+*	03/28/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.upnp.xml;
+
+import org.cybergarage.xml.*;
+
+public class NodeData
+{
+	public NodeData()
+	{
+		setNode(null);
+	}
+
+	////////////////////////////////////////////////
+	// Node
+	////////////////////////////////////////////////
+
+	private Node node;
+	
+	public void setNode(Node node)
+	{
+		this.node = node;
+	}
+	
+	public Node getNode()
+	{
+		return node;	
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/xml/ServiceData.java b/router/java/src/org/cybergarage/upnp/xml/ServiceData.java
index 5f5eeefda5863ff2a06b0ec135ec4d9c536312ff..f991f56f2a2ecf172d8319b95e204f523aae5eb1 100644
--- a/router/java/src/org/cybergarage/upnp/xml/ServiceData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/ServiceData.java
@@ -1,112 +1,112 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: ServiceData.java
-*
-*	Revision;
-*
-*	03/28/03
-*		- first revision.
-*	01/06/04
-*		- Moved setQueryListener() and getQueryListener() to StateVariableData class.
-*	03/30/05
-*		- Removed setDescriptionURL() and getDescriptionURL().
-*
-******************************************************************/
-
-package org.cybergarage.upnp.xml;
-
-import org.cybergarage.util.*;
-import org.cybergarage.xml.*;
-
-import org.cybergarage.upnp.event.*;
-
-public class ServiceData extends NodeData
-{
-	public ServiceData() 
-	{
-	}
-
-	////////////////////////////////////////////////
-	// controlActionListenerList
-	////////////////////////////////////////////////
-
-	private ListenerList controlActionListenerList = new ListenerList();
-
-	public ListenerList getControlActionListenerList() {
-		return controlActionListenerList;
-	}
-
-	////////////////////////////////////////////////
-	// scpdNode
-	////////////////////////////////////////////////
-
-	private Node scpdNode = null;
-
-	public Node getSCPDNode() {
-		return scpdNode;
-	}
-
-	public void setSCPDNode(Node node) {
-		scpdNode = node;
-	}
-
-	////////////////////////////////////////////////
-	// SubscriberList
-	////////////////////////////////////////////////
-
-	private SubscriberList subscriberList = new SubscriberList();
-	
-	public SubscriberList getSubscriberList() {
-		return subscriberList;
-	}
-
-	////////////////////////////////////////////////
-	// SID
-	////////////////////////////////////////////////
-
-    private String descriptionURL = "";
-
-    public String getDescriptionURL() {
-            return descriptionURL;
-    }
-
-    public void setDescriptionURL(String descriptionURL) {
-            this.descriptionURL = descriptionURL;
-    }
-	
-	////////////////////////////////////////////////
-	// SID
-	////////////////////////////////////////////////
-
-	private String sid = "";
-	
-	public String getSID() {
-		return sid;
-	}
-
-	public void setSID(String id) {
-		sid = id;
-	}
-
-	////////////////////////////////////////////////
-	// Timeout
-	////////////////////////////////////////////////
-
-	private long timeout = 0;
-
-	public long getTimeout() 
-	{
-		return timeout;
-	}
-
-	public void setTimeout(long value) 
-	{
-		timeout = value;
-	}
-
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: ServiceData.java
+*
+*	Revision;
+*
+*	03/28/03
+*		- first revision.
+*	01/06/04
+*		- Moved setQueryListener() and getQueryListener() to StateVariableData class.
+*	03/30/05
+*		- Removed setDescriptionURL() and getDescriptionURL().
+*
+******************************************************************/
+
+package org.cybergarage.upnp.xml;
+
+import org.cybergarage.util.*;
+import org.cybergarage.xml.*;
+
+import org.cybergarage.upnp.event.*;
+
+public class ServiceData extends NodeData
+{
+	public ServiceData() 
+	{
+	}
+
+	////////////////////////////////////////////////
+	// controlActionListenerList
+	////////////////////////////////////////////////
+
+	private ListenerList controlActionListenerList = new ListenerList();
+
+	public ListenerList getControlActionListenerList() {
+		return controlActionListenerList;
+	}
+
+	////////////////////////////////////////////////
+	// scpdNode
+	////////////////////////////////////////////////
+
+	private Node scpdNode = null;
+
+	public Node getSCPDNode() {
+		return scpdNode;
+	}
+
+	public void setSCPDNode(Node node) {
+		scpdNode = node;
+	}
+
+	////////////////////////////////////////////////
+	// SubscriberList
+	////////////////////////////////////////////////
+
+	private SubscriberList subscriberList = new SubscriberList();
+	
+	public SubscriberList getSubscriberList() {
+		return subscriberList;
+	}
+
+	////////////////////////////////////////////////
+	// SID
+	////////////////////////////////////////////////
+
+    private String descriptionURL = "";
+
+    public String getDescriptionURL() {
+            return descriptionURL;
+    }
+
+    public void setDescriptionURL(String descriptionURL) {
+            this.descriptionURL = descriptionURL;
+    }
+	
+	////////////////////////////////////////////////
+	// SID
+	////////////////////////////////////////////////
+
+	private String sid = "";
+	
+	public String getSID() {
+		return sid;
+	}
+
+	public void setSID(String id) {
+		sid = id;
+	}
+
+	////////////////////////////////////////////////
+	// Timeout
+	////////////////////////////////////////////////
+
+	private long timeout = 0;
+
+	public long getTimeout() 
+	{
+		return timeout;
+	}
+
+	public void setTimeout(long value) 
+	{
+		timeout = value;
+	}
+
+}
+
diff --git a/router/java/src/org/cybergarage/upnp/xml/StateVariableData.java b/router/java/src/org/cybergarage/upnp/xml/StateVariableData.java
index c32c7c1ed949929804f22e3633be4d8babeb4999..695d4fba93f4955ce71e45a56715ec5412d99e9e 100644
--- a/router/java/src/org/cybergarage/upnp/xml/StateVariableData.java
+++ b/router/java/src/org/cybergarage/upnp/xml/StateVariableData.java
@@ -1,73 +1,73 @@
-/******************************************************************
-*
-*	CyberUPnP for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File:StateVariableData.java
-*
-*	Revision;
-*
-*	02/05/03
-*		- first revision.
-*	01/06/04
-*		- Added setQueryListener() and getQueryListener().
-*
-******************************************************************/
-
-package org.cybergarage.upnp.xml;
-
-import org.cybergarage.upnp.control.*;
-
-public class StateVariableData extends NodeData
-{
-	public StateVariableData() 
-	{
-	}
-
-	////////////////////////////////////////////////
-	// value
-	////////////////////////////////////////////////
-
-	private String value = "";
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	////////////////////////////////////////////////
-	// QueryListener
-	////////////////////////////////////////////////
-
-	private QueryListener queryListener = null;
-
-	public QueryListener getQueryListener() {
-		return queryListener;
-	}
-
-	public void setQueryListener(QueryListener queryListener) {
-		this.queryListener = queryListener;
-	}
-	
-	////////////////////////////////////////////////
-	// QueryResponse
-	////////////////////////////////////////////////
-
-	private QueryResponse queryRes = null;
-
-	public QueryResponse getQueryResponse() 
-	{
-		return queryRes;
-	}
-
-	public void setQueryResponse(QueryResponse res) 
-	{
-		queryRes = res;
-	}
-
-}
-
+/******************************************************************
+*
+*	CyberUPnP for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File:StateVariableData.java
+*
+*	Revision;
+*
+*	02/05/03
+*		- first revision.
+*	01/06/04
+*		- Added setQueryListener() and getQueryListener().
+*
+******************************************************************/
+
+package org.cybergarage.upnp.xml;
+
+import org.cybergarage.upnp.control.*;
+
+public class StateVariableData extends NodeData
+{
+	public StateVariableData() 
+	{
+	}
+
+	////////////////////////////////////////////////
+	// value
+	////////////////////////////////////////////////
+
+	private String value = "";
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	////////////////////////////////////////////////
+	// QueryListener
+	////////////////////////////////////////////////
+
+	private QueryListener queryListener = null;
+
+	public QueryListener getQueryListener() {
+		return queryListener;
+	}
+
+	public void setQueryListener(QueryListener queryListener) {
+		this.queryListener = queryListener;
+	}
+	
+	////////////////////////////////////////////////
+	// QueryResponse
+	////////////////////////////////////////////////
+
+	private QueryResponse queryRes = null;
+
+	public QueryResponse getQueryResponse() 
+	{
+		return queryRes;
+	}
+
+	public void setQueryResponse(QueryResponse res) 
+	{
+		queryRes = res;
+	}
+
+}
+
diff --git a/router/java/src/org/cybergarage/util/Debug.java b/router/java/src/org/cybergarage/util/Debug.java
index c6415591ef2687966fd99f7af2f5fec345aa9c8a..c3ca4d088783e7f043ff2408ba20575157c668b0 100644
--- a/router/java/src/org/cybergarage/util/Debug.java
+++ b/router/java/src/org/cybergarage/util/Debug.java
@@ -17,6 +17,7 @@ package org.cybergarage.util;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
 
 public final class Debug
 {
@@ -24,6 +25,9 @@ public final class Debug
 
 	/** I2P this is all static so have the UPnPManager call this */
 	public static void initialize(I2PAppContext ctx) {
+                // don't keep static ref on android, just skip it
+                if (SystemVersion.isAndroid())
+                    return;
 		_log = ctx.logManager().getLog(Debug.class);
 		// org.cybergarage.util.Debug=DEBUG at startup
 		enabled = _log.shouldLog(Log.DEBUG);
diff --git a/router/java/src/org/cybergarage/util/FileUtil.java b/router/java/src/org/cybergarage/util/FileUtil.java
index 5d14acd6070beafccc4028c3e31228dfba027602..5c2744d4dad424d1e1436f6c54d3638de4e0e595 100644
--- a/router/java/src/org/cybergarage/util/FileUtil.java
+++ b/router/java/src/org/cybergarage/util/FileUtil.java
@@ -1,80 +1,79 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: FileUtil.java
-*
-*	Revision:
-*
-*	01/03/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Locale;
-
-public final class FileUtil
-{
-	public final static byte[] load(String fileName)
-	{
-		try {	
-			FileInputStream fin=new FileInputStream(fileName);
-			return load(fin);
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-			return new byte[0];
-		}
-	}
-
-	public final static byte[] load(File file)
-	{
-		try {	
-			FileInputStream fin=new FileInputStream(file);
-			return load(fin);
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-			return new byte[0];
-		}
-	}
-
-	public final static byte[] load(FileInputStream fin)
-	{
-		byte readBuf[] = new byte[512*1024];
-	
-		try {	
-			ByteArrayOutputStream bout = new ByteArrayOutputStream();
-		
-			int readCnt = fin.read(readBuf);
-			while (0 < readCnt) {
-				bout.write(readBuf, 0, readCnt);
-				readCnt = fin.read(readBuf);
-			}
-			
-			fin.close();
-			
-			return bout.toByteArray();
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-			return new byte[0];
-		}
-	}
-	
-	public final static boolean isXMLFileName(String name)
-	{
-		if (StringUtil.hasData(name) == false)
-			return false;
-		String lowerName = name.toLowerCase(Locale.US);
-		return lowerName.endsWith("xml");
-	}
-}
-
+/******************************************************************
+*
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: FileUtil.java
+*
+*	Revision:
+*
+*	01/03/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+public final class FileUtil
+{
+	public final static byte[] load(String fileName)
+	{
+		try {	
+			FileInputStream fin=new FileInputStream(fileName);
+			return load(fin);
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+			return new byte[0];
+		}
+	}
+
+	public final static byte[] load(File file)
+	{
+		try {	
+			FileInputStream fin=new FileInputStream(file);
+			return load(fin);
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+			return new byte[0];
+		}
+	}
+
+	public final static byte[] load(FileInputStream fin)
+	{
+		byte readBuf[] = new byte[512*1024];
+	
+		try {	
+			ByteArrayOutputStream bout = new ByteArrayOutputStream();
+		
+			int readCnt = fin.read(readBuf);
+			while (0 < readCnt) {
+				bout.write(readBuf, 0, readCnt);
+				readCnt = fin.read(readBuf);
+			}
+			
+			fin.close();
+			
+			return bout.toByteArray();
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+			return new byte[0];
+		}
+	}
+	
+	public final static boolean isXMLFileName(String name)
+	{
+		if (StringUtil.hasData(name) == false)
+			return false;
+		String lowerName = name.toLowerCase();
+		return lowerName.endsWith("xml");
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/util/ListenerList.java b/router/java/src/org/cybergarage/util/ListenerList.java
index 7bcae9f2f52fb1337522cc442e23121629987bbe..248ccf1cb3b6336e8c79a7e0343816d07cb0ee23 100644
--- a/router/java/src/org/cybergarage/util/ListenerList.java
+++ b/router/java/src/org/cybergarage/util/ListenerList.java
@@ -1,29 +1,29 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: ListenerList.java
-*
-*	Revision;
-*
-*	12/30/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ListenerList.java
+*
+*	Revision;
+*
+*	12/30/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.util;
+
+import java.util.Vector;
 
-package org.cybergarage.util;
-
-import java.util.Vector;
+public class ListenerList extends Vector<Object>
+{
+	public boolean add(Object obj)
+	{
+		if (0 <= indexOf(obj))
+			return false;
+		return super.add(obj);
+	}
+}
 
-public class ListenerList extends Vector<Object>
-{
-	public boolean add(Object obj)
-	{
-		if (0 <= indexOf(obj))
-			return false;
-		return super.add(obj);
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/util/Mutex.java b/router/java/src/org/cybergarage/util/Mutex.java
index f26351271c317a5906d20e6666dc3072b8f97342..426b6598159ab801195a668674b4ac1296159263 100644
--- a/router/java/src/org/cybergarage/util/Mutex.java
+++ b/router/java/src/org/cybergarage/util/Mutex.java
@@ -1,54 +1,54 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: Mutex.java
-*
-*	Revision:
-*
-*	06/19/04
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.util;
-
-public class Mutex
-{
-	private boolean syncLock;
-	
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public Mutex()
-	{
-		syncLock = false;
-	}
-	
-	////////////////////////////////////////////////
-	//	lock
-	////////////////////////////////////////////////
-	
-	public synchronized void lock()
-	{
-		while(syncLock == true) {
-			try {
-				wait();
-			}
-			catch (Exception e) {
-				Debug.warning(e);
-			};
-		}
-		syncLock = true;
-	}
-
-	public synchronized void unlock()
-	{
-		syncLock = false;
-		notifyAll();
-	}
-
+/******************************************************************
+*
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: Mutex.java
+*
+*	Revision:
+*
+*	06/19/04
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.util;
+
+public class Mutex
+{
+	private boolean syncLock;
+	
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public Mutex()
+	{
+		syncLock = false;
+	}
+	
+	////////////////////////////////////////////////
+	//	lock
+	////////////////////////////////////////////////
+	
+	public synchronized void lock()
+	{
+		while(syncLock == true) {
+			try {
+				wait();
+			}
+			catch (Exception e) {
+				Debug.warning(e);
+			};
+		}
+		syncLock = true;
+	}
+
+	public synchronized void unlock()
+	{
+		syncLock = false;
+		notifyAll();
+	}
+
 }
\ No newline at end of file
diff --git a/router/java/src/org/cybergarage/util/StringUtil.java b/router/java/src/org/cybergarage/util/StringUtil.java
index b59eb929a101c1e7ed08cd2296b582211e69f098..a71cdb3732a5d466f0f200741ee48a5cd29fc346 100644
--- a/router/java/src/org/cybergarage/util/StringUtil.java
+++ b/router/java/src/org/cybergarage/util/StringUtil.java
@@ -1,123 +1,123 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
+/******************************************************************
 *
-*	File: FileUtil.java
-*
-*	Revision:
-*
-*	01/12/03
-*		- first revision.
-*
-******************************************************************/
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: FileUtil.java
+*
+*	Revision:
+*
+*	01/12/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.util;
+
+public final class StringUtil
+{
+	public final static boolean hasData(String value)
+	{
+		if (value == null)
+			return false;
+		if (value.length() <= 0)
+			return false;
+		return true;
+	}
+	
+	public final static int toInteger(String value)
+	{
+		try {
+			return Integer.parseInt(value);
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+		}
+		return 0;
+	}
+
+	public final static long toLong(String value)
+	{
+		try {
+			return Long.parseLong(value);
+		}
+		catch (Exception e) {
+			Debug.warning(e);
+		}
+		return 0;
+	}
+
+	public final static int findOf(String str, String chars, int startIdx, int endIdx, int offset, boolean isEqual)
+	{
+		if (offset == 0)
+			return -1;
+		int charCnt = chars.length();
+		int idx = startIdx;
+		while (true) {
+			if (0 < offset) {
+				if (endIdx < idx)
+					break; 
+			}
+			else {
+				if (idx < endIdx)
+					break; 
+			}
+			char strc = str.charAt(idx);
+			int noEqualCnt = 0;
+			for (int n=0; n<charCnt; n++) {
+				char charc = chars.charAt(n);
+				if (isEqual == true) {
+					if (strc == charc)
+						return idx;
+				}
+				else {
+					if (strc != charc)
+						noEqualCnt++;
+					if (noEqualCnt == charCnt)
+						return idx;
+				}
+			}
+			idx += offset;
+		}
+		return -1;
+	}
+	
+	public final static int findFirstOf(String str, String chars)
+	{
+		return findOf(str, chars, 0, (str.length()-1), 1, true);
+	}
+	
+	public final static int findFirstNotOf(String str, String chars)
+	{
+		return findOf(str, chars, 0, (str.length()-1), 1, false);
+	}
+	
+	public final static int findLastOf(String str, String chars)
+	{
+		return findOf(str, chars, (str.length()-1), 0, -1, true);
+	}
+	
+	public final static int findLastNotOf(String str, String chars)
+	{
+		return findOf(str, chars, (str.length()-1), 0, -1, false);
+	}
+	
+	public final static String trim(String trimStr, String trimChars)
+	{
+		int spIdx = findFirstNotOf(trimStr, trimChars);
+		if (spIdx < 0) {
+			String buf = trimStr;
+			return buf;
+		}
+		String trimStr2 = trimStr.substring(spIdx, trimStr.length());
+		spIdx = findLastNotOf(trimStr2, trimChars);
+		if (spIdx < 0) {
+			String buf = trimStr2;
+			return buf;
+		}
+		String buf = trimStr2.substring(0, spIdx+1);
+		return buf;
+	}
+}
 
-package org.cybergarage.util;
-
-public final class StringUtil
-{
-	public final static boolean hasData(String value)
-	{
-		if (value == null)
-			return false;
-		if (value.length() <= 0)
-			return false;
-		return true;
-	}
-	
-	public final static int toInteger(String value)
-	{
-		try {
-			return Integer.parseInt(value);
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-		}
-		return 0;
-	}
-
-	public final static long toLong(String value)
-	{
-		try {
-			return Long.parseLong(value);
-		}
-		catch (Exception e) {
-			Debug.warning(e);
-		}
-		return 0;
-	}
-
-	public final static int findOf(String str, String chars, int startIdx, int endIdx, int offset, boolean isEqual)
-	{
-		if (offset == 0)
-			return -1;
-		int charCnt = chars.length();
-		int idx = startIdx;
-		while (true) {
-			if (0 < offset) {
-				if (endIdx < idx)
-					break; 
-			}
-			else {
-				if (idx < endIdx)
-					break; 
-			}
-			char strc = str.charAt(idx);
-			int noEqualCnt = 0;
-			for (int n=0; n<charCnt; n++) {
-				char charc = chars.charAt(n);
-				if (isEqual == true) {
-					if (strc == charc)
-						return idx;
-				}
-				else {
-					if (strc != charc)
-						noEqualCnt++;
-					if (noEqualCnt == charCnt)
-						return idx;
-				}
-			}
-			idx += offset;
-		}
-		return -1;
-	}
-	
-	public final static int findFirstOf(String str, String chars)
-	{
-		return findOf(str, chars, 0, (str.length()-1), 1, true);
-	}
-	
-	public final static int findFirstNotOf(String str, String chars)
-	{
-		return findOf(str, chars, 0, (str.length()-1), 1, false);
-	}
-	
-	public final static int findLastOf(String str, String chars)
-	{
-		return findOf(str, chars, (str.length()-1), 0, -1, true);
-	}
-	
-	public final static int findLastNotOf(String str, String chars)
-	{
-		return findOf(str, chars, (str.length()-1), 0, -1, false);
-	}
-	
-	public final static String trim(String trimStr, String trimChars)
-	{
-		int spIdx = findFirstNotOf(trimStr, trimChars);
-		if (spIdx < 0) {
-			String buf = trimStr;
-			return buf;
-		}
-		String trimStr2 = trimStr.substring(spIdx, trimStr.length());
-		spIdx = findLastNotOf(trimStr2, trimChars);
-		if (spIdx < 0) {
-			String buf = trimStr2;
-			return buf;
-		}
-		String buf = trimStr2.substring(0, spIdx+1);
-		return buf;
-	}
-}
-
diff --git a/router/java/src/org/cybergarage/util/ThreadCore.java b/router/java/src/org/cybergarage/util/ThreadCore.java
index 5e9fd4598b53c143acebe58d584bc90679eed586..ca24bda8ba5bb257c8bbdb6b092f7365f36b6e39 100644
--- a/router/java/src/org/cybergarage/util/ThreadCore.java
+++ b/router/java/src/org/cybergarage/util/ThreadCore.java
@@ -1,85 +1,85 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2004
-*
-*	File: Thread.java
-*
-*	Revision:
-*
-*	01/05/04
-*		- first revision.
-*	08/23/07
-*		- Thanks for Kazuyuki Shudo
-*		- Changed stop() to stop more safety using Thread::interrupt().
-*	
-******************************************************************/
-
-package org.cybergarage.util;
-
-public class ThreadCore implements Runnable
-{
-	////////////////////////////////////////////////
-	//	Constructor
-	////////////////////////////////////////////////
-
-	public ThreadCore()
-	{
-	}
-	
-	////////////////////////////////////////////////
-	//	Thread
-	////////////////////////////////////////////////
-	
-	private java.lang.Thread mThreadObject = null;
-	
-	public void setThreadObject(java.lang.Thread obj) {
-		mThreadObject = obj;
-	}
-
-	public java.lang.Thread getThreadObject() {
-		return mThreadObject;
-	}
-
-	public void start() 
-	{
-		java.lang.Thread threadObject = getThreadObject();
-		if (threadObject == null) {
-			threadObject = new java.lang.Thread(this,"Cyber.ThreadCore");
-			setThreadObject(threadObject);
-			threadObject.start();
-		}
-	}
-	
-	public void run()
-	{
-	}
-
-	public boolean isRunnable()
-	{
-		return (Thread.currentThread() == getThreadObject()) ? true : false;
-	}
-	
-	public void stop() 
-	{
-		java.lang.Thread threadObject = getThreadObject();
-		if (threadObject != null) { 
-			//threadObject.destroy();
-			//threadObject.stop();
-			
-			// Thanks for Kazuyuki Shudo (08/23/07)
-			threadObject.interrupt();
-			
-			setThreadObject(null);
-			// I2P break Disposer out of sleep()
-			threadObject.interrupt();
-		}
-	}
-	
-	public void restart()
-	{
-		stop();
-		start();
-	}
-}
+/******************************************************************
+*
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2004
+*
+*	File: Thread.java
+*
+*	Revision:
+*
+*	01/05/04
+*		- first revision.
+*	08/23/07
+*		- Thanks for Kazuyuki Shudo
+*		- Changed stop() to stop more safety using Thread::interrupt().
+*	
+******************************************************************/
+
+package org.cybergarage.util;
+
+public class ThreadCore implements Runnable
+{
+	////////////////////////////////////////////////
+	//	Constructor
+	////////////////////////////////////////////////
+
+	public ThreadCore()
+	{
+	}
+	
+	////////////////////////////////////////////////
+	//	Thread
+	////////////////////////////////////////////////
+	
+	private java.lang.Thread mThreadObject = null;
+	
+	public void setThreadObject(java.lang.Thread obj) {
+		mThreadObject = obj;
+	}
+
+	public java.lang.Thread getThreadObject() {
+		return mThreadObject;
+	}
+
+	public void start() 
+	{
+		java.lang.Thread threadObject = getThreadObject();
+		if (threadObject == null) {
+			threadObject = new java.lang.Thread(this,"Cyber.ThreadCore");
+			setThreadObject(threadObject);
+			threadObject.start();
+		}
+	}
+	
+	public void run()
+	{
+	}
+
+	public boolean isRunnable()
+	{
+		return (Thread.currentThread() == getThreadObject()) ? true : false;
+	}
+	
+	public void stop() 
+	{
+		java.lang.Thread threadObject = getThreadObject();
+		if (threadObject != null) { 
+			//threadObject.destroy();
+			//threadObject.stop();
+			
+			// Thanks for Kazuyuki Shudo (08/23/07)
+			threadObject.interrupt();
+			
+			setThreadObject(null);
+			// I2P break Disposer out of sleep()
+			threadObject.interrupt();
+		}
+	}
+	
+	public void restart()
+	{
+		stop();
+		start();
+	}
+}
diff --git a/router/java/src/org/cybergarage/util/TimerUtil.java b/router/java/src/org/cybergarage/util/TimerUtil.java
index 58087435bbfcf5a61d6e25e47a9080f527f58178..ecf5624eef9ba85e1597b6b3c7eeb5ca353475b0 100644
--- a/router/java/src/org/cybergarage/util/TimerUtil.java
+++ b/router/java/src/org/cybergarage/util/TimerUtil.java
@@ -1,37 +1,37 @@
-/******************************************************************
-*
-*	CyberUtil for Java
-*
-*	Copyright (C) Satoshi Konno 2002-2003
-*
-*	File: TimerUtil.java
-*
-*	Revision:
-*
-*	01/15/03
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.util;
-
-public final class TimerUtil
-{
-	public final static void wait(int waitTime)
-	{
-		try {
-			Thread.sleep(waitTime);
-		}
-		catch (Exception e) {}
-	}
-
-	public final static void waitRandom(int time)
-	{
-		int waitTime = (int)(Math.random() * (double)time);		
-		try {
-			Thread.sleep(waitTime);
-		}
-		catch (Exception e) {}
-	}
-}
-
+/******************************************************************
+*
+*	CyberUtil for Java
+*
+*	Copyright (C) Satoshi Konno 2002-2003
+*
+*	File: TimerUtil.java
+*
+*	Revision:
+*
+*	01/15/03
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.util;
+
+public final class TimerUtil
+{
+	public final static void wait(int waitTime)
+	{
+		try {
+			Thread.sleep(waitTime);
+		}
+		catch (Exception e) {}
+	}
+
+	public final static void waitRandom(int time)
+	{
+		int waitTime = (int)(Math.random() * (double)time);		
+		try {
+			Thread.sleep(waitTime);
+		}
+		catch (Exception e) {}
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/xml/Attribute.java b/router/java/src/org/cybergarage/xml/Attribute.java
index ce7c16e9e1a306333fcbfe12a504dc3d32415e63..282cf51cbaf5ae31b1579f34907258fe805fbdfb 100644
--- a/router/java/src/org/cybergarage/xml/Attribute.java
+++ b/router/java/src/org/cybergarage/xml/Attribute.java
@@ -1,61 +1,78 @@
-/******************************************************************
-*
-*	CyberXML for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: Attribute.java
-*
-*	Revision;
-*
-*	11/27/02
-*		- first revision.
-*
-******************************************************************/
-
-package org.cybergarage.xml;
-
-public class Attribute 
-{
-	private String name = new String(); 
-	private String value = new String(); 
-
-	public Attribute() 
-	{
-	}
-
-	public Attribute(String name, String value) 
-	{
-		setName(name);
-		setValue(value);
-	}
-
-	////////////////////////////////////////////////
-	//	name
-	////////////////////////////////////////////////
-
-	public void setName(String name) 
-	{
-		this.name = name;
-	}
-
-	public String getName() 
-	{
-		return name;
-	}
-
-	////////////////////////////////////////////////
-	//	value
-	////////////////////////////////////////////////
-
-	public void setValue(String value) 
-	{
-		this.value = value;
-	}
-
-	public String getValue() 
-	{
-		return value;
-	}
-}
-
+*	CyberXML for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: Attribute.java
+*
+*	Revision;
+*
+*	11/27/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.xml;
+
+public class Attribute 
+{
+	private String name = new String(); 
+	private String value = new String(); 
+
+	public Attribute() 
+	{
+	}
+
+	public Attribute(String name, String value) 
+	{
+		this();
+		setName(name);
+		setValue(value);
+	}
+
+	public Attribute(Attribute otherAttr) 
+	{
+		this();
+		set(otherAttr);
+	}
+	
+	////////////////////////////////////////////////
+	//	name
+	////////////////////////////////////////////////
+
+	public void setName(String name) 
+	{
+		this.name = name;
+	}
+
+	public String getName() 
+	{
+		return name;
+	}
+
+	////////////////////////////////////////////////
+	//	value
+	////////////////////////////////////////////////
+
+	public void setValue(String value) 
+	{
+		this.value = value;
+	}
+
+	public String getValue() 
+	{
+		return value;
+	}
+
+	////////////////////////////////////////////////
+	//	set
+	////////////////////////////////////////////////
+
+	public void set(Attribute otherAttr) 
+	{
+		setName(otherAttr.getName());
+		setValue(otherAttr.getValue());
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/xml/AttributeList.java b/router/java/src/org/cybergarage/xml/AttributeList.java
index 0a52ab8d34522189b364618a39cce61896f9cbcc..ea6840f524707f50d3d3a190fe0cc1858b658df6 100644
--- a/router/java/src/org/cybergarage/xml/AttributeList.java
+++ b/router/java/src/org/cybergarage/xml/AttributeList.java
@@ -1,45 +1,45 @@
-/******************************************************************
-*
-*	CyberXML for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: AttributeList.java
-*
-*	Revision;
-*
-*	11/27/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberXML for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: AttributeList.java
+*
+*	Revision;
+*
+*	11/27/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.xml;
 
-package org.cybergarage.xml;
-
-import java.util.Vector;
-
-public class AttributeList extends Vector<Attribute> 
-{
-	public AttributeList() 
-	{
-	}
-	
-	public Attribute getAttribute(int n)
-	{
-		return (Attribute)get(n);
-	}
-	
-	public Attribute getAttribute(String name) 
-	{
-		if (name == null)
-			return null;
-		
-		int nLists = size(); 
-		for (int n=0; n<nLists; n++) {
-			Attribute elem = getAttribute(n);
-			if (name.compareTo(elem.getName()) == 0)
-				return elem;
+import java.util.Vector;
+
+public class AttributeList extends Vector<Attribute>
+{
+	public AttributeList() 
+	{
+	}
+	
+	public Attribute getAttribute(int n)
+	{
+		return (Attribute)get(n);
+	}
+	
+	public Attribute getAttribute(String name) 
+	{
+		if (name == null)
+			return null;
+		
+		int nLists = size(); 
+		for (int n=0; n<nLists; n++) {
+			Attribute elem = getAttribute(n);
+			if (name.compareTo(elem.getName()) == 0)
+				return elem;
 		}
-		return null;
-	}
-}
-
+		return null;
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/xml/Node.java b/router/java/src/org/cybergarage/xml/Node.java
index 8ed52ec616c8765f488347cfba0a6859981de899..7ab4bda53b27a7da7e946b96b4f91d528b2d91b5 100644
--- a/router/java/src/org/cybergarage/xml/Node.java
+++ b/router/java/src/org/cybergarage/xml/Node.java
@@ -61,6 +61,12 @@ public class Node
 		setName(ns, name);
 	}
 
+	public Node(Node otherNode) 
+	{
+		this();
+		set(otherNode);
+	}
+	
 	////////////////////////////////////////////////
 	//	parent node
 	////////////////////////////////////////////////
@@ -189,6 +195,11 @@ public class Node
 		return removeAttribute(getAttribute(name));
 	}
 
+	public void removeAllAttributes()
+	{
+		attrList.clear();
+	}
+	
 	public boolean hasAttributes()
 	{
 		if (0 < getNAttributes())
@@ -239,6 +250,51 @@ public class Node
 		setAttribute("xmlns:" + ns, value);
 	}
 		
+	////////////////////////////////////////////////
+	//	set
+	////////////////////////////////////////////////
+	
+	public boolean set(Node otherNode) {
+		if (otherNode == null)
+			return false;
+		
+		setName(otherNode.getName());		
+		setValue(otherNode.getValue());
+
+		removeAllAttributes();
+		int nOtherAttributes = otherNode.getNAttributes();
+		for (int n=0; n<nOtherAttributes; n++) {
+			Attribute otherAttr = otherNode.getAttribute(n);
+			Attribute thisAttr = new Attribute(otherAttr);
+			addAttribute(thisAttr);
+		}
+		
+		removeAllNodes();
+		int nOtherChildNodes = otherNode.getNNodes();
+		for (int n=0; n<nOtherChildNodes; n++) {
+			Node otherChildNode = otherNode.getNode(n);
+			Node thisChildNode = new Node();
+			thisChildNode.set(otherChildNode);
+			addNode(thisChildNode);
+		}
+		
+		return true;
+	}
+	
+	////////////////////////////////////////////////
+	//	equals
+	////////////////////////////////////////////////
+	
+	public boolean equals(Node otherNode) {
+		if (otherNode == null)
+			return false;
+
+		String thisNodeString = toString();
+		String otherNodeString = otherNode.toString();
+		
+		return thisNodeString.equals(otherNodeString);
+	}
+	
 	////////////////////////////////////////////////
 	//	Child node
 	////////////////////////////////////////////////
@@ -309,16 +365,30 @@ public class Node
 	//	Element (Child Node)
 	////////////////////////////////////////////////
 
-	public void setNode(String name, String value) {
+	public boolean hasNode(String name) {
 		Node node = getNode(name);
 		if (node != null) {
-			node.setValue(value);
+			return true;
+		}
+		return false;
+	}
+	
+	public void setNode(String name) {
+		if (hasNode(name)) {
 			return;
 		}
-		node = new Node(name);
-		node.setValue(value);
+		Node node = new Node(name);
 		addNode(node);
 	}
+	
+	public void setNode(String name, String value) {
+		Node node = getNode(name);
+		if (node == null) {
+			node = new Node(name);
+			addNode(node);
+		}
+		node.setValue(value);
+	}
 
 	public String getNodeValue(String name) {
 		Node node = getNode(name);
diff --git a/router/java/src/org/cybergarage/xml/NodeList.java b/router/java/src/org/cybergarage/xml/NodeList.java
index 1a0deb81cdbd241dca380d269d644c22cdf775fe..77e9c61c9f2eb1cae5629d99ddc6de74e743e5f0 100644
--- a/router/java/src/org/cybergarage/xml/NodeList.java
+++ b/router/java/src/org/cybergarage/xml/NodeList.java
@@ -1,63 +1,63 @@
-/******************************************************************
-*
-*	CyberXML for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: NodeList.java
-*
-*	Revision;
-*
-*	11/27/02
-*		- first revision.
-*
-******************************************************************/
+*	CyberXML for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: NodeList.java
+*
+*	Revision;
+*
+*	11/27/02
+*		- first revision.
+*
+******************************************************************/
+
+package org.cybergarage.xml;
 
-package org.cybergarage.xml;
-
-import java.util.Vector;
-
-public class NodeList extends Vector<Node> 
-{
-	public NodeList() 
-	{
-	}
-	
-	public Node getNode(int n)
-	{
-		return (Node)get(n);
-	}
-
-	public Node getNode(String name) 
-	{
-		if (name == null)
-			return null;
-		
-		int nLists = size(); 
-		for (int n=0; n<nLists; n++) {
-			Node node = getNode(n);
-			String nodeName = node.getName();
-			if (name.compareTo(nodeName) == 0)
-				return node;
+import java.util.Vector;
+
+public class NodeList extends Vector<Node>
+{
+	public NodeList() 
+	{
+	}
+	
+	public Node getNode(int n)
+	{
+		return (Node)get(n);
+	}
+
+	public Node getNode(String name) 
+	{
+		if (name == null)
+			return null;
+		
+		int nLists = size(); 
+		for (int n=0; n<nLists; n++) {
+			Node node = getNode(n);
+			String nodeName = node.getName();
+			if (name.compareTo(nodeName) == 0)
+				return node;
 		}
-		return null;
-	}
-
-	public Node getEndsWith(String name) 
-	{
-		if (name == null)
-			return null;
-
-		int nLists = size(); 
-		for (int n=0; n<nLists; n++) {
-			Node node = getNode(n);
-			String nodeName = node.getName();
-			if (nodeName == null)
-				continue;
-			if (nodeName.endsWith(name) == true)
-				return node;
+		return null;
+	}
+
+	public Node getEndsWith(String name) 
+	{
+		if (name == null)
+			return null;
+
+		int nLists = size(); 
+		for (int n=0; n<nLists; n++) {
+			Node node = getNode(n);
+			String nodeName = node.getName();
+			if (nodeName == null)
+				continue;
+			if (nodeName.endsWith(name) == true)
+				return node;
 		}
-		return null;
-	}
-}
-
+		return null;
+	}
+}
+
diff --git a/router/java/src/org/cybergarage/xml/ParserException.java b/router/java/src/org/cybergarage/xml/ParserException.java
index 87f1553e61f42091b212b3f835e49f31ba9a77ff..894e166cddf2dd519d071f4c4d25cd438bb24bd4 100644
--- a/router/java/src/org/cybergarage/xml/ParserException.java
+++ b/router/java/src/org/cybergarage/xml/ParserException.java
@@ -1,30 +1,30 @@
-/******************************************************************
-*
-*	CyberXML for Java
-*
-*	Copyright (C) Satoshi Konno 2002
+/******************************************************************
 *
-*	File: ParserException.java
-*
-*	Revision;
-*
-*	11/27/02
-*		- first revision.
-*	12/26/03
-*		- Changed to a sub class of Exception instead of SAXException.
-*
-******************************************************************/
-
-package org.cybergarage.xml;
-
-public class ParserException extends Exception 
+*	CyberXML for Java
+*
+*	Copyright (C) Satoshi Konno 2002
+*
+*	File: ParserException.java
+*
+*	Revision;
+*
+*	11/27/02
+*		- first revision.
+*	12/26/03
+*		- Changed to a sub class of Exception instead of SAXException.
+*
+******************************************************************/
+
+package org.cybergarage.xml;
+
+public class ParserException extends Exception 
 {
-	public ParserException(Exception e)
+	public ParserException(Exception e)
 	{
 		super(e);
-	}
+	}
 	
-	public ParserException(String s)
+	public ParserException(String s)
 	{
 		super(s);
 	}
diff --git a/router/java/src/org/cybergarage/xml/XML.java b/router/java/src/org/cybergarage/xml/XML.java
index ce170358c81bfb4b3468abf8b6c6d0a0468b5daf..255344800fadcca1a3a29ebd01bd384e674f128c 100644
--- a/router/java/src/org/cybergarage/xml/XML.java
+++ b/router/java/src/org/cybergarage/xml/XML.java
@@ -5,22 +5,23 @@
 *	Copyright (C) Satoshi Konno 2002-2003
 *
 *	File: XML.java
-*
-*	Revision;
-*
-*	01/05/03
+*
+*	Revision;
+*
+*	01/05/03
 *		- first revision.
 *	12/15/03
 *		- Terje Bakken
-*		- Added escapeXMLChars()
+*		- Added escapeXMLChars()
 *	
 ******************************************************************/
-
+
 package org.cybergarage.xml;
 
-public class XML 
-{
-	public final static String CONTENT_TYPE = "text/xml; charset=\"utf-8\"";
+public class XML 
+{
+	public final static String DEFAULT_CONTENT_TYPE = "text/xml; charset=\"utf-8\"";
+	public final static String DEFAULT_CONTENT_LANGUAGE = "en";
 	public final static String CHARSET_UTF8 = "utf-8";
 
 	////////////////////////////////////////////////
@@ -82,5 +83,5 @@ public class XML
 		
 		return outStr;
 	}
-}
+}
 
diff --git a/router/java/src/org/cybergarage/xml/parser/JaxpParser.java b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java
index add012f95ddaea4df5c2c78ae11105e78eb4f678..332c5525fc4d7ea18eebaaa1998338de51ab18d9 100644
--- a/router/java/src/org/cybergarage/xml/parser/JaxpParser.java
+++ b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java
@@ -1,200 +1,200 @@
-/******************************************************************
-*
-*	CyberXML for Java
-*
-*	Copyright (C) Satoshi Konno 2004
-*
-*   Author: Markus Thurner (http://thoean.com)
-*
-*	File: JaxpParser.java
-*
-*	Revision;
-*
-*	06/15/04
-*		- first revision.
-*	01/08/08
-*		- Fixed parse() not to occur null exception when the NamedNodeMap is null on Android.
-*	02/08/08
-*		- Change parse() to use Node::addValue() instead of the setValue().
-*
-******************************************************************/
-
-package org.cybergarage.xml.parser;
-
-import java.io.ByteArrayInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.cybergarage.xml.Node;
-import org.cybergarage.xml.Parser;
-import org.cybergarage.xml.ParserException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-
-public class JaxpParser extends Parser
-{
-
-	public JaxpParser()
-	{
-		super();
-	}
-	
-	////////////////////////////////////////////////
-	//	parse (Node)
-	////////////////////////////////////////////////
-
-	public org.cybergarage.xml.Node parse(org.cybergarage.xml.Node parentNode, org.w3c.dom.Node domNode, int rank)
-	{
-		int domNodeType = domNode.getNodeType();
-//		if (domNodeType != Node.ELEMENT_NODE)
-//			return;
-			
-		String domNodeName = domNode.getNodeName();
-		String domNodeValue = domNode.getNodeValue();
-		NamedNodeMap attrs = domNode.getAttributes(); 
-		int arrrsLen = (attrs != null) ? attrs.getLength() : 0;
-
-//		Debug.message("[" + rank + "] ELEM : " + domNodeName + ", " + domNodeValue + ", type = " + domNodeType + ", attrs = " + arrrsLen);
-
-		if (domNodeType == org.w3c.dom.Node.TEXT_NODE) {
-			// Change to use Node::addValue() instead of the setValue(). (2008/02/07)
-			//parentNode.setValue(domNodeValue);
-			parentNode.addValue(domNodeValue);
-			return parentNode;
-		}
-
-		if (domNodeType != org.w3c.dom.Node.ELEMENT_NODE)
-			return parentNode;
-
-		org.cybergarage.xml.Node node = new org.cybergarage.xml.Node();
-		node.setName(domNodeName);
-		node.setValue(domNodeValue);
-
-		if (parentNode != null)
-			parentNode.addNode(node);
-
-		NamedNodeMap attrMap = domNode.getAttributes(); 
-		if (attrMap != null) {
-			int attrLen = attrMap.getLength();
-			//Debug.message("attrLen = " + attrLen);
-			for (int n = 0; n<attrLen; n++) {
-				org.w3c.dom.Node attr = attrMap.item(n);
-				String attrName = attr.getNodeName();
-				String attrValue = attr.getNodeValue();
-				node.setAttribute(attrName, attrValue);
-			}
-		}
-		
-		org.w3c.dom.Node child = domNode.getFirstChild();
-		if(child==null){ 
-			node.setValue(""); 
-			return node; 
-		}
-		do{
-			parse(node, child, rank+1);
-			child = child.getNextSibling();
-		}while (child != null);		
-		
-		return node;
-	}
-
-	public org.cybergarage.xml.Node parse(org.cybergarage.xml.Node parentNode, org.w3c.dom.Node domNode)
-	{
-		return parse(parentNode, domNode, 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.cybergarage.xml.Parser#parse(java.io.InputStream)
-	 */
-	public Node parse(InputStream inStream) throws ParserException
-	{
-		org.cybergarage.xml.Node root = null;
-		
-		try {
-			// https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			factory.setValidating(false);
-			factory.setNamespaceAware(true);
-			factory.setExpandEntityReferences(false);
-			try {
-				try {
-				    factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-				} catch (ParserConfigurationException pce) {}
-				try {
-				    factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-				} catch (ParserConfigurationException pce) {}
-				try {
-				    factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-				} catch (ParserConfigurationException pce) {}
-				try {
-				    factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-				} catch (ParserConfigurationException pce) {}
-			} catch (AbstractMethodError ame) {}   // FreeBSD
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			builder.setEntityResolver(new BlankingResolver());
-			InputSource inSrc = new InputSource(new NullFilterInputStream(inStream));
-			Document doc = builder.parse(inSrc);
-
-			org.w3c.dom.Element docElem = doc.getDocumentElement();
-
-			if (docElem != null)
-				root = parse(root, docElem);
-/*
-			NodeList rootList = doc.getElementsByTagName("root");
-			Debug.message("rootList = " + rootList.getLength());
-			
-			if (0 < rootList.getLength())
-				root = parse(root, rootList.item(0));
-*/
-		}
-		catch (Exception e) {
-			throw new ParserException(e);
-		}
-		
-		return root;
-	}
-
-	/**
-	 *  I2P -
-	 *  Filter out nulls, hopefully to avoid
-	 *  SAXParserException "Content not allowed in trailing section",
-	 *  which is apparently caused by nulls.
-	 *  Alternative is to remove all stuff between '>' and '<',
-         *  which isn't so hard if we assume no CDATA.
-	 */
-	private static class NullFilterInputStream extends FilterInputStream {
-
-		public NullFilterInputStream(InputStream is) {
-			super(is);
-		}
-
-		@Override
-		public int read() throws IOException {
-			int rv;
-			while ((rv = super.read()) == 0) {
-				// try again
-			}
-			return rv;
-		}
-	}
-
-	/**
-	 *  I2P -
-	 *  http://stackoverflow.com/questions/5883542/disable-xml-validation-based-on-external-dtd-xsd
-	 */
-	private static class BlankingResolver implements EntityResolver {
-                private static final byte[] DUMMY = new byte[0];
-
-		public InputSource resolveEntity(String arg0, String arg1) {
-			return new InputSource(new ByteArrayInputStream(DUMMY));
-		}
-	}
-}
+/******************************************************************
+*
+*	CyberXML for Java
+*
+*	Copyright (C) Satoshi Konno 2004
+*
+*   Author: Markus Thurner (http://thoean.com)
+*
+*	File: JaxpParser.java
+*
+*	Revision;
+*
+*	06/15/04
+*		- first revision.
+*	01/08/08
+*		- Fixed parse() not to occur null exception when the NamedNodeMap is null on Android.
+*	02/08/08
+*		- Change parse() to use Node::addValue() instead of the setValue().
+*
+******************************************************************/
+
+package org.cybergarage.xml.parser;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.cybergarage.xml.Node;
+import org.cybergarage.xml.Parser;
+import org.cybergarage.xml.ParserException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
+
+public class JaxpParser extends Parser
+{
+
+	public JaxpParser()
+	{
+		super();
+	}
+	
+	////////////////////////////////////////////////
+	//	parse (Node)
+	////////////////////////////////////////////////
+
+	public org.cybergarage.xml.Node parse(org.cybergarage.xml.Node parentNode, org.w3c.dom.Node domNode, int rank)
+	{
+		int domNodeType = domNode.getNodeType();
+//		if (domNodeType != Node.ELEMENT_NODE)
+//			return;
+			
+		String domNodeName = domNode.getNodeName();
+		String domNodeValue = domNode.getNodeValue();
+		NamedNodeMap attrs = domNode.getAttributes(); 
+		int arrrsLen = (attrs != null) ? attrs.getLength() : 0;
+
+//		Debug.message("[" + rank + "] ELEM : " + domNodeName + ", " + domNodeValue + ", type = " + domNodeType + ", attrs = " + arrrsLen);
+
+		if (domNodeType == org.w3c.dom.Node.TEXT_NODE) {
+			// Change to use Node::addValue() instead of the setValue(). (2008/02/07)
+			//parentNode.setValue(domNodeValue);
+			parentNode.addValue(domNodeValue);
+			return parentNode;
+		}
+
+		if (domNodeType != org.w3c.dom.Node.ELEMENT_NODE)
+			return parentNode;
+
+		org.cybergarage.xml.Node node = new org.cybergarage.xml.Node();
+		node.setName(domNodeName);
+		node.setValue(domNodeValue);
+
+		if (parentNode != null)
+			parentNode.addNode(node);
+
+		NamedNodeMap attrMap = domNode.getAttributes(); 
+		if (attrMap != null) {
+			int attrLen = attrMap.getLength();
+			//Debug.message("attrLen = " + attrLen);
+			for (int n = 0; n<attrLen; n++) {
+				org.w3c.dom.Node attr = attrMap.item(n);
+				String attrName = attr.getNodeName();
+				String attrValue = attr.getNodeValue();
+				node.setAttribute(attrName, attrValue);
+			}
+		}
+		
+		org.w3c.dom.Node child = domNode.getFirstChild();
+		if(child==null){ 
+			node.setValue(""); 
+			return node; 
+		}
+		do{
+			parse(node, child, rank+1);
+			child = child.getNextSibling();
+		}while (child != null);		
+		
+		return node;
+	}
+
+	public org.cybergarage.xml.Node parse(org.cybergarage.xml.Node parentNode, org.w3c.dom.Node domNode)
+	{
+		return parse(parentNode, domNode, 0);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.cybergarage.xml.Parser#parse(java.io.InputStream)
+	 */
+	public Node parse(InputStream inStream) throws ParserException
+	{
+		org.cybergarage.xml.Node root = null;
+		
+		try {
+			// https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setNamespaceAware(true);
+			factory.setExpandEntityReferences(false);
+			try {
+				try {
+				    factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+				} catch (ParserConfigurationException pce) {}
+				try {
+				    factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+				} catch (ParserConfigurationException pce) {}
+				try {
+				    factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+				} catch (ParserConfigurationException pce) {}
+				try {
+				    factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+				} catch (ParserConfigurationException pce) {}
+			} catch (AbstractMethodError ame) {}   // FreeBSD
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			builder.setEntityResolver(new BlankingResolver());
+			InputSource inSrc = new InputSource(new NullFilterInputStream(inStream));
+			Document doc = builder.parse(inSrc);
+
+			org.w3c.dom.Element docElem = doc.getDocumentElement();
+
+			if (docElem != null)
+				root = parse(root, docElem);
+/*
+			NodeList rootList = doc.getElementsByTagName("root");
+			Debug.message("rootList = " + rootList.getLength());
+			
+			if (0 < rootList.getLength())
+				root = parse(root, rootList.item(0));
+*/
+		}
+		catch (Exception e) {
+			throw new ParserException(e);
+		}
+		
+		return root;
+	}
+
+	/**
+	 *  I2P -
+	 *  Filter out nulls, hopefully to avoid
+	 *  SAXParserException "Content not allowed in trailing section",
+	 *  which is apparently caused by nulls.
+	 *  Alternative is to remove all stuff between '>' and '<',
+         *  which isn't so hard if we assume no CDATA.
+	 */
+	private static class NullFilterInputStream extends FilterInputStream {
+
+		public NullFilterInputStream(InputStream is) {
+			super(is);
+		}
+
+		@Override
+		public int read() throws IOException {
+			int rv;
+			while ((rv = super.read()) == 0) {
+				// try again
+			}
+			return rv;
+		}
+	}
+
+	/**
+	 *  I2P -
+	 *  http://stackoverflow.com/questions/5883542/disable-xml-validation-based-on-external-dtd-xsd
+	 */
+	private static class BlankingResolver implements EntityResolver {
+                private static final byte[] DUMMY = new byte[0];
+
+		public InputSource resolveEntity(String arg0, String arg1) {
+			return new InputSource(new ByteArrayInputStream(DUMMY));
+		}
+	}
+}
diff --git a/router/java/src/org/freenetproject/package.html b/router/java/src/org/freenetproject/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..51942265690cefbb6c38c74cd220ff7bc9a13844
--- /dev/null
+++ b/router/java/src/org/freenetproject/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+Small classes used by net.i2p.transport.UPnP to interface with the org.cybergarage UPnP library,
+as imported from freenet.
+</p>
+</body>
+</html>
diff --git a/router/java/src/org/xlattice/crypto/filters/package.html b/router/java/src/org/xlattice/crypto/filters/package.html
new file mode 100644
index 0000000000000000000000000000000000000000..dea59c8d8e8bd8da0aa73ac81d6a1e2dd71ac523
--- /dev/null
+++ b/router/java/src/org/xlattice/crypto/filters/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Bloom filter used by net.i2p.router.util.DecayingBloomFilter
+</p>
+</body>
+</html>
diff --git a/router/java/test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java b/router/java/test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java
index dd26dd12476d73490fdae9ef0221bb12e88b376c..1ca7caea82ad28ce19a11ebcf2d3d4ffa15a050b 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java
@@ -15,6 +15,7 @@ import net.i2p.data.PublicKey;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.BuildRequestRecord;
 import net.i2p.data.i2np.BuildResponseRecord;
+import net.i2p.data.i2np.EncryptedBuildRecord;
 import net.i2p.data.i2np.TunnelBuildMessage;
 import net.i2p.data.i2np.TunnelBuildReplyMessage;
 import net.i2p.util.Log;
@@ -87,11 +88,11 @@ public class BuildMessageTestStandalone extends TestCase {
             long now = (ctx.clock().now() / (60l*60l*1000l)) * (60*60*1000);
             int ourSlot = -1;
 
-            byte reply[] = BuildResponseRecord.create(ctx, 0, req.readReplyKey(), req.readReplyIV(), -1);
+            EncryptedBuildRecord reply = BuildResponseRecord.create(ctx, 0, req.readReplyKey(), req.readReplyIV(), -1);
             for (int j = 0; j < TunnelBuildMessage.MAX_RECORD_COUNT; j++) {
                 if (msg.getRecord(j) == null) {
                     ourSlot = j;
-                    msg.setRecord(j, new ByteArray(reply));
+                    msg.setRecord(j, reply);
                     break;
                 }
             }
@@ -173,7 +174,7 @@ public class BuildMessageTestStandalone extends TestCase {
             hop.setReplyKey(ctx.keyGenerator().generateSessionKey());
             byte iv[] = new byte[BuildRequestRecord.IV_SIZE];
             Arrays.fill(iv, (byte)i); // consistent for repeatability
-            hop.setReplyIV(new ByteArray(iv));
+            hop.setReplyIV(iv);
             hop.setReceiveTunnelId(new TunnelId(i+1));
         }
         return cfg;
diff --git a/tests/scripts/checkcerts.sh b/tests/scripts/checkcerts.sh
index 0a0f698722d9e88062c82f33f5add36ad80b08fe..68f036a1a09ce93ab37422f00314b97c0896b270 100755
--- a/tests/scripts/checkcerts.sh
+++ b/tests/scripts/checkcerts.sh
@@ -20,7 +20,7 @@ SOON=60
 
 date2julian() {
     # Julian date conversion adapted from a post (its code released into the public
-    # domain) by Tapani Tarvainen to comp.unix.shell (1998) for portability
+    # domain) by Tapani Tarvainen to comp.unix.shell 1998)) for portability
     # (e.g. using 'expr' instead of requiring Bash, ksh, or zsh).
     #   $1 = Month
     #   $2 = Day
@@ -90,7 +90,7 @@ getmonth() {
 checkcert() {
     if [ $OPENSSL ]; then
         # OpenSSL's format: Mar  7 16:08:35 2022 GMT
-        DATA=$(openssl x509 -enddate -noout -in $1| cut -d'=' -f2-)
+        DATA=$(openssl x509 -enddate -noout -in $1 | cut -d'=' -f2-)
     else
         # Certtool's format: Mon Mar 07 16:08:35 UTC 2022
         DATA=$(certtool -i < "$1" | sed -e '/Not\sAfter/!d' -e 's/^.*:\s\(.*\)/\1/')
@@ -101,6 +101,26 @@ checkcert() {
     echo $DATA
 }
 
+get_bits() {
+    if [ $OPENSSL ]; then
+        BITS=$(openssl x509 -text -noout -in $1 | sed -e '/Public-Key/!d' \
+            -e 's/\s\+Public-Key: (\([0-9]\+\) bit)/\1 bits/')
+    else
+        BITS=$(certtool -i < $1 | sed -e '/^.*Algorithm Security Level/!d' \
+            -e 's/.*(\([0-9]\+\) bits).*/\1 bits/')
+    fi
+}
+
+get_sigtype() {
+    if [ $OPENSSL ]; then
+        TYPE=$(openssl x509 -text -noout -in $1 | sed -e '/Signature Algorithm/!d' \
+            -e 's/\s\+Signature Algorithm:\s\+\(.\+\)/\1/' | head -n1)
+    else
+        TYPE=$(certtool -i < $1 | sed -e '/^.*Signature Algorithm:/!d' \
+            -e 's/.*:\s\+\(.*\)/\1/')
+    fi
+}
+
 print_status() {
         if [ $DAYS -ge $SOON ]; then
             echo "Expires in $DAYS days ($EXPIRES)"
@@ -164,6 +184,8 @@ do
     else
        compute_dates
     fi
+    get_bits $i && get_sigtype $i
+    printf '%s - %s\n\n' "$BITS" "$TYPE"
     if grep '\s$' $i > /dev/null 2>&1; then
         echo "********* Trailing whitespace found in file $i *********"
         FAIL=1
diff --git a/tests/scripts/checkremotecerts.sh b/tests/scripts/checkremotecerts.sh
index 87e212f996d6d1b8953950ac4e0acba739eb3c71..14d0d86272f964e785a6ca5934fe7a5bfa41af77 100755
--- a/tests/scripts/checkremotecerts.sh
+++ b/tests/scripts/checkremotecerts.sh
@@ -21,10 +21,10 @@ check_for_prog() {
     fi
 }
 
-if pidof /usr/bin/tor > /dev/null 2>&1 && check_for_prog torify; then
+if pidof /usr/bin/tor > /dev/null 2>&1 && check_for_prog torsocks; then
     echo "-- Detected Tor, will try using it --"
-    GNUTLS_BIN="torify gnutls-cli"
-    OPENSSL_BIN="torify openssl"
+    GNUTLS_BIN="torsocks gnutls-cli"
+    OPENSSL_BIN="torsocks openssl"
 else
     GNUTLS_BIN="gnutls-cli"
     OPENSSL_BIN="openssl"